gentoo resync : 20.10.2021

3 files changed, 54 insertions, 10 deletions

diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index e92663dcf87d..9c06944f128b 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,6 +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-no-inline.patch 1259 BLAKE2B 1ac7190a455e71617df1297f64d718ebb099cc6ad113a27de65f59b6eaf65225999a10dcb6adc524365580dc9662758a7cc452b81951f3b1d4942c29eed87254 SHA512 95e632891a4aea8792ab88f78d3bc2cdae203ad23b86033b829b743071a08ef57ee78256eb2958483d2946a2fa40582a7003c8b5471b5500591373ae789a2a14
 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-r7.ebuild 1157 BLAKE2B d85ff2648f8dcada0a038b80b0fb6d590fc8986188d9caa83a059a2fa83327872ae2e36b3bb33be6592ea1a5d7a6d752c4153feec6a1c21121d19333ff83491d SHA512 964d2666d84d2e1a1d591a3080f00bac8db51a1201e42dbc8926d311f23a1d1ae515351fd997c0b8e565f213fd6834ce6f028116767b04e37426fd872cbdd999
+EBUILD libnids-1.24-r8.ebuild 1199 BLAKE2B e961b542b65561c290c50b7760a7a08f2393aaae0a9b1e45b2a00550e005a4e404c2b6bf83c611ed1b5a84f2bbef3505c41df51e63e3e809bb22e333e50a1552 SHA512 693b40bfa675398ef8752ea3b2b1827150d1a89661fa9ff390ceac5e23683dd9700ebf283380abd8a098c2d409b974fbef6ccb3d9570fea0df50979622b63159
 MISC metadata.xml 689 BLAKE2B 427b3b74135ded960a4018145565bf5102432068f16272ee77c222a61a2a2b1c71000c2891e73d108036929ebe371c627cbd4704c21b5e16d14690843b6be67a SHA512 886e1ebf913dfb9e71b97effb737545b8e06dff2780ee92fd90ef86061a06b28f7f3f76eb8ead3bfbef8694184988ca91fd9a6a31ade302d84ac2740d53d98f7
diff --git a/net-libs/libnids/files/libnids-1.24-no-inline.patch b/net-libs/libnids/files/libnids-1.24-no-inline.patch
new file mode 100644
index 000000000000..8a57c6354d3c
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-no-inline.patch
@@ -0,0 +1,43 @@
+https://src.fedoraproject.org/rpms/libnids/raw/rawhide/f/libnids-1.24-inline.patch
+https://bugs.gentoo.org/818517
+
+Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which
+avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and
+my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
+
+--- a/src/checksum.c
++++ b/src/checksum.c
+@@ -120,7 +120,7 @@
+   By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt
+   Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+   u_int sum;
+   if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+   this routine is used for miscellaneous IP-like checksums, mainly in
+   icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+   return (csum_fold(csum_partial(buff, len, 0)));
+ }
+ 
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+   return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ 			   csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r8.ebuild
index aec872f32866..a993c8d91295 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
@@ -13,20 +14,18 @@ SLOT="1.2"
 KEYWORDS="amd64 ppc x86"
 IUSE="+glib +libnet static-libs"
 
-RDEPEND="
-	!net-libs/libnids:1.1
+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 )
-"
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${P}-libdir.patch
 	"${FILESDIR}"/${P}-static-libs.patch
+	"${FILESDIR}"/${P}-no-inline.patch
 )
 
 src_prepare() {
@@ -36,6 +35,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
+
 	append-flags -fno-strict-aliasing
 
 	econf \