From 0c0625748a818d41ddc5c2863e13262d228929d5 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Sun, 27 Sep 2026 23:49:38 +1300 Subject: [PATCH] nftables: upgrade 1.1.6 -> 1.1.7 Dropped patch that is merged in the upstream version. Also drop sed subsitution as upstream adopted python3[1][2]. Changelog: https://netfilter.org/projects/nftables/files/changes-nftables-1.1.7.txt [1]https://git.netfilter.org/nftables/commit/?h=v1.1.7&id=9c0ddde6c830d4718cea88160693fdad6cb15137 [2]https://git.netfilter.org/nftables/commit/tests/shell/helpers/json-pretty.sh?h=v1.1.7&id=66dc3bb9962ffc6b06ba50d2ebc0f4c15d2fa63f Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...URCE_DATE_EPOCH-for-build-time-stamp.patch | 41 ------------------- .../{nftables_1.1.6.bb => nftables_1.1.7.bb} | 6 +-- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch rename meta-networking/recipes-filter/nftables/{nftables_1.1.6.bb => nftables_1.1.7.bb} (91%) diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch b/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch deleted file mode 100644 index f52ff28b21..0000000000 --- a/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fde27e62b241fb7d96de36a2fd6d7879c24f5de6 Mon Sep 17 00:00:00 2001 -From: Jeremy Sowden -Date: Wed, 28 Jan 2026 18:31:07 +0000 -Subject: [PATCH] build: support `SOURCE_DATE_EPOCH` for build time-stamp - -In order to support reproducible builds, set the build time-stamp to the value -of the environment variable, `SOURCE_DATE_EPOCH`, if set, and fall back to -calling `date`, otherwise. - -Link: https://reproducible-builds.org/docs/source-date-epoch/ -Fixes: 64c07e38f049 ("table: Embed creating nft version into userdata") -Reported-by: Arnout Engelen -Closes: https://github.com/NixOS/nixpkgs/issues/478048 -Suggested-by: Philipp Bartsch -Signed-off-by: Jeremy Sowden -Signed-off-by: Phil Sutter - -Upstream-Status: Backport [https://git.netfilter.org/nftables/commit/?id=ca86f206c92704170a295b8dc7a41f6448835dde] -[Adjust patch for 1.1.6] - -Signed-off-by: Yi Zhao ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6825474..527049f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,7 +165,7 @@ AC_CONFIG_COMMANDS([nftversion.h], [ - ]) - # Current date should be fetched exactly once per build, - # so have 'make' call date and pass the value to every 'gcc' call --AC_SUBST([MAKE_STAMP], ["\$(shell date +%s)"]) -+AC_SUBST([MAKE_STAMP], ["${SOURCE_DATE_EPOCH:-$(date +%s)}"]) - - AC_ARG_ENABLE([distcheck], - AS_HELP_STRING([--enable-distcheck], [Build for distcheck]), --- -2.34.1 - diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.7.bb similarity index 91% rename from meta-networking/recipes-filter/nftables/nftables_1.1.6.bb rename to meta-networking/recipes-filter/nftables/nftables_1.1.7.bb index 9567e8f8b9..d0ce19b742 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.7.bb @@ -12,10 +12,9 @@ DEPENDS = "libmnl libnftnl bison-native \ ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ - file://0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" +SRC_URI[sha256sum] = "a6fbf060d8d4fff001517a2b94f356bb4366bfbf0ba366366f9d27cc38caa58f" UPSTREAM_CHECK_URI = "https://www.netfilter.org/pub/nftables/" UPSTREAM_CHECK_REGEX = "${BPN}-(?P\d+(\.\d+)+)\.tar\.xz" @@ -116,9 +115,6 @@ do_install_ptest() { cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} - sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py - sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py - sed -i 's#exec python -c#exec python3 -c#' ${D}${PTEST_PATH}/${TESTDIR}/shell/helpers/json-pretty.sh # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest }