packages/conntrack-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:226525785bbe926e3d1c0dbf3780ca6ed6fbd8ea
Branches Tags
packages:main
...
compare: packages:8ed8d3622636d5c2c3627f6c31c6fc1a17028dbe
Branches Tags
packages:main

10 Commits
226525785b ... 8ed8d36226

Author SHA1 Message Date
openeuler-ci-bot
8ed8d36226
!24 [sync] PR-22: Optimize enabled DT testcases 
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
 2023-01-19 09:26:08 +00:00
yangl777
46fda456df Optimize enabled DT testcases 
(cherry picked from commit 694135477b937ccb2ab5acfa8b7d554561bbc455)
 2023-01-19 17:21:29 +08:00
openeuler-ci-bot
bf8ff030c2
!19 [sync] PR-18: enabled DT testcases 
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
 2023-01-12 07:15:51 +00:00
renmingshuai@huawei.com
cddc328ac3 enabled DT testcases 
(cherry picked from commit 56897baee4d2fe763f061a2fce03ef37a9f574c4)
 2023-01-11 09:59:56 +08:00
openeuler-ci-bot
8e535a1dfc
!17 [sync] PR-15: Fix for memleak when parsing -j arg 
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
 2022-10-31 09:17:35 +00:00
yangl777
53659c6997 Fix for memleak when parsing -j arg 
(cherry picked from commit 8d8c474bea8b5bd03a8e88960a304d1c3c9067b1)
 2022-10-31 16:11:30 +08:00
openeuler-ci-bot
00e8203459
!14 [sync] PR-11: rebuild package 
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
 2022-10-31 08:09:47 +00:00
yangl777
bfab99e6cb rebuild package 
(cherry picked from commit 46f593f5044eb75f36c6131a401c6e3ad016cb02)
 2022-10-31 15:28:41 +08:00
openeuler-ci-bot
8520f39c3f !10 Add the compilation dependency of gcc. 
From: @lijingyuan007
Reviewed-by: @miao_kaibo
Signed-off-by: @miao_kaibo
 2021-06-02 17:32:56 +08:00
lijingyuan007
8bccde7be3 Add the compilation dependency of gcc. 2021-05-27 14:21:39 +08:00
2 changed files with 76 additions and 1 deletions
Show Stats Expand all files Collapse all files

32
backport-Fix-for-memleak-when-parsing-j-arg.patch Normal file
View File

@ -0,0 +1,32 @@
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

45
conntrack-tools.spec
View File

@ -1,15 +1,20 @@
#needsrootforbuild
Name: conntrack-tools
Version: 1.4.6
Release: 1
Release: 6
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
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: 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
Provides: conntrack = 1.0-1
Obsoletes: conntrack < 1.0-1
Requires(post): systemd
@ -51,6 +56,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
@ -74,6 +87,36 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
%{_mandir}/man8/*
%changelog
* 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
- SUG:NA
- DESC:conntrack:Fix for memleak when parsing -j arg
* Thu Apr 28 2022 yanglu <yanglu72@h-partners.com> - 1.4.6-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:rebuild package
* Thu May 27 2021 lijingyuan <lijingyuan3@huawei.com> - 1.4.6-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Add the compilation dependency of gcc.
* Sat Jul 25 2020 gaihuiying <gaihuiying1@huawei.com> - 1.4.6-1
- Type:requirement
- ID:NA