diff --git a/.gitignore b/.gitignore index f3e30ba..4954a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ conntrack-tools-0.9.14.tar.bz2 /conntrack-tools-1.4.6.tar.bz2 /conntrack-tools-1.4.7.tar.bz2 /conntrack-tools-1.4.7.tar.bz2.sig +/conntrack-tools-1.4.8.tar.xz.sig +/conntrack-tools-1.4.8.tar.xz diff --git a/conntrack-tools-c99-2.patch b/conntrack-tools-c99-2.patch new file mode 100644 index 0000000..297a7d1 --- /dev/null +++ b/conntrack-tools-c99-2.patch @@ -0,0 +1,105 @@ +commit d417ceaa947c5f7f5d691037d0abe1deca957313 +Author: Jeremy Sowden +Date: Sat Aug 26 17:32:26 2023 +0100 + + read_config_yy: correct arguments passed to `inet_aton` + + `inet_aton` expects a `struct in_addr *`. In a number of calls, we pass + pointers to structs or unions which contain a `struct in_addr` member. Pass + pointers to the members instead. In another call, we pass a pointer to a + uint32_t. Cast it. + + Signed-off-by: Jeremy Sowden + Signed-off-by: Pablo Neira Ayuso + +diff --git a/src/read_config_yy.y b/src/read_config_yy.y +index f06c6afff7cbfd81..71a087187522efe1 100644 +--- a/src/read_config_yy.y ++++ b/src/read_config_yy.y +@@ -246,9 +246,11 @@ multicast_options : + + multicast_option : T_IPV4_ADDR T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.mcast.in)) { ++ if (!inet_aton($2, &channel_conf->u.mcast.in.inet_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -310,9 +312,11 @@ multicast_option : T_IPV6_ADDR T_IP + + multicast_option : T_IPV4_IFACE T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.mcast.ifa)) { ++ if (!inet_aton($2, &channel_conf->u.mcast.ifa.interface_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -423,9 +427,11 @@ udp_options : + + udp_option : T_IPV4_ADDR T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.udp.server.ipv4)) { ++ if (!inet_aton($2, &channel_conf->u.udp.server.ipv4.inet_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -456,9 +462,11 @@ udp_option : T_IPV6_ADDR T_IP + + udp_option : T_IPV4_DEST_ADDR T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.udp.client)) { ++ if (!inet_aton($2, &channel_conf->u.udp.client.inet_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -574,9 +582,11 @@ tcp_options : + + tcp_option : T_IPV4_ADDR T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.tcp.server.ipv4)) { ++ if (!inet_aton($2, &channel_conf->u.tcp.server.ipv4.inet_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -607,9 +617,11 @@ tcp_option : T_IPV6_ADDR T_IP + + tcp_option : T_IPV4_DEST_ADDR T_IP + { ++ struct channel_conf *channel_conf = &conf.channel[conf.channel_num]; ++ + __max_dedicated_links_reached(); + +- if (!inet_aton($2, &conf.channel[conf.channel_num].u.tcp.client)) { ++ if (!inet_aton($2, &channel_conf->u.tcp.client.inet_addr)) { + dlog(LOG_WARNING, "%s is not a valid IPv4 address", $2); + free($2); + break; +@@ -1239,7 +1251,7 @@ filter_address_item : T_IPV4_ADDR T_IP + } + } + +- if (!inet_aton($2, &ip.ipv4)) { ++ if (!inet_aton($2, (struct in_addr *) &ip.ipv4)) { + dlog(LOG_WARNING, "%s is not a valid IPv4, ignoring", $2); + free($2); + break; diff --git a/conntrack-tools.spec b/conntrack-tools.spec index 984aaf3..7b674bd 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -1,15 +1,17 @@ Name: conntrack-tools -Version: 1.4.7 -Release: 3%{?dist} +Version: 1.4.8 +Release: 10%{?dist} Summary: Manipulate netfilter connection tracking table and run High Availability -License: GPLv2 +License: GPL-2.0-only URL: http://conntrack-tools.netfilter.org/ -Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 -Source1: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2.sig +Source0: https://www.netfilter.org/pub/conntrack-tools/conntrack-tools-%{version}.tar.xz +Source1: https://www.netfilter.org/pub/conntrack-tools/conntrack-tools-%{version}.tar.xz.sig +# Note this openpgp key is expired and revoked, but is the one used for the 1.4.8 signature Source2: NetfilterCoreTeam-OpenGPG-KEY.txt +# Note this is the new key, presumbly will be used in the future (it signed the old key as well) +#Source2: coreteam-gpg-key-0xD70D1A666ACF2B21.txt Source3: conntrackd.service Source4: conntrackd.conf -Patch1: conntrack-tools-c99.patch BuildRequires: autoconf BuildRequires: automake @@ -91,6 +93,27 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/conntrackd/ %systemd_postun conntrackd.service %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 1.4.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 1.4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.4.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 17 2024 Florian Weimer - 1.4.7-5 +- Backport upstream patch to fix GCC 14 compatibility issues + +* Fri Aug 11 2023 Phil Sutter - 1.4.7-4 +- Convert license to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.4.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/coreteam-gpg-key-0xD70D1A666ACF2B21.txt b/coreteam-gpg-key-0xD70D1A666ACF2B21.txt new file mode 100644 index 0000000..cd4a35b --- /dev/null +++ b/coreteam-gpg-key-0xD70D1A666ACF2B21.txt @@ -0,0 +1,64 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +oD8ElPP+m/v6iA== +=70vD +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index b00f953..f15ef45 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (conntrack-tools-1.4.7.tar.bz2) = 3d37a6b8cd13fd3c149ab80009d686d2184920ba2d0d5c1b57abed6e92e0dd92cba868bfe22f1a155479fe5ab2e291b8bb8a7e72123a73788032202ac142653b -SHA512 (conntrack-tools-1.4.7.tar.bz2.sig) = 5a2bcc6da792544029ddf0d3a4caf019b215907e66d491e5d98a4f1189fc9c03ec8aad5ad22166799c5f0c81273284cb757e9368c9d9d3049bc49da47c037e05 +SHA512 (conntrack-tools-1.4.8.tar.xz.sig) = 8cd229d2e980ab1788e90fc8f53827fe1e4b21801cad6cddf6a9ff537501c40c52242cc964005b2889ad0a4548c772304db8696d4644611ecf9f091aca5c14ee +SHA512 (conntrack-tools-1.4.8.tar.xz) = 95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf