commit: d78736750f2e89905282ded2a581b896ffddb132 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Mon Feb 9 13:45:07 2026 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Mon Feb 9 13:45:07 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7873675
net-firewall/conntrack-tools: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...kefile.am-don-t-suppress-various-warnings.patch | 28 ----------- ...k-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch | 19 -------- ...5-0003-Fix-Wimplicit-function-declaration.patch | 56 ---------------------- 3 files changed, 103 deletions(-) diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch deleted file mode 100644 index bc9bd8d3a13d..000000000000 --- a/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 <[email protected]> -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 <[email protected]> ---- 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/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch deleted file mode 100644 index e170ec07ba0a..000000000000 --- a/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 <[email protected]> -Date: Thu, 24 Nov 2022 07:52:01 +0000 -Subject: [PATCH 2/3] Fix -Wstrict-prototypes - -Signed-off-by: Sam James <[email protected]> ---- 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/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch deleted file mode 100644 index eb34f4ffd4e4..000000000000 --- a/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 <[email protected]> -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 <[email protected]> ---- a/src/read_config_lex.l -+++ b/src/read_config_lex.l -@@ -21,6 +21,7 @@ - - #include <string.h> - -+#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 <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+ - #include <sched.h> - #include <dlfcn.h> -+ - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> - #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h> - - 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);
