Compare commits
No commits in common. "c8s" and "imports/c9/libnetfilter_conntrack-1.0.8-5.el9_1" have entirely different histories.
c8s
...
imports/c9
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
|||||||
SOURCES/libnetfilter_conntrack-1.0.6.tar.bz2
|
SOURCES/libnetfilter_conntrack-1.0.8.tar.bz2
|
||||||
/libnetfilter_conntrack-1.0.6.tar.bz2
|
|
||||||
|
1
.libnetfilter_conntrack.metadata
Normal file
1
.libnetfilter_conntrack.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
4c273a1806ba39656464fc77efbaa0a4ed56a330 SOURCES/libnetfilter_conntrack-1.0.8.tar.bz2
|
@ -0,0 +1,32 @@
|
|||||||
|
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
|
||||||
|
|
@ -1,13 +1,19 @@
|
|||||||
Name: libnetfilter_conntrack
|
Name: libnetfilter_conntrack
|
||||||
Version: 1.0.6
|
Version: 1.0.8
|
||||||
Release: 5%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Netfilter conntrack userspace library
|
Summary: Netfilter conntrack userspace library
|
||||||
Group: System Environment/Libraries
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://netfilter.org
|
URL: http://netfilter.org
|
||||||
Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2
|
Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
BuildRequires: libnfnetlink-devel >= 1.0.1, pkgconfig, kernel-headers, libmnl-devel >= 1.0.3
|
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
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libnetfilter_conntrack is a userspace library providing a programming
|
libnetfilter_conntrack is a userspace library providing a programming
|
||||||
@ -15,7 +21,6 @@ interface (API) to the in-kernel connection tracking state table.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Netfilter conntrack userspace library
|
Summary: Netfilter conntrack userspace library
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.1
|
Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.1
|
||||||
Requires: kernel-headers
|
Requires: kernel-headers
|
||||||
|
|
||||||
@ -24,42 +29,65 @@ libnetfilter_conntrack is a userspace library providing a programming
|
|||||||
interface (API) to the in-kernel connection tracking state table.
|
interface (API) to the in-kernel connection tracking state table.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
# (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
|
%build
|
||||||
%configure --disable-static --disable-rpath
|
%configure --disable-static --disable-rpath
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%{make_build}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
%{make_install}
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
|
||||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
|
||||||
|
|
||||||
%clean
|
%ldconfig_scriptlets
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{!?_licensedir:%global license %%doc}
|
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
%dir %{_includedir}/libnetfilter_conntrack
|
%dir %{_includedir}/libnetfilter_conntrack
|
||||||
%{_includedir}/libnetfilter_conntrack/*.h
|
%{_includedir}/libnetfilter_conntrack/*.h
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
@ -1,7 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
|
|
||||||
# - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
|
Loading…
Reference in New Issue
Block a user