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 8AF6C138359 for ; Thu, 5 Nov 2020 14:08:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7022E0864; Thu, 5 Nov 2020 14:08:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 56FE6E0864 for ; Thu, 5 Nov 2020 14:08:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DCD1A340CB1 for ; Thu, 5 Nov 2020 14:08:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E35B431 for ; Thu, 5 Nov 2020 14:08:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1604585281.4b863caa2a14604924729dbb227a1949e32dbdfe.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch net-libs/nDPI/nDPI-3.4.ebuild X-VCS-Directories: net-libs/nDPI/ net-libs/nDPI/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4b863caa2a14604924729dbb227a1949e32dbdfe X-VCS-Branch: master Date: Thu, 5 Nov 2020 14:08:08 +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: 688413f9-44fc-442a-865f-360deab40c2d X-Archives-Hash: 9fc59e9c5c2fbb129f9ddd23ec92b571 commit: 4b863caa2a14604924729dbb227a1949e32dbdfe Author: Sam James gentoo org> AuthorDate: Thu Nov 5 13:45:03 2020 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 5 14:08:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b863caa net-libs/nDPI: fail when libpcap can't be found Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../nDPI/files/nDPI-3.4-configure-fail-libcap.patch | 19 +++++++++++++++++++ net-libs/nDPI/nDPI-3.4.ebuild | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch new file mode 100644 index 00000000000..7ae5a04d4e8 --- /dev/null +++ b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch @@ -0,0 +1,19 @@ +Ensure that we fail if libpcap can't be detected, rather than exiting with a success return code. +--- a/configure.seed ++++ b/configure.seed +@@ -126,12 +126,9 @@ case "$host" in + AC_CHECK_LIB([dl], [dlopen, dlsym], [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ]) + else + AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"]) +- if test $ac_cv_lib_pcap_pcap_open_live = "no"; then : +- echo "" +- echo "ERROR: Missing libpcap(-dev) library required to compile the example application" +- echo "ERROR: Please install it and try again" +- exit +- fi ++ if test $ac_cv_lib_pcap_pcap_open_live = "no"; then : ++ AC_MSG_ERROR([Cannot find libpcap which is required to compile the example application]) ++ fi + fi + ;; + esac diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild index 39a1a4c8a57..cb053734cf3 100644 --- a/net-libs/nDPI/nDPI-3.4.ebuild +++ b/net-libs/nDPI/nDPI-3.4.ebuild @@ -19,6 +19,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch" + "${FILESDIR}/${PN}-3.4-configure-fail-libcap.patch" ) src_prepare() { @@ -27,6 +28,8 @@ src_prepare() { eval $(grep '^NDPI_PATCH=' autogen.sh) NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}" + default + sed \ -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \ -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \ @@ -40,7 +43,6 @@ src_prepare() { -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ src/lib/Makefile.in || die - default eautoreconf # Taken from autogen.sh (bug #704074):