gentoo auto-resync : 22:03:2025 - 00:31:29

3 files changed, 54 insertions, 2 deletions

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index d24567f4b809..3bbcf8d18634 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,3 +1,4 @@
+AUX libnftnl-1.2.8-valgrind-tests.patch 1681 BLAKE2B 07068688afd6df2c5209d47efa76abfa6b09cfa6f98ffea1604fb743f0b47f9169fb36c07bbf6c40c996f80cdf0bcbc05fa27a23ec5903c5c2208b59a991718c SHA512 7d4554ab5ceac7c5a13b93d75ea556544ab5a0ff492df3d128360b62ba3fee4d67dcc98e4e580c5807de6a5829ed590bb5be7e919f6157da81ed2c1d65a5dfb6
 DIST libnftnl-1.2.6.tar.xz 336684 BLAKE2B a08010b26db0c7a5429f33a92ca4f17e8e158005befa5f7e3f37d60456d1b481a3f95f46c0bcec74e98ab040940f533acc279672226f0abc6ce73a26ff56718a SHA512 0c8c369eec84b0c568f0067598bece6e3be9a0fbd977e443ae3b14a5a6d842a6086ceb5426a65f8c77204709655f148c1241193f1a928f8c12154a57e3548b34
 DIST libnftnl-1.2.6.tar.xz.sig 566 BLAKE2B 8ad336d0d8c693beb6335e874ad62040257e0c4527f8acb32fcc8b4889eea88ba3a42c9b2b795db6f6e3d148066ee0a9217b1e30c7e784c793458dd480ee624a SHA512 61288aa03fb80d43d09866ce549815202f682b30b283cf3119ced0fe59536d10f1c029e433651d1cb31115e977b660886a153f3361f5cafdbb0ed6da602e5b2f
 DIST libnftnl-1.2.7.tar.xz 343876 BLAKE2B 42decbfdfce07c4743e7a55cf3d5d03a244ab6ac5e0f33107322ab44edcc96d360ac02f0376786656a5f7d43986499474e20a5b835f838e06d12efb017dd8eb4 SHA512 24ff3e7e97f51cb5dfda2fbd2f5e175abcec0dd58f94936022800ec356ff004a531f0915df72278b867769ba71473d407b01d52cc33a3cafb043d9a90b051f9d
@@ -7,6 +8,6 @@ DIST libnftnl-1.2.8.tar.xz.sig 566 BLAKE2B 2c8eae671d41f84b1ded96f7dc98e214a240c
 EBUILD libnftnl-1.2.6-r1.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa
 EBUILD libnftnl-1.2.6.ebuild 1597 BLAKE2B 46322df3e8858340d9bace49d376f96bb1730f15bbcc41a7ccf9d0e244b501c591f06c426b293a5bede1c474da1360d561bb6af76861e57a6cd3bb0b2044323a SHA512 bb61baa34478c799fe53ef6b51716c204ba569e37b459a218bb3148fccd05a40484cdb6e098fdb05b24bb6661d2aa3ed6541da30a97a0e925751efdd9f47da51
 EBUILD libnftnl-1.2.7.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa
-EBUILD libnftnl-1.2.8.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa
+EBUILD libnftnl-1.2.8.ebuild 1610 BLAKE2B fd02629d5085a4ccfe547ef6d10f4c55cfd593d082515202c60e46eddbca5699cdd5f89f0b4b828d14a88344bf07412c507aa079719056512774e4944e253f41 SHA512 07f2a13ec4fc30d5ee1de479bedd76fbcfcca64a342a4ffb0361df530b69d0792ac100f830960aa3fe78c921c2ecb95c5f9dd825a7a6cca2246260d8aa057b94
 EBUILD libnftnl-9999.ebuild 1564 BLAKE2B d2bc07055b525f502f44e11184ce599aa985ad0760671a916771992a739229c388f0c4a1d3adc714bf81bce03d95221cec568795464fde3c31905ee9703c0413 SHA512 7715f480f3e63eaa6ee72c5edc9d919634ae4e094c601b6b57fd96da60174195074a3486eae1432af7170cdf4bf5f50b6f4cf926d545a00f127b66ec7285356a
 MISC metadata.xml 338 BLAKE2B fc63cdfa0a08b5933c6606290f44c4aee56f65224222425b6bf3b1c88427d17b5222a31126c38b326bbf8095786cacce65121103fcd45ce27aa16f9bde979a82 SHA512 1875b393684566e8dee08cfaa9fb0f19196121e500bab6deef6895784d33cdf2e2a7a96469ae57a02654f7dbc22e8af03b15f5a8a3dd840743ef077dc68edc71
diff --git a/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch
new file mode 100644
index 000000000000..62f69a1feedf
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch
@@ -0,0 +1,47 @@
+https://git.netfilter.org/libnftnl/commit/?id=ff37c01480cd0b938658d180ff5c7b1958ad250f
+
+From ff37c01480cd0b938658d180ff5c7b1958ad250f Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Wed, 27 Nov 2024 18:54:53 +0100
+Subject: tests: Fix for ASAN
+
+The 'data' arrays in match and target expression tests were undersized
+as they did not cover for the terminating NUL-char of the string used to
+initialize them. When passing such array to strdup(), the latter reads
+until after the defined array boundary.
+
+Fixes: 93483364369d8 ("src: get rid of cached copies of x_tables.h and xt_LOG.h")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ tests/nft-expr_match-test.c  | 2 +-
+ tests/nft-expr_target-test.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c
+index 53a8b84..bc9f6ac 100644
+--- a/tests/nft-expr_match-test.c
++++ b/tests/nft-expr_match-test.c
+@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
+ 	char buf[4096];
+ 	struct nftnl_expr_iter *iter_a, *iter_b;
+ 	struct nftnl_expr *rule_a, *rule_b;
+-	char data[16] = "0123456789abcdef";
++	char data[] = "0123456789abcdef";
+ 
+ 	a = nftnl_rule_alloc();
+ 	b = nftnl_rule_alloc();
+diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
+index 89de945..a483e7a 100644
+--- a/tests/nft-expr_target-test.c
++++ b/tests/nft-expr_target-test.c
+@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
+ 	char buf[4096];
+ 	struct nftnl_expr_iter *iter_a, *iter_b;
+ 	struct nftnl_expr *rule_a, *rule_b;
+-	char data[16] = "0123456789abcdef";
++	char data[] = "0123456789abcdef";
+ 
+ 	a = nftnl_rule_alloc();
+ 	b = nftnl_rule_alloc();
+-- 
+cgit v1.2.3
diff --git a/net-libs/libnftnl/libnftnl-1.2.8.ebuild b/net-libs/libnftnl/libnftnl-1.2.8.ebuild
index ec50cf89c560..382d2095c3b4 100644
--- a/net-libs/libnftnl/libnftnl-1.2.8.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,6 +35,10 @@ BDEPEND+="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-valgrind-tests.patch
+)
+
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"