summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-06-10 13:50:02 +0200
committerJeroen Roovers <jer@gentoo.org>2020-06-10 13:54:24 +0200
commit3ea02c91dce90ad12716507d32633bcb923cf774 (patch)
tree77eb4e883f559ea0f00dbd84b371918d56842626 /net-analyzer
parentnet-analyzer/sngrep: Fix segmentation fault in ncurses (diff)
downloadgentoo-3ea02c91dce90ad12716507d32633bcb923cf774.tar.gz
gentoo-3ea02c91dce90ad12716507d32633bcb923cf774.tar.bz2
gentoo-3ea02c91dce90ad12716507d32633bcb923cf774.zip
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@gentoo.org>
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch13
-rw-r--r--net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild (renamed from net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild)2
-rw-r--r--net-analyzer/sngrep/sngrep-1.4.7.ebuild1
3 files changed, 1 insertions, 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 f3829560264d..000000000000
--- 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
index 011fb09336bd..b9f731a5e648 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 f6b04daa278d..6782684125c1 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