* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/files/, net-analyzer/sngrep/
@ 2020-03-29 12:24 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-03-29 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 75dee2285b1309f42d7490673d94a682fe30b1fa
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 12:19:34 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 12:24:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75dee228
net-analyzer/sngrep: Fix building against sys-libs/musl
See also:
https://github.com/irontec/sngrep/commit/604f6d0ce2ec42ac494d76c95e68850ea6e7da8f
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Closes: https://bugs.gentoo.org/715256
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch | 11 ++++++
net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild | 44 ++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
new file mode 100644
index 00000000000..b61025d25b6
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
@@ -0,0 +1,11 @@
+--- a/src/capture.c
++++ b/src/capture.c
+@@ -191,7 +191,7 @@
+
+ // Reopen tty for ncurses after pcap have used stdin
+ if (!strncmp(infile, "/dev/stdin", 10)) {
+- if (!(stdin = freopen("/dev/tty", "r", stdin))) {
++ if (!(fstdin = freopen("/dev/tty", "r", stdin))) {
+ fprintf(stderr, "Failed to reopen tty while using stdin for capture.");
+ return 1;
+ }
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
new file mode 100644
index 00000000000..011fb09336b
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls ipv6 openssl pcre unicode"
+REQUIRED_USE="
+ gnutls? ( !openssl )
+"
+
+DEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:0=[unicode?]
+ openssl? ( dev-libs/openssl:0= )
+ gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.5-tinfo.patch
+ "${FILESDIR}"/${PN}-1.4.6-stdin.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable eep) \
+ $(use_enable ipv6) \
+ $(use_enable unicode) \
+ $(use_with gnutls) \
+ $(use_with openssl) \
+ $(use_with pcre)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/files/, net-analyzer/sngrep/
@ 2020-06-10 11:16 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-06-10 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 33cb6e16585752da4859e9725f6c43e8011c5d3e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 11:13:28 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 11:15:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cb6e16
net-analyzer/sngrep: Fix segmentation fault in ncurses
The previous tinfo patch did not take into account if the narrow or wide
ncurses libraries were being used, linking against the wrong libtinfo
variant in the process and causing a segmentation fault in
termattrs_sp().
Fix this by adjusting the patch to try linking against libtinfow and
libtinfoi, respectively.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch | 24 ++++++++++++++++++++++
net-analyzer/sngrep/sngrep-1.4.7.ebuild | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
new file mode 100644
index 00000000000..8a01eeb2560
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,6 +74,10 @@
+ AC_CHECK_LIB([menuw], [new_item], [], [
+ AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.])
+ ])
++
++ AC_SEARCH_LIBS([keyname], [tinfow], [], [
++ AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.])
++ ])
+ ], [
+
+ # Ncurses without wide-character support
+@@ -96,6 +100,10 @@
+ AC_CHECK_LIB([menu], [new_item], [], [
+ AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
+ ])
++
++ AC_SEARCH_LIBS([keyname], [tinfo], [], [
++ AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.])
++ ])
+ ])
+
+ ####
diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
index 12eaf83d700..f6b04daa278 100644
--- a/net-analyzer/sngrep/sngrep-1.4.7.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
@@ -25,7 +25,7 @@ DEPEND="
RDEPEND="${DEPEND}"
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-1.4.5-tinfo.patch
+ "${FILESDIR}"/${PN}-1.4.7-tinfo.patch
"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/files/, net-analyzer/sngrep/
@ 2020-06-10 11:54 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-06-10 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 3ea02c91dce90ad12716507d32633bcb923cf774
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 11:50:02 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 11:54:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea02c91
net-analyzer/sngrep: Backport tinfo patch
- In case 1.4.7 has bugs that 1.4.6 does not, apply the fixed tinfo
patch there as well.
- The tinfo patch fixes the test suite problems as well, so drop
RESTRICT=test again.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Bug: https://bugs.gentoo.org/709852
Bug: https://bugs.gentoo.org/727790
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch | 13 -------------
.../{sngrep-1.4.6-r2.ebuild => sngrep-1.4.6-r3.ebuild} | 2 +-
net-analyzer/sngrep/sngrep-1.4.7.ebuild | 1 -
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch
deleted file mode 100644
index f3829560264..00000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,10 @@
- ])
- ])
-
-+AC_SEARCH_LIBS([keyname], [tinfo], [], [
-+ AC_MSG_ERROR([ You need to have ncurses panelw library installed to compile sngrep.])
-+])
-+
- ####
- #### GnuTLS Support
- ####
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
similarity index 95%
rename from net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
rename to net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
index 011fb09336b..b9f731a5e64 100644
--- a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
@@ -24,8 +24,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-1.4.5-tinfo.patch
"${FILESDIR}"/${PN}-1.4.6-stdin.patch
+ "${FILESDIR}"/${PN}-1.4.7-tinfo.patch
)
src_prepare() {
diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
index f6b04daa278..6782684125c 100644
--- a/net-analyzer/sngrep/sngrep-1.4.7.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
@@ -23,7 +23,6 @@ DEPEND="
gnutls? ( net-libs/gnutls )
"
RDEPEND="${DEPEND}"
-RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-10 11:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-29 12:24 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/files/, net-analyzer/sngrep/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2020-06-10 11:16 Jeroen Roovers
2020-06-10 11:54 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox