diff --git a/.gitignore b/.gitignore index 4954a0c..f3e30ba 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,3 @@ 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 deleted file mode 100644 index 297a7d1..0000000 --- a/conntrack-tools-c99-2.patch +++ /dev/null @@ -1,105 +0,0 @@ -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 7b674bd..7f8f298 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -1,18 +1,17 @@ Name: conntrack-tools -Version: 1.4.8 -Release: 10%{?dist} +Version: 1.4.7 +Release: 1%{?dist} Summary: Manipulate netfilter connection tracking table and run High Availability -License: GPL-2.0-only +License: GPLv2 URL: http://conntrack-tools.netfilter.org/ -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 +Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 +Source1: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2.sig 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: autogen BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -93,33 +92,6 @@ 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 - -* Thu Jul 06 2023 Yaakov Selkowitz - 1.4.7-2 -- Remove unused autogen build dependency - * Wed Jul 05 2023 Paul Wouters