From 01f2380368c6d8f213b06b10741e0343c03bd009 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Mar 2026 07:28:19 +0000 Subject: [PATCH] net-firewall/conntrack-tools: Sync with Gentoo It's from Gentoo commit d78736750f2e89905282ded2a581b896ffddb132. Signed-off-by: Flatcar Buildbot --- .../net-firewall/conntrack-tools/Manifest | 4 +- .../conntrack-tools-1.4.7-r1.ebuild | 114 ------------------ ....8.ebuild => conntrack-tools-1.4.9.ebuild} | 10 +- ...e.am-don-t-suppress-various-warnings.patch | 28 ----- ...ls-1.4.5-0002-Fix-Wstrict-prototypes.patch | 19 --- ...3-Fix-Wimplicit-function-declaration.patch | 56 --------- 6 files changed, 8 insertions(+), 223 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild rename sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/{conntrack-tools-1.4.8.ebuild => conntrack-tools-1.4.9.ebuild} (91%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/Manifest b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/Manifest index 5b519c990d..9eb22f0bf4 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/Manifest @@ -1,4 +1,4 @@ -DIST conntrack-tools-1.4.7.tar.bz2 539688 BLAKE2B 42a3cacf8a32a5b8b688a9fd68f66024c591e9814ef3cc349456691094bab0fae15bb1c00befa178b0f8e845bf6fc00715cbf9db55cd7bf2d155c2dfd55f9b1a SHA512 3d37a6b8cd13fd3c149ab80009d686d2184920ba2d0d5c1b57abed6e92e0dd92cba868bfe22f1a155479fe5ab2e291b8bb8a7e72123a73788032202ac142653b -DIST conntrack-tools-1.4.7.tar.bz2.sig 566 BLAKE2B c513cd59d9aeb76bb33bb8c4e0d25c46b6303a9d3f3e359e20248e2d8dd2822777056e217c12da9005ee075036ea05a74dd1ed9f22a44b7d4745ff6917bda15b SHA512 5a2bcc6da792544029ddf0d3a4caf019b215907e66d491e5d98a4f1189fc9c03ec8aad5ad22166799c5f0c81273284cb757e9368c9d9d3049bc49da47c037e05 DIST conntrack-tools-1.4.8.tar.xz 452980 BLAKE2B 2f8a7d7facf4890a8ca7dec54d5faa1383ad5e449a0599707578567e9c8ed6fd63ca308538afc34e99121e39e80c1ce686c8dda89247abdf4699bb420b52c4fb SHA512 95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf DIST conntrack-tools-1.4.8.tar.xz.sig 566 BLAKE2B 65c2ee185b099281603bca179038bd9ab6e28756f9fa12a53a8bcb75ed561097c9e4672c45fcecc366b86b65e1753073808090e264671d3a3d8dd18ed6f4d680 SHA512 8cd229d2e980ab1788e90fc8f53827fe1e4b21801cad6cddf6a9ff537501c40c52242cc964005b2889ad0a4548c772304db8696d4644611ecf9f091aca5c14ee +DIST conntrack-tools-1.4.9.tar.xz 452480 BLAKE2B afa7aa685e20be510d7a7a916625d83f34d305212b8b86d4de94976d2212886391a45acdba3e906a7b6614b6476e61ead6648ee567458d3a90ebbe2eccbd3e7b SHA512 1cef49d6f1995915a5c6b811fefc02bef92c9881b6eba8d6f85071f4f129ec139dadfd5546fa02d3ed42888f4d6f46ffc0cc13da30de1baa28a795b95041c035 +DIST conntrack-tools-1.4.9.tar.xz.sig 566 BLAKE2B 6700acad416fa77dc409da21d31c138861c026f7a924154448e925ddb3bc72a4af5111219db6542d17e313f1d5f277b35996b57714a1bfce03c2663c280fb0cf SHA512 8fe0e78d1d76924e3897924af32b3cae5fcb5d42661ea728ed00bf6539c6319720844a3c378fb304ca78da7d31d92361d08640f7f00064752ce0e41e9bd0490a diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild deleted file mode 100644 index bf2390450b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc -inherit autotools linux-info systemd verify-sig - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="https://conntrack-tools.netfilter.org" -SRC_URI="https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2 - verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2.sig )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86" -IUSE="doc +cthelper +cttimeout systemd" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnetfilter_conntrack-1.0.9 - >=net-libs/libnetfilter_queue-1.0.2 - >=net-libs/libnfnetlink-1.0.1 - net-libs/libtirpc - cthelper? ( - >=net-libs/libnetfilter_cthelper-1.0.0 - ) - cttimeout? ( - >=net-libs/libnetfilter_cttimeout-1.0.0 - ) - systemd? ( - >=sys-apps/systemd-227 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) - verify-sig? ( sec-keys/openpgp-keys-netfilter ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch - "${FILESDIR}"/${PN}-1.4.5-0002-Fix-Wstrict-prototypes.patch - "${FILESDIR}"/${PN}-1.4.5-0003-Fix-Wimplicit-function-declaration.patch -) - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 18 ; then - die "${PN} requires at least 2.6.18 kernel version" - fi - - # netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="~NF_CT_NETLINK" - fi - CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_prepare() { - default - - # bug #474858 - sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die - - # Drop once Clang 16 patches merged (implicit func decl, etc) - eautoreconf -} - -src_configure() { - econf \ - $(use_enable cthelper) \ - $(use_enable cttimeout) \ - $(use_enable systemd) -} - -src_compile() { - default - - use doc && emake -C doc/manual -} - -src_install() { - default - - newinitd "${FILESDIR}"/conntrackd.initd-r3 conntrackd - newconfd "${FILESDIR}"/conntrackd.confd-r2 conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - systemd_dounit "${FILESDIR}"/conntrackd.service - - dodoc -r doc/sync doc/stats AUTHORS TODO - use doc && dodoc doc/manual/${PN}.html -} diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.8.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.9.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.8.ebuild rename to sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.9.ebuild index 9f8f953c6f..c55d00f628 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/conntrack-tools-1.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,14 +13,14 @@ SRC_URI=" verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.xz.sig ) " -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" IUSE="doc +cthelper +cttimeout systemd" RDEPEND=" >=net-libs/libmnl-1.0.3 - >=net-libs/libnetfilter_conntrack-1.0.9 + >=net-libs/libnetfilter_conntrack-1.1.1 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc @@ -104,4 +104,6 @@ src_install() { dodoc -r doc/sync doc/stats AUTHORS TODO use doc && dodoc doc/manual/${PN}.html + + find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch deleted file mode 100644 index bc9bd8d3a1..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugzilla.netfilter.org/show_bug.cgi?id=1637 - -From a450f6374dc1b0296578599adf77f9ac025fab85 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 24 Nov 2022 07:51:23 +0000 -Subject: [PATCH 1/3] Makefile.am: don't suppress various warnings - -These will become fatal with Clang 16 and GCC 14 anyway, but let's -address the real problem (followup commit). - -We do have to keep one wrt yyerror() & const char* though, but -the issue is contained to the code Bison generates. - -Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637 -Signed-off-by: Sam James ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -60,8 +60,8 @@ if HAVE_SYSTEMD - conntrackd_SOURCES += systemd.c - endif - --# yacc and lex generate dirty code --read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls -Wno-sign-compare -+# yacc and lex generate dirty code (issue is in yyerror() wrt const char* vs. char*) -+read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-incompatible-pointer-types -Wno-discarded-qualifiers - - conntrackd_LDADD = ${LIBMNL_LIBS} ${LIBNETFILTER_CONNTRACK_LIBS} \ - ${libdl_LIBS} ${LIBNFNETLINK_LIBS} diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch deleted file mode 100644 index e170ec07ba..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugzilla.netfilter.org/show_bug.cgi?id=1637 - -From 11965f7020fbadcc9784daf598687841e96ef3fe Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 24 Nov 2022 07:52:01 +0000 -Subject: [PATCH 2/3] Fix -Wstrict-prototypes - -Signed-off-by: Sam James ---- a/src/network.c -+++ b/src/network.c -@@ -113,7 +113,7 @@ void nethdr_track_update_seq(uint32_t seq) - STATE_SYNC(last_seq_recv) = seq; - } - --int nethdr_track_is_seq_set() -+int nethdr_track_is_seq_set(void) - { - return local_seq_set; - } diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch b/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch deleted file mode 100644 index eb34f4ffd4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://bugzilla.netfilter.org/show_bug.cgi?id=1637 - -From a6df37777fc47c2473a13501c17eb3cbbf922ec1 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 24 Nov 2022 07:57:37 +0000 -Subject: [PATCH 3/3] Fix -Wimplicit-function-declaration - -Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637 -Signed-off-by: Sam James ---- a/src/read_config_lex.l -+++ b/src/read_config_lex.l -@@ -21,6 +21,7 @@ - - #include - -+#include "log.h" - #include "conntrackd.h" - #include "read_config_yy.h" - %} -@@ -174,7 +175,7 @@ notrack [N|n][O|o][T|t][R|r][A|a][C|c][K|k] - %% - - int --yywrap() -+yywrap(void) - { - return 1; - } ---- a/src/read_config_yy.y -+++ b/src/read_config_yy.y -@@ -31,14 +31,25 @@ - #include "cidr.h" - #include "helper.h" - #include "stack.h" -+#include "log.h" -+ -+#include -+#include -+#include -+ - #include - #include -+ - #include - #include - - extern char *yytext; - extern int yylineno; - -+int yylex (void); -+int yyerror (char *msg); -+void yyrestart (FILE *input_file); -+ - struct ct_conf conf; - - static void __kernel_filter_start(void);