summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-06-10 13:13:28 +0200
committerJeroen Roovers <jer@gentoo.org>2020-06-10 13:15:58 +0200
commit33cb6e16585752da4859e9725f6c43e8011c5d3e (patch)
tree64512592dd3fd4d05fe9e8be4092c70332d3dda2 /net-analyzer/sngrep
parentdev-python/openpyxl: Bump to 3.0.3 (diff)
downloadgentoo-33cb6e16585752da4859e9725f6c43e8011c5d3e.tar.gz
gentoo-33cb6e16585752da4859e9725f6c43e8011c5d3e.tar.bz2
gentoo-33cb6e16585752da4859e9725f6c43e8011c5d3e.zip
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@gentoo.org>
Diffstat (limited to 'net-analyzer/sngrep')
-rw-r--r--net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch24
-rw-r--r--net-analyzer/sngrep/sngrep-1.4.7.ebuild2
2 files changed, 25 insertions, 1 deletions
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 000000000000..8a01eeb2560b
--- /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 12eaf83d7002..f6b04daa278d 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
)