Compare commits

...

No commits in common. "imports/c9/libnetfilter_conntrack-1.0.8-5.el9_1" and "c8s" have entirely different histories.

4 changed files with 23 additions and 83 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libnetfilter_conntrack-1.0.8.tar.bz2
SOURCES/libnetfilter_conntrack-1.0.6.tar.bz2

View File

@ -1 +1 @@
4c273a1806ba39656464fc77efbaa0a4ed56a330 SOURCES/libnetfilter_conntrack-1.0.8.tar.bz2
015f985a8e171889a67769ba02d070eca53bac07 SOURCES/libnetfilter_conntrack-1.0.6.tar.bz2

View File

@ -1,32 +0,0 @@
From f94ca582531980f86fc2ffed9f1f55f7172e83f8 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 10 Dec 2021 12:18:23 +0100
Subject: [PATCH] conntrack: don't cancel nest on unknown layer 4 protocols
It is valid to specify CTA_PROTO_NUM with a protocol that is not
natively supported by conntrack. Do not cancel the CTA_TUPLE_PROTO
nest in this case.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 45ec4b51e8290759e0d87d9405965be1352a4325)
---
src/conntrack/build_mnl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/conntrack/build_mnl.c b/src/conntrack/build_mnl.c
index d9ad268cb8900..979c0c7e995a3 100644
--- a/src/conntrack/build_mnl.c
+++ b/src/conntrack/build_mnl.c
@@ -73,8 +73,7 @@ nfct_build_tuple_proto(struct nlmsghdr *nlh, const struct __nfct_tuple *t)
mnl_attr_put_u16(nlh, CTA_PROTO_ICMPV6_ID, t->l4src.icmp.id);
break;
default:
- mnl_attr_nest_cancel(nlh, nest);
- return -1;
+ break;
}
mnl_attr_nest_end(nlh, nest);
return 0;
--
2.38.0

View File

@ -1,19 +1,13 @@
Name: libnetfilter_conntrack
Version: 1.0.8
Version: 1.0.6
Release: 5%{?dist}
Summary: Netfilter conntrack userspace library
Group: System Environment/Libraries
License: GPLv2+
URL: http://netfilter.org
Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2
Patch01: 0001-conntrack-don-t-cancel-nest-on-unknown-layer-4-proto.patch
BuildRequires: gcc
BuildRequires: kernel-headers
BuildRequires: libmnl-devel >= 1.0.3
BuildRequires: libnfnetlink-devel >= 1.0.1
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: libnfnetlink-devel >= 1.0.1, pkgconfig, kernel-headers, libmnl-devel >= 1.0.3
%description
libnetfilter_conntrack is a userspace library providing a programming
@ -21,6 +15,7 @@ interface (API) to the in-kernel connection tracking state table.
%package devel
Summary: Netfilter conntrack userspace library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.1
Requires: kernel-headers
@ -29,65 +24,42 @@ libnetfilter_conntrack is a userspace library providing a programming
interface (API) to the in-kernel connection tracking state table.
%prep
%autosetup -p1
%setup -q
# (valid for 1.0.3, may break newer releases)
# Remove outdated files that confuse various helper scripts.
rm compile config.guess config.sub depcomp install-sh ltmain.sh missing
%build
%configure --disable-static --disable-rpath
%{make_build}
make %{?_smp_mflags}
%install
%{make_install}
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%ldconfig_scriptlets
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license COPYING
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/libnetfilter_conntrack
%{_includedir}/libnetfilter_conntrack/*.h
%changelog
* Wed Dec 07 2022 Phil Sutter <psutter@redhat.com> - 1.0.8-5
- conntrack: don't cancel nest on unknown layer 4 protocols
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.8-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.8-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.8-1
- Update to 1.0.8
- Cleanup spec
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 06 2018 Paul Wouters <pwouters@redhat.com> - 1.0.7-1
- Updated to 1.0.7
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild