gentoo resync : 20.03.2022

5 files changed, 70 insertions, 63 deletions

diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 4b5bedd42812..11835a9bdeb8 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,7 +1,6 @@
-DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
-DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
+AUX libnetfilter_conntrack-1.0.9-musl.patch 1671 BLAKE2B c6618c82fbaf68f5c61dc7631d12630c82e597112c5131b0b3fa49344a4d70e6a3efaf13b42f4971d0b0ae9bca0a1b6183170111b7291cd374cc4a38ea64b167 SHA512 121cdbb92d17c4ffaaa93ddd8e881489f82f00aa931f14032aaafcb2c1a65ad18f122868baaa9d0c0b266638c9888c5f037f47ecba09321de683c569e2fe7466
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 959 BLAKE2B 42fa1e8732e6550f5dfa61d220fd8224b894b0c3f7b3073e00eac3101a756b9a0fc8e491df988da4629ebe7aae32e9cdc66ceb7b97df2a6da01d4076a3ab9082 SHA512 a791b161fa2a4a7d900f926e929a7789057b2ebaddaa9882ae652559d3a9f59b9bac6e690cb15289f873a63a93b507d09d9acb3879695591335331314173fd35
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 966 BLAKE2B 7b943004490c4c6a13fe21faf47e74bc82487c568099b64c86e493c09ca597d11e7f36f0806dd30261959d0dea35422be9d54b87defc0d57b5eaec574bb7bc53 SHA512 8c5e50506388a81789997944ae67646bff479d941372d57c791f19e50d8f02547f4853ee4adb57a53d253831ee112875c591b0a9c05fe09a1aa2edea5d546416
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 966 BLAKE2B 7b943004490c4c6a13fe21faf47e74bc82487c568099b64c86e493c09ca597d11e7f36f0806dd30261959d0dea35422be9d54b87defc0d57b5eaec574bb7bc53 SHA512 8c5e50506388a81789997944ae67646bff479d941372d57c791f19e50d8f02547f4853ee4adb57a53d253831ee112875c591b0a9c05fe09a1aa2edea5d546416
+DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 965 BLAKE2B 5a4a1475076ca7b3eee8b895c60c12b964e07241b7dbd4c985aacde96af3c8d83598360ef8bc6426ff7036ac9fef478f023a915a676c2ed77419ad33227fa269 SHA512 2910307ec62c7583fbedb1e3dfd6862a72ee5d600c27408411d733a8f68856a3aa2d32969b976a2a1ff676f1ad66a4c4a7a8a1564a114a63950e1738e3340ca9
+EBUILD libnetfilter_conntrack-1.0.9.ebuild 1072 BLAKE2B fc33966518b05a08a8b212872319debd929ddb44457aa110fe325d79350bc40bbea1f79da16f83845d418d6d2e2d7050bb4fa42163b73e563fe1562b38493e73 SHA512 88eb5318a24d14b718f6d728d5efc06dd00ee2061be342a8455fc94618bb9f042853094ef805bb91ba597d26aa97ce980c28802d51f92faefcc593d0fa6c6d94
 MISC metadata.xml 375 BLAKE2B fc9624816dbdf791c5d399fd9db83b402c1186387a7898c700f277e926e6424d9a2cf3dae39221041ec782c017fcf96cab8bd698878dad524f9feb111576a652 SHA512 016ff7eaeb05c1566ed7f53a2fda5c5808e847d6d5cd07521769ebfff4cdc76fe4d40abe13cd9ed68c56c83a2442720ba526e9454d596e3fee87e25843933f6b
diff --git a/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch
new file mode 100644
index 000000000000..e1ce87df4e89
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch
@@ -0,0 +1,46 @@
+https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824
+
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 24 Feb 2022 15:01:11 +0100
+Subject: conntrack: fix build with kernel 5.15 and musl
+
+Currently, with kernel 5.15 headers and musl building is failing with
+redefinition errors due to a conflict between the kernel and musl headers.
+
+Musl is able to suppres the conflicting kernel header definitions if they
+are included after the standard libc ones, however since ICMP definitions
+were moved into a separate internal header to avoid duplication this has
+stopped working and is breaking the builds.
+
+It seems that the issue is that <netinet/in.h> which contains the UAPI
+suppression defines is included in the internal.h header and not in the
+proto.h which actually includes the kernel ICMP headers and thus UAPI
+supression defines are not present.
+
+Solve this by moving the <netinet/in.h> include before the ICMP kernel
+includes in the proto.h
+
+Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+--- a/include/internal/internal.h
++++ b/include/internal/internal.h
+@@ -14,7 +14,6 @@
+ #include <arpa/inet.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <netinet/in.h>
+ 
+ #include <libnfnetlink/libnfnetlink.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+--- a/include/internal/proto.h
++++ b/include/internal/proto.h
+@@ -2,6 +2,7 @@
+ #define _NFCT_PROTO_H_
+ 
+ #include <stdint.h>
++#include <netinet/in.h>
+ #include <linux/icmp.h>
+ #include <linux/icmpv6.h>
+ 
+cgit v1.2.3
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
deleted file mode 100644
index 3ef261d55d21..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( README )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	# netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-	fi
-
-	check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index 3ef261d55d21..a42aa6f12fe1 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
index 62ad204c78dc..a45a3d456753 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit linux-info
 
@@ -11,20 +11,19 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=">=net-libs/libmnl-1.0.3
+	>=net-libs/libnfnetlink-1.0.0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -41,3 +40,9 @@ pkg_setup() {
 
 	check_extra_config
 }
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}