From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1429F1382C5 for ; Wed, 10 Jun 2020 11:16:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B457E0839; Wed, 10 Jun 2020 11:16:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE89FE0839 for ; Wed, 10 Jun 2020 11:16:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D3C534F1D3 for ; Wed, 10 Jun 2020 11:16:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FA5628F for ; Wed, 10 Jun 2020 11:16:00 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1591787758.33cb6e16585752da4859e9725f6c43e8011c5d3e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/files/, net-analyzer/sngrep/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch net-analyzer/sngrep/sngrep-1.4.7.ebuild X-VCS-Directories: net-analyzer/sngrep/ net-analyzer/sngrep/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 33cb6e16585752da4859e9725f6c43e8011c5d3e X-VCS-Branch: master Date: Wed, 10 Jun 2020 11:16:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a6701bb-2075-4e88-bfda-1eb694a860e9 X-Archives-Hash: 18958aab3fe3666ce8a4d2bdbafa3647 commit: 33cb6e16585752da4859e9725f6c43e8011c5d3e Author: Jeroen Roovers gentoo org> AuthorDate: Wed Jun 10 11:13:28 2020 +0000 Commit: Jeroen Roovers gentoo 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 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 )