diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 2625e74bc..80da24d65 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -97,3 +97,5 @@ gpu/gpu-operator tools/kexec-tools tools/libbpf networking/iproute +networking/iptables +networking/libnftnl diff --git a/centos_srpms_3rdparties.lst b/centos_srpms_3rdparties.lst index a23f2b1ff..b7040bde9 100644 --- a/centos_srpms_3rdparties.lst +++ b/centos_srpms_3rdparties.lst @@ -1,4 +1,6 @@ -iproute-5.9.0-4.el8.src.rpm#https://vault.centos.org/centos/8.4.2105/BaseOS/Source/SPackages/iproute-5.9.0-4.el8.src.rpm +iproute-5.12.0-4.el8.src.rpm#https://vault.centos.org/8-stream/BaseOS/Source/SPackages/iproute-5.12.0-4.el8.src.rpm +iptables-1.8.4-21.el8.src.rpm#https://vault.centos.org/8-stream/BaseOS/Source/SPackages/iptables-1.8.4-21.el8.src.rpm +libnftnl-1.1.5-4.el8.src.rpm#https://vault.centos.org/8-stream/BaseOS/Source/SPackages/libnftnl-1.1.5-4.el8.src.rpm libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm linuxptp-3.1.1-1.el8.src.rpm#http://vault.centos.org/8-stream/AppStream/Source/SPackages/linuxptp-3.1.1-1.el8.src.rpm python-daemon-2.2.3-7.el8.src.rpm#http://vault.centos.org/8.0.1905/virt/Source/ovirt-44/python-daemon-2.2.3-7.el8.src.rpm diff --git a/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch b/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch index 960e876e6..2fa53add3 100644 --- a/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch +++ b/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch @@ -1,6 +1,6 @@ -From 36bc0ef90f0b05a91728c5f8633988131af8a0af Mon Sep 17 00:00:00 2001 +From 8b090dec49da1d238ce9e6be1b4b9627707a1c2f Mon Sep 17 00:00:00 2001 From: "M. Vefa Bicakci" -Date: Fri, 22 Oct 2021 16:37:34 -0400 +Date: Wed, 27 Oct 2021 11:59:52 -0400 Subject: [PATCH] iproute.spec: Modify Release field for StarlingX This commit modifies the Release field of the iproute package's spec @@ -12,16 +12,18 @@ Signed-off-by: M. Vefa Bicakci 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec -index 6ef0b529e0ce..b8f7ad1833df 100644 +index 1b5b5a719fdc..20869a9defbd 100644 --- a/SPECS/iproute.spec +++ b/SPECS/iproute.spec -@@ -1,5 +1,5 @@ - %define rpmversion 5.9.0 --%define specrelease 4%{?dist} -+%define specrelease 4%{?_tis_dist}.%{tis_patch_ver} - %define pkg_release %{specrelease}%{?buildid} - +@@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools + Name: iproute + Version: 5.12.0 +-Release: 4%{?dist}%{?buildid} ++Release: 4%{?_tis_dist}.%{tis_patch_ver}%{?buildid} + Group: Applications/System + URL: http://kernel.org/pub/linux/utils/net/%{name}2/ + Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -- 2.29.2 diff --git a/networking/iproute/centos/srpm_path b/networking/iproute/centos/srpm_path index 6b59d1f73..35ac27397 100644 --- a/networking/iproute/centos/srpm_path +++ b/networking/iproute/centos/srpm_path @@ -1 +1 @@ -mirror:Source/iproute-5.9.0-4.el8.src.rpm +mirror:Source/iproute-5.12.0-4.el8.src.rpm diff --git a/networking/iptables/centos/build_srpm.data b/networking/iptables/centos/build_srpm.data new file mode 100644 index 000000000..bc37bdcbe --- /dev/null +++ b/networking/iptables/centos/build_srpm.data @@ -0,0 +1,2 @@ +COPY_LIST="$DISTRO/patches/*" +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/networking/iptables/centos/meta_patches/PATCH_ORDER b/networking/iptables/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..82442ff73 --- /dev/null +++ b/networking/iptables/centos/meta_patches/PATCH_ORDER @@ -0,0 +1,2 @@ +iptables.spec-Modify-Release-field-for-StarlingX.patch +iptables.spec-Add-a-patch-for-compat.-with-older-gli.patch diff --git a/networking/iptables/centos/meta_patches/iptables.spec-Add-a-patch-for-compat.-with-older-gli.patch b/networking/iptables/centos/meta_patches/iptables.spec-Add-a-patch-for-compat.-with-older-gli.patch new file mode 100644 index 000000000..dd8ba8c9a --- /dev/null +++ b/networking/iptables/centos/meta_patches/iptables.spec-Add-a-patch-for-compat.-with-older-gli.patch @@ -0,0 +1,43 @@ +From 281334baa2ea1b21abc9e70fe27980f81a19bca1 Mon Sep 17 00:00:00 2001 +From: "M. Vefa Bicakci" +Date: Wed, 27 Oct 2021 14:45:36 -0400 +Subject: [PATCH] iptables.spec: Add a patch for compat. with older glibc + +This patch avoids the following compilation failures, which according to +the description of the imported patch, occurs due to the older version +of glibc in StarlingX: + +xtables-monitor.c:406:43: error: 'const struct tcphdr' has no member named 'th_sport' + printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); + +xtables-monitor.c:406:66: error: 'const struct tcphdr' has no member named 'th_dport' + printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); + +Signed-off-by: M. Vefa Bicakci +--- + SPECS/iptables.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec +index cb4ac571791e..befe5ec262f1 100644 +--- a/SPECS/iptables.spec ++++ b/SPECS/iptables.spec +@@ -32,6 +32,7 @@ Source10: ebtables-config + %if 0%{?bootstrap} + Source11: %{url}/files/%{name}-%{version_old}.tar.bz2 + Source12: 0003-extensions-format-security-fixes-in-libip-6-t_icmp.patch ++Source13: 0013-xtables-monitor-fix-build-with-older-glibc.patch + %endif + + Patch01: 0001-iptables-apply-Use-mktemp-instead-of-tempfile.patch +@@ -231,6 +232,7 @@ replacement of the legacy tool. + pushd bootstrap_ver + %{__tar} --strip-components=1 -xf %{SOURCE11} + %{__patch} -p1 <%{SOURCE12} ++%{__patch} -p1 <%{SOURCE13} + popd + %endif + +-- +2.29.2 + diff --git a/networking/iptables/centos/meta_patches/iptables.spec-Modify-Release-field-for-StarlingX.patch b/networking/iptables/centos/meta_patches/iptables.spec-Modify-Release-field-for-StarlingX.patch new file mode 100644 index 000000000..8a2001d42 --- /dev/null +++ b/networking/iptables/centos/meta_patches/iptables.spec-Modify-Release-field-for-StarlingX.patch @@ -0,0 +1,29 @@ +From b64b3b0adc9391431fad330485993981fba5303c Mon Sep 17 00:00:00 2001 +From: "M. Vefa Bicakci" +Date: Wed, 27 Oct 2021 12:30:19 -0400 +Subject: [PATCH] iptables.spec: Modify Release field for StarlingX + +This commit modifies the Release field of the iptables package's spec +file for StarlingX. + +Signed-off-by: M. Vefa Bicakci +--- + SPECS/iptables.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec +index 58df10b96201..cb4ac571791e 100644 +--- a/SPECS/iptables.spec ++++ b/SPECS/iptables.spec +@@ -17,7 +17,7 @@ Name: iptables + Summary: Tools for managing Linux kernel packet filtering capabilities + URL: http://www.netfilter.org/projects/iptables + Version: 1.8.4 +-Release: 21%{?dist} ++Release: 21%{?_tis_dist}.%{tis_patch_ver} + Source: %{url}/files/%{name}-%{version}.tar.bz2 + Source1: iptables.init + Source2: iptables-config +-- +2.29.2 + diff --git a/networking/iptables/centos/patches/0013-xtables-monitor-fix-build-with-older-glibc.patch b/networking/iptables/centos/patches/0013-xtables-monitor-fix-build-with-older-glibc.patch new file mode 100644 index 000000000..5ed0d2d55 --- /dev/null +++ b/networking/iptables/centos/patches/0013-xtables-monitor-fix-build-with-older-glibc.patch @@ -0,0 +1,75 @@ +From 7c8791edac3e74f6ce0bf21f98bc820db8e55e62 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 16 Nov 2018 07:23:32 +0200 +Subject: [PATCH] xtables-monitor: fix build with older glibc + +glibc older than 2.19 only expose BSD style fields of struct tcphdr when +_BSD_SOURCE is define. Current glibc however, warn that _BSD_SOURCE is +deprecated. Migrate to the GNU style of tcphdr fields to make the code +compatible with any glibc version. + +Fix the following build failure: + +xtables-monitor.c: In function 'trace_print_packet': +xtables-monitor.c:406:43: error: 'const struct tcphdr' has no member named 'th_sport' + printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); + ^ +xtables-monitor.c:406:66: error: 'const struct tcphdr' has no member named 'th_dport' + printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); + ^ +... + +Signed-off-by: Baruch Siach +Signed-off-by: Florian Westphal +--- + iptables/xtables-monitor.c | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c +index 3b1ca777a28a..5d1611122df5 100644 +--- a/iptables/xtables-monitor.c ++++ b/iptables/xtables-monitor.c +@@ -403,26 +403,24 @@ static void trace_print_packet(const struct nftnl_trace *nlt, struct cb_arg *arg + case IPPROTO_UDP: + if (len < 4) + break; +- printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); ++ printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest)); + break; + case IPPROTO_TCP: + if (len < sizeof(*tcph)) + break; +- printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport)); +- if (tcph->th_flags & (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG)) { +- if (tcph->th_flags & TH_SYN) +- printf("SYN "); +- if (tcph->th_flags & TH_ACK) +- printf("ACK "); +- if (tcph->th_flags & TH_FIN) +- printf("FIN "); +- if (tcph->th_flags & TH_RST) +- printf("RST "); +- if (tcph->th_flags & TH_PUSH) +- printf("PSH "); +- if (tcph->th_flags & TH_URG) +- printf("URG "); +- } ++ printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest)); ++ if (tcph->syn) ++ printf("SYN "); ++ if (tcph->ack) ++ printf("ACK "); ++ if (tcph->fin) ++ printf("FIN "); ++ if (tcph->rst) ++ printf("RST "); ++ if (tcph->psh) ++ printf("PSH "); ++ if (tcph->urg) ++ printf("URG "); + break; + default: + break; +-- +2.29.2 + diff --git a/networking/iptables/centos/srpm_path b/networking/iptables/centos/srpm_path new file mode 100644 index 000000000..59817419c --- /dev/null +++ b/networking/iptables/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/iptables-1.8.4-21.el8.src.rpm diff --git a/networking/libnftnl/centos/build_srpm.data b/networking/libnftnl/centos/build_srpm.data new file mode 100644 index 000000000..69abd61b8 --- /dev/null +++ b/networking/libnftnl/centos/build_srpm.data @@ -0,0 +1 @@ +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/networking/libnftnl/centos/meta_patches/PATCH_ORDER b/networking/libnftnl/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..37890c563 --- /dev/null +++ b/networking/libnftnl/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +libnftnl.spec-Modify-Release-field-for-StarlingX.patch diff --git a/networking/libnftnl/centos/meta_patches/libnftnl.spec-Modify-Release-field-for-StarlingX.patch b/networking/libnftnl/centos/meta_patches/libnftnl.spec-Modify-Release-field-for-StarlingX.patch new file mode 100644 index 000000000..f14379711 --- /dev/null +++ b/networking/libnftnl/centos/meta_patches/libnftnl.spec-Modify-Release-field-for-StarlingX.patch @@ -0,0 +1,27 @@ +From 1f7f2beb8a94133938891fdff1fdd179603dd120 Mon Sep 17 00:00:00 2001 +From: "M. Vefa Bicakci" +Date: Wed, 27 Oct 2021 13:38:14 -0400 +Subject: [PATCH] libnftnl.spec: Modify Release field for StarlingX + +This commit modifies the Release field of the libnftnl package's spec +file for StarlingX. + +Signed-off-by: M. Vefa Bicakci +--- + SPECS/libnftnl.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/libnftnl.spec b/SPECS/libnftnl.spec +index 4769895895b7..19681de0c2af 100644 +--- a/SPECS/libnftnl.spec ++++ b/SPECS/libnftnl.spec +@@ -1,5 +1,5 @@ + %define rpmversion 1.1.5 +-%define specrelease 4%{?dist} ++%define specrelease 4%{?_tis_dist}.%{tis_patch_ver} + + Name: libnftnl + Version: %{rpmversion} +-- +2.29.2 + diff --git a/networking/libnftnl/centos/srpm_path b/networking/libnftnl/centos/srpm_path new file mode 100644 index 000000000..50df41020 --- /dev/null +++ b/networking/libnftnl/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/libnftnl-1.1.5-4.el8.src.rpm