diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /net-firewall/nftables/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'net-firewall/nftables/files')
3 files changed, 94 insertions, 0 deletions
diff --git a/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch b/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch new file mode 100644 index 000000000000..41c3de5bc83b --- /dev/null +++ b/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch @@ -0,0 +1,27 @@ +https://git.netfilter.org/nftables/commit/src?id=1d507ce7f1d3c12481ee24bd1dcac2fc1984ee9f + +From: Sam James <sam@gentoo.org> +Date: Thu, 24 Feb 2022 19:45:43 +0000 +Subject: build: explicitly pass --version-script to linker + +--version-script is a linker option, so let's use -Wl, so that +libtool handles it properly. It seems like the previous method gets silently +ignored with GNU libtool in some cases(?) and downstream in Gentoo, +we had to apply this change to make the build work with slibtool anyway. + +But it's indeed correct in any case, so let's swap. + +Signed-off-by: Sam James <sam@gentoo.org> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -91,7 +91,7 @@ libparser_la_CFLAGS = ${AM_CFLAGS} \ + + libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS} libparser.la + libnftables_la_LDFLAGS = -version-info ${libnftables_LIBVERSION} \ +- --version-script=$(srcdir)/libnftables.map ++ -Wl,--version-script=$(srcdir)/libnftables.map + + if BUILD_MINIGMP + noinst_LTLIBRARIES += libminigmp.la +cgit v1.2.3 diff --git a/net-firewall/nftables/files/nftables-1.0.2-compilation.patch b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch new file mode 100644 index 000000000000..96670c1d9531 --- /dev/null +++ b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch @@ -0,0 +1,36 @@ +https://git.netfilter.org/nftables/commit/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3 + +From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso <pablo@netfilter.org> +Date: Tue, 22 Feb 2022 00:56:36 +0100 +Subject: examples: compile with `make check' and add AM_CPPFLAGS + +Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to +specify local headers via -I. + +Unfortunately, `make distcheck' did not catch this compile time error in +my system, since it was using the nftables/libnftables.h file of the +previous nftables release. + +Fixes: 5b364657a35f ("build: missing SUBIRS update") +Fixes: caf2a6ad2d22 ("examples: add libnftables example program") +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + examples/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index c972170d..3b8b0b67 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,6 @@ +-noinst_PROGRAMS = nft-buffer \ ++check_PROGRAMS = nft-buffer \ + nft-json-file + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + LDADD = $(top_builddir)/src/libnftables.la +-- +cgit v1.2.3 + diff --git a/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch b/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch new file mode 100644 index 000000000000..09841d482222 --- /dev/null +++ b/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch @@ -0,0 +1,31 @@ +https://git.netfilter.org/nftables/commit/src?id=e98a9b83cd52c7c75bedb3dad46539b197ed17ba + +From: Sam James <sam@gentoo.org> +Date: Thu, 24 Feb 2022 19:45:42 +0000 +Subject: libnftables.map: export new nft_ctx_{get,set}_optimize API + +[ Remove incorrect symbol names were exported via .map file ] + +Without this, we're not explicitly saying this is part of the +public API. + +This new API was added in 1.0.2 and is used by e.g. the main +nft binary. Noticed when fixing the version-script option +(separate patch) which picked up this problem when .map +was missing symbols (related to when symbol visibility +options get set). + +Signed-off-by: Sam James <sam@gentoo.org> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- a/src/libnftables.map ++++ b/src/libnftables.map +@@ -30,6 +30,6 @@ LIBNFTABLES_2 { + } LIBNFTABLES_1; + + LIBNFTABLES_3 { +- nft_set_optimize; +- nft_get_optimize; ++ nft_ctx_set_optimize; ++ nft_ctx_get_optimize; + } LIBNFTABLES_2; +cgit v1.2.3 |