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 C43FA138334 for ; Sat, 28 Dec 2019 11:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24669E0A6F; Sat, 28 Dec 2019 11:45:46 +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 F02D9E0A6F for ; Sat, 28 Dec 2019 11:45:45 +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 CE74F34DC42 for ; Sat, 28 Dec 2019 11:45:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E22DD37 for ; Sat, 28 Dec 2019 11:45:42 +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: <1577533538.279adbeeec72611d631ceb9d24de1675c93bcef4.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/files/, net-analyzer/pmacct/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild net-analyzer/pmacct/pmacct-1.7.3.ebuild X-VCS-Directories: net-analyzer/pmacct/ net-analyzer/pmacct/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 279adbeeec72611d631ceb9d24de1675c93bcef4 X-VCS-Branch: master Date: Sat, 28 Dec 2019 11:45:42 +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: ee507401-407d-4d24-aa3c-46b7adffc47e X-Archives-Hash: e454c9627f6c687867377804a8a8a1da commit: 279adbeeec72611d631ceb9d24de1675c93bcef4 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Dec 28 11:34:26 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Dec 28 11:45:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279adbee net-analyzer/pmacct: Fix building against >=nDPI-3.0 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Closes: https://bugs.gentoo.org/704072 Signed-off-by: Jeroen Roovers gentoo.org> .../pmacct/files/pmacct-1.7.3-nDPI-3.0.patch | 28 ++++++++++++++++++++++ ...{pmacct-1.7.3.ebuild => pmacct-1.7.3-r1.ebuild} | 12 ++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch new file mode 100644 index 00000000000..3cffef25862 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch @@ -0,0 +1,28 @@ +--- a/./configure.ac ++++ b/./configure.ac +@@ -955,6 +955,7 @@ + CFLAGS="$_save_CFLAGS" + ]) + PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)]) ++ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)]) + ;; + no) + AC_MSG_RESULT(no) +--- a/./src/ndpi/ndpi.c ++++ b/./src/ndpi/ndpi.c +@@ -374,10 +374,14 @@ + if (flow->detection_completed || flow->tcp_finished) { + if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) + #ifdef WITH_NDPI26 ++#ifdef WITH_NDPI30 ++ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); ++#else + flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); ++#endif /* WITH_NDPI30 */ + #else + flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); +-#endif ++#endif /* WITH_NDPI26 */ + + if (workflow->prefs.protocol_guess) { + if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { diff --git a/net-analyzer/pmacct/pmacct-1.7.3.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild similarity index 92% rename from net-analyzer/pmacct/pmacct-1.7.3.ebuild rename to net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild index 5887b587804..33e50e3e831 100644 --- a/net-analyzer/pmacct/pmacct-1.7.3.ebuild +++ b/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="A network tool to gather IP traffic information" HOMEPAGE="http://www.pmacct.net/" @@ -32,7 +32,7 @@ RDEPEND="