gentoo resync : 29.12.2022

4 files changed, 128 insertions, 8 deletions

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 72a8bd1cadb0..a7d709699f7d 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,5 +1,10 @@
+AUX libnftnl-1.2.1-missing-export-set_elem.patch 640 BLAKE2B 6b5a1470c2e8175a1ed9667f7dc8dba09f074b57d20b3b5baff27f3cc3cc08014070744022b004573255c29f8124b6a0bc5a2d569fdf955c1e566a7646ead773 SHA512 afe61d68f2348c9ad02386a452611cb38b88eaf32cbbe565efc0cc929d73db89541b3675301773bd195e09c1834c006b22be92d1c7e923aeb2095d8db78ea54a
 DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
 DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
+DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
+DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
+DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
-EBUILD libnftnl-9999.ebuild 1590 BLAKE2B 502b1b6702d73793e6dee2b0607612b1a0327af63b4bfc8ab83c28253bd3b2519a9d3c124b853f0fb13f59e6cb04bbd189293599ca8269324d47a83996b7f7d2 SHA512 57def640d0b9414b41fd856c76d5b70bad55ca17b0712fb619cb0741283ce29c702dc8a95a4f5df5f8a5a8b3fcbb4c84288663e56556138d6082f080e80f9169
+EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
+EBUILD libnftnl-9999.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
new file mode 100644
index 000000000000..0ff574ddc48a
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
@@ -0,0 +1,21 @@
+https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9
+
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Wed, 18 May 2022 23:54:03 +0200
+Subject: set_elem: missing export symbol
+
+nftnl_set_elem_nlmsg_build_payload() is already available through .map
+file and headers, add missing EXPORT_SYMBOL.
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+--- a/src/set_elem.c
++++ b/src/set_elem.c
+@@ -300,6 +300,7 @@ err:
+ 	return NULL;
+ }
+ 
++EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload);
+ void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh,
+ 				      struct nftnl_set_elem *e)
+ {
+cgit v1.2.3
diff --git a/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1515dc6be1b4
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-clang-fortify-source.patch.xz
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-clang-fortify-source.patch
+)
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_unpack() {
+	# Drop this phase definition once fortify source patch is in next release
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nftnl
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index 215d4c569086..49e48df43765 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -3,33 +3,36 @@
 
 EAPI=7
 
-inherit autotools linux-info usr-ldscript verify-sig
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
 else
 	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
 		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
 IUSE="examples static-libs test"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND+="
-	virtual/pkgconfig"
+BDEPEND+=" virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-export-set_elem.patch
+)
+
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"
@@ -41,6 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
 }
 
@@ -48,12 +52,15 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	gen_usr_ldscript -a nftnl
+
 	find "${ED}" -type f -name '*.la' -delete || die
 
 	if use examples; then