gentoo resync : 16.09.2020

3 files changed, 104 insertions, 0 deletions

diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 467a719fcc65..b83d739a3fb0 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,5 +1,7 @@
 AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d68022633b751a94844c8bc29ae0e741775f50eeaed10af06c25c493acae58aa881df4e66de359fcfc2b0e9e28ee55a9e69 SHA512 080a982ee45d69419fb45f8fc35eb53febfc098d24f5c52476933dae1333a11ffe3bffafa5dde302af308840ce17a4ed8fa210a87d6c65e16f78993d23492481
+AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
 EBUILD libnids-1.24-r6.ebuild 1106 BLAKE2B 6a94bdda1380505cda1129cbafc79431714a425b962b6ac06fca7661c8f036beb01551deef3aebb48c543b2e74d6d0003f28b54c5e532e446bfdce0ed0514635 SHA512 4adc9b043dcd077cab15ad56997900ddf076b51d1f5519c9022838d5417f0885baa43490986cca202e21a94370b71befde01a488451cd06a134ffe3ce987bd7a
+EBUILD libnids-1.24-r7.ebuild 1160 BLAKE2B 3a5e38755f955a94650d554faa6c62fc004438d1111122f53275ede692446bd46639902fc031e3e00fed514ad708e97036230813d3b0c68f0816cfc7cff81e37 SHA512 88f6a0732ce70037dd946dd62e4bea07ca760d24ce0a87a27bf18d253a4837c727088ee45643e6af2aa71113a69ba1c829ece1e93e6cc9909d75f79043cfc7ff
 MISC metadata.xml 688 BLAKE2B 1e9f6acc429a683a0aa1b8e14d0f2d9b03cb004c387b0b8582f8056c767af6511ff480f895d715169ceabb4c0722136e624d853819a2ea48f1fe8a6cb77829db SHA512 c70e24c21ba36ff9acff4d4b4290c8087a56e082ca520a7aabf7f0ffca5f03ee49f1bb5ac093304a2cb744241ad749e39022fce7c1a20c28ef08b65da911791a
diff --git a/net-libs/libnids/files/libnids-1.24-libdir.patch b/net-libs/libnids/files/libnids-1.24-libdir.patch
new file mode 100644
index 000000000000..578d9001d16e
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-libdir.patch
@@ -0,0 +1,44 @@
+--- a/configure.in
++++ b/configure.in
+@@ -69,7 +69,7 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAPLIB="-lpcap"
+      else
+         AC_ERROR(pcap.h or libpcap.a not found in $withval)
+      fi
+@@ -77,7 +77,7 @@
+   esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAP_CFLAGS="-I${prefix}/include"
+-     PCAPLIB="-L${exec_prefix}/lib -lpcap"
++     PCAPLIB="-lpcap"
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAP_CFLAGS="-I/usr/include/pcap"
+      PCAPLIB="-lpcap"
+@@ -146,12 +146,12 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
+-	LNETLIB="-L$withval/lib -lnet"
++	LNETLIB="-lnet"
+      elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	LNET_CFLAGS="-I$withval/include"
+-	LNETLIB="-L$withval/src -lnet"
++	LNETLIB="-lnet"
+      else
+ 	echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
+         AC_ERROR(libnet)
+@@ -163,7 +163,7 @@
+   else
+ 	if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then
+ 	     LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`"
+-	     LNETLIB="-L${exec_prefix}/lib -lnet"
++	     LNETLIB="-lnet"
+ 	else
+ 	     LNET_CFLAGS="`libnet-config --defines 2>/dev/null`"
+ 	     LNETLIB="-lnet"
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
new file mode 100644
index 000000000000..09d5cfe6dc05
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="http://libnids.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="
+	!net-libs/libnids:1.1
+	net-libs/libpcap
+	glib? ( dev-libs/glib:2 )
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )
+"
+DEPEND="
+	${RDEPEND}
+	glib? ( virtual/pkgconfig )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-static-libs.patch
+)
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--enable-shared \
+		$(usex glib '' --disable-libglib) \
+		$(use_enable libnet)
+}
+
+src_compile() {
+	emake shared $(usex static-libs static '')
+}
+
+src_install() {
+	local tgt
+	for tgt in _installshared $(usex static-libs _install ''); do
+		emake install_prefix="${D}" ${tgt}
+	done
+
+	dodoc CHANGES CREDITS MISC README doc/*
+}