gentoo resync : 06.04.2022

3 files changed, 69 insertions, 3 deletions

diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 3bf49fd93ab3..48c4cb433eab 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,8 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-EBUILD libnfnetlink-1.0.1.ebuild 1435 BLAKE2B f84bb5970f77ad11145a30b4f4f2e7bfd09aea0c30bf3f1811cc9680e6d4d8923aa40f3e58d80196949593451197cf8421005b975b5e75039158e90b13b44110 SHA512 44358bc5b7f42b42a6ee130434a6f8612165685b0c48913c0de293f415777c8f35771248c692e76bf03b744b5ec882f6707970bf50b96608784d3f36b20b4a25
+DIST libnfnetlink-1.0.1.tar.bz2.sig 543 BLAKE2B e82c79edc77aa68b99549491650eb1888ef81c186918a452d813fb3b793b76e0334a909161a5b1b56a71ffe51b3293f6b0fe5d36b33c473dd50fa222a0844cb0 SHA512 f3ef8429e3da1bca815b186e96dfee93317f7a5712c63a4cc404648a0ee77353fae058a519681bdf684e82d1a230e717f4d34e8eaf0318e9a76dd05104fdf382
+DIST libnfnetlink-1.0.2.tar.bz2 298844 BLAKE2B 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4 SHA512 a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854
+DIST libnfnetlink-1.0.2.tar.bz2.sig 566 BLAKE2B 9e87fc7917dd2f8b29de642ef819bca957bd6223417e167e21770450ce2eeff717ab06079ac75c689184f9188e785b663fca81cdda30b87310bfb1b456b03dd2 SHA512 3dcb980fb209c9faa9774f0393bc3b4b5fa6e899330f0d0dcb92307984f696b869de27c22dd54d7f181bddd72e104b38e8617af6bb3d6fe992a96da172b10457
+EBUILD libnfnetlink-1.0.1.ebuild 1772 BLAKE2B 76510962a4b596991e9903025c86a1acc048022ac8e0543713decc9f0ff5ab0f80333c550bdfeb5bcc2539a8c2fd4e0b602d93ef47bec0f86dc529eb11c5f40a SHA512 9eeac406c0b62528c74f8281e796cc354d82db10b99d19430c1e054b3ae128020f29e691934d81d6c8df4d4dea2a30d02dacd7197c32575656564d81a45f448f
+EBUILD libnfnetlink-1.0.2.ebuild 1496 BLAKE2B f0751c0984d029af3276f3adfc03a11ce716d97ff67537edd34fccd52870e1698c82e4a07730a60b273a2c595c8d2cdb4e3bddd26e0e5955d601feb06bd29965 SHA512 a28995bcc426850b15636046ae68a2ae95ca610d8ad02b65818ef94f2f226adbc01f16c77b71d5f87ae2f50728756d9e6da563dc1882bba3dcd22026e569ba94
 MISC metadata.xml 365 BLAKE2B f3b124b86c63821ea2f57659d3d514a328a661f3926a217b0509dca752cd6bd4f4c857b81b10a0be67e2957e2143dd8e8face7c71156b068b04c648779d89bab SHA512 cca4096d0a1dfb8be6410a240065ee8960ea132fe31f5b437db5acc92294ad823f97edf50c8c0f4a6e85303e4f2c39a30469bb493be6c11ee533bda0bc9b2c31
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index 22064cc960a0..338e11cddd33 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info verify-sig
 
 PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613
 PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch
@@ -12,11 +12,15 @@ DESCRIPTION="the low-level library for netfilter related kernel/userspace commun
 HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
 SRC_URI="
 	http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
+	https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}
+	verify-sig? ( http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
@@ -40,6 +44,12 @@ pkg_setup() {
 	check_extra_config
 }
 
+src_unpack() {
+	default
+
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+}
+
 src_configure() {
 	econf --disable-static
 }
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild
new file mode 100644
index 000000000000..2480c324f33c
--- /dev/null
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info verify-sig
+
+DESCRIPTION="The low-level library for netfilter related kernel/userspace communication"
+HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
+SRC_URI="
+	https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+	verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		ewarn "${PN} requires at least 2.6.18 kernel version"
+	fi
+
+	#netfilter core team has changed some option names with kernel 2.6.20
+	error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+		ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
+	else
+		CONFIG_CHECK="~NF_CT_NETLINK"
+		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	default
+
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+}
+
+src_install() {
+	default
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+}