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 0ECE81382C5 for ; Mon, 22 Jan 2018 21:03:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C301E0978; Mon, 22 Jan 2018 21:03:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D37BCE0978 for ; Mon, 22 Jan 2018 21:03:12 +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 A1B38335C03 for ; Mon, 22 Jan 2018 21:03:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00C091C3 for ; Mon, 22 Jan 2018 21:03:10 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1516654831.4be97ce39a9d65edcad5b2f06eadfc25653a7199.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/files/, net-libs/nDPI/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nDPI/files/nDPI-2.2-libcache-include.patch net-libs/nDPI/nDPI-2.2.ebuild X-VCS-Directories: net-libs/nDPI/files/ net-libs/nDPI/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: 4be97ce39a9d65edcad5b2f06eadfc25653a7199 X-VCS-Branch: master Date: Mon, 22 Jan 2018 21:03:10 +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-Archives-Salt: d2314676-9326-4b20-90e0-d9560858c34c X-Archives-Hash: 5b5493e3e6bf3985b28c4022899a94d9 commit: 4be97ce39a9d65edcad5b2f06eadfc25653a7199 Author: Slawomir Lis gentoo org> AuthorDate: Mon Jan 22 20:58:13 2018 +0000 Commit: Slawek Lis gentoo org> CommitDate: Mon Jan 22 21:00:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be97ce3 net-libs/nDPI: fixes problem with libcache.h This particular file is later used in building net-analyzer/ntopng, but it's placed in a third-party folder in nDPI package. This commit changes this library location. Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../nDPI/files/nDPI-2.2-libcache-include.patch | 32 ++++++++++++++++++++++ net-libs/nDPI/nDPI-2.2.ebuild | 3 ++ 2 files changed, 35 insertions(+) diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch new file mode 100644 index 00000000000..5ee089f46bf --- /dev/null +++ b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch @@ -0,0 +1,32 @@ +--- src/include/Makefile.am.orig 2018-01-22 21:24:17.802100061 +0100 ++++ src/include/Makefile.am 2018-01-22 21:24:30.080100801 +0100 +@@ -7,4 +7,5 @@ + ndpi_protocol_ids.h \ + ndpi_protocols.h \ + ndpi_win32.h \ +- ndpi_includes.h ++ ndpi_includes.h \ ++ libcache.h +--- src/include/ndpi_typedefs.h.orig 2018-01-22 21:27:35.994112009 +0100 ++++ src/include/ndpi_typedefs.h 2018-01-22 21:27:47.463112701 +0100 +@@ -25,7 +25,7 @@ + #define __NDPI_TYPEDEFS_H__ + + #include "ndpi_define.h" +-#include "../lib/third_party/include/libcache.h" ++#include "libcache.h" + + #define BT_ANNOUNCE + #define SNAP_EXT +--- src/lib/Makefile.am.orig 2018-01-22 21:34:57.055138600 +0100 ++++ src/lib/Makefile.am 2018-01-22 21:35:10.431139406 +0100 +@@ -12,7 +12,8 @@ + ../include/ndpi_includes.h \ + ../include/ndpi_protocol_ids.h \ + ../include/ndpi_protocols.h \ +- ../include/ndpi_typedefs.h ++ ../include/ndpi_typedefs.h \ ++ ../include/libcache.h + + libndpi_la_SOURCES = ndpi_content_match.c.inc \ + ndpi_main.c \ diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild index 5db72a26125..6c0160ff6cd 100644 --- a/net-libs/nDPI/nDPI-2.2.ebuild +++ b/net-libs/nDPI/nDPI-2.2.ebuild @@ -20,6 +20,9 @@ RDEPEND="${DEPEND}" src_prepare() { sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die + mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include" + epatch "${FILESDIR}/${P}-libcache-include.patch" + default eautoreconf }