Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
6f6f74eccf
!32 [sync] PR-31: delete the misc directory and clusterip.sh and README files
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-09-05 09:41:52 +00:00
yangl777
1c9e2decfa delete the misc directory and clusterip.sh and README files
(cherry picked from commit 096be7d49d67b7a567b0984f2bf8a12d2dc9bf1c)
2024-08-28 10:42:40 +08:00
openeuler-ci-bot
05c3ced90d
!30 update conntrack-tools version to 1.4.8
From: @yangl777 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-01-02 06:01:57 +00:00
yangl777
10717b32d4 update conntrack-tools version to 1.4.8 2023-12-28 19:27:57 +08:00
openeuler-ci-bot
f0a8718105
!26 update conntrack-tools version to 1.4.7
From: @yangl777 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
2023-02-01 03:00:20 +00:00
yangl777
326fece3a2 update conntrack-tools version to 1.4.7 2023-01-31 03:10:35 +00:00
openeuler-ci-bot
7fff7d4917
!22 Optimize enabled DT testcases
From: @yangl777 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
2023-01-19 09:21:18 +00:00
yangl777
694135477b Optimize enabled DT testcases 2023-01-19 08:47:36 +00:00
openeuler-ci-bot
f6844c1668
!21 [sync] PR-18: enabled DT testcases
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
2023-01-16 11:48:38 +00:00
renmingshuai@huawei.com
c0d88cf93e enabled DT testcases
(cherry picked from commit 56897baee4d2fe763f061a2fce03ef37a9f574c4)
2023-01-13 09:24:13 +08:00
4 changed files with 45 additions and 39 deletions

View File

@ -1,32 +0,0 @@
From 42cb292d6c9e8567db2e30e183b1bd31093700ad Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 25 Mar 2022 10:30:29 +0100
Subject: connntrack: Fix for memleak when parsing -j arg
Have to free the strings allocated by split_address_and_port().
Fixes: 29b390a212214 ("conntrack: Support IPv6 NAT")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Conflict:do_parse => main
Reference:https://git.netfilter.org/conntrack-tools/commit/?id=42cb292d6c9e8567db2e30e183b1bd31093700ad
---
src/conntrack.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/conntrack.c b/src/conntrack.c
index f65926b..415f551 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -2466,6 +2466,8 @@ int main(int argc, char *argv[])
nfct_set_nat_details(c, tmpl.ct, &ad,
port_str, family);
}
+ free(port_str);
+ free(nat_address);
}
break;
case 'w':
--
2.33.0

Binary file not shown.

Binary file not shown.

View File

@ -1,19 +1,18 @@
#needsrootforbuild
Name: conntrack-tools
Version: 1.4.6
Release: 4
Version: 1.4.8
Release: 2
Summary: Userspace tools for interacting with the Connection Tracking System
License: GPLv2
URL: http://conntrack-tools.netfilter.org/
Source0: http://netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2
Source0: http://netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.xz
Source1: conntrackd.service
Source2: conntrackd.conf
Patch0: backport-Fix-for-memleak-when-parsing-j-arg.patch
BuildRequires: libnfnetlink-devel >= 1.0.1 libnetfilter_conntrack-devel >= 1.0.8 libtirpc-devel
BuildRequires: libnfnetlink-devel >= 1.0.1 libnetfilter_conntrack-devel >= 1.0.9 libtirpc-devel
BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0 libnetfilter_cthelper-devel >= 1.0.0 systemd
BuildRequires: libmnl-devel >= 1.0.3 libnetfilter_queue-devel >= 1.0.2 pkgconfig bison flex systemd-devel
BuildRequires: gcc
BuildRequires: gcc make
Provides: conntrack = 1.0-1
Obsoletes: conntrack < 1.0-1
Requires(post): systemd
@ -46,6 +45,7 @@ CXXFLAGS="${CXXFLAGS} -Wl,-z,lazy"
%make_build
rm -f doc/sync/notrack/conntrackd.conf.orig doc/sync/alarm/conntrackd.conf.orig doc/helper/conntrackd.conf.orig
chmod 644 doc/sync/primary-backup.sh
rm -rf doc/misc
%install
%make_install
@ -55,6 +55,14 @@ install -d 0755 %{buildroot}%{_unitdir}
install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
%check
cd tests/conntrack
sh run-test.sh
cd ../nfct
sed -i "s/\/usr\/sbin/..\/..\/src/g" test.c
sh run-test.sh
cd ../../
%post
%systemd_post conntrackd.service
@ -78,6 +86,36 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
%{_mandir}/man8/*
%changelog
* Tue Aug 27 2024 yanglu <yanglu72@h-partners.com> - 1.4.8-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:delete the misc directory and clusterip.sh and README files
* Thu Dec 28 2023 yanglu <yanglu72@h-partners.com> - 1.4.8-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update conntrack-tools version to 1.4.8
* Tue Jan 31 2023 yanglu <yanglu72@h-partners.com> - 1.4.7-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update conntrack-tools version to 1.4.7
* Thu Jan 19 2023 yanglu <yanglu72@h-partners.com> - 1.4.6-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Optimize enabled DT testcases
* Mon Jan 09 2023 zhanghao <zhanghao383@huawei.com> - 1.4.6-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:enabled DT testcases
* Mon Oct 31 2022 yanglu <yanglu72@h-partners.com> - 1.4.6-4
- Type:bugfix
- ID:NA