开源软件构建与测试

_service:extract_file:iptables.spec Deleted

@@ -1,366 +0,0 @@
-%global script_path %{_libexecdir}/iptables
-%global legacy_actions %{_libexecdir}/initscripts/legacy-actions
-Name:		  iptables
-Version:	  1.8.7
-Release:	  5
-Summary:	  IP packet filter administration utilities
-License:	  GPLv2 and Artistic Licence 2.0 and ISC
-URL:		  https://www.netfilter.org/
-Source0:  	  https://www.netfilter.org/projects/iptables/files/iptables-%{version}.tar.bz2
-Source1:          iptables.init
-Source2:          iptables-config
-Source3:          iptables.service
-Source4:          sysconfig_iptables
-Source5:          sysconfig_ip6tables
-
-BuildRequires:    bison flex gcc kernel-headers libpcap-devel libselinux-devel systemd
-BuildRequires:    libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel libnftnl-devel
-BuildRequires:    autogen autoconf automake libtool
-
-Requires:         %{name}-libs = %{version}-%{release}
-
-Requires(post):   %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
-%{?systemd_requires}
-
-Provides:         iptables-utils iptables-services
-Obsoletes:        iptables-utils iptables-services 
-
-%description
-Netfilter is a set of hooks inside the Linux kernel that allows kernel 
-modules to register callback functions with the network stack. A 
-registered callback function is then called back for every packet that 
-traverses the respective hook within the network stack.
-
-Iptables is a generic table structure for the definition of rulesets. 
-Each rule within an IP table consists of a number of classifiers 
-(iptables matches) and one connected action (iptables target).
-
-Netfilter, ip_tables, connection tracking (ip_conntrack, nf_conntrack) 
-and the NAT subsystem together build the major parts of the framework.
-
-%package          libs
-Summary:          iptables libraries
-
-%description      libs
-iptables libraries.
-
-%package          devel
-Summary:          header files for iproute
-Requires:         %{name} = %{version}-%{release} pkgconfig
-
-%description      devel
-Header files for iproute.
-
-%package          nft
-Summary:          nft package for iproute
-Requires:         %{name} = %{version}-%{release}
-Obsoletes:        iptables-compat < 1.6.2-4
-
-%description      nft
-Nft package for iproute.
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-./autogen.sh
-%configure --enable-devel --enable-bpf-compiler --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
-
-%disable_rpath
-
-rm -f include/linux/types.h
-
-%make_build
-
-%install
-%make_install 
-
-%delete_la
-
-install -m 0755 -d %{buildroot}%{_includedir}/iptables
-install -m 0644 include/ip*tables.h %{buildroot}%{_includedir}
-install -m 0644 include/iptables/internal.h %{buildroot}%{_includedir}/iptables
-
-install -m 0755 -d %{buildroot}%{_includedir}/libipulog/
-install -m 0644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog
-
-install -m 0755 -d %{buildroot}/%{script_path}
-install -m 0755 -c %{SOURCE1} %{buildroot}/%{script_path}/iptables.init
-sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init
-install -m 0755 ip6tables.init %{buildroot}/%{script_path}/ip6tables.init
-install -m 0755 -d %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0600 -c %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/iptables-config
-sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config
-install -m 0600 -c ip6tables-config %{buildroot}%{_sysconfdir}/sysconfig/ip6tables-config
-install -m 0600 -c %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/iptables
-install -m 0600 -c %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/ip6tables
-
-install -m 0755 -d %{buildroot}%{_unitdir}
-install -m 0644 -c %{SOURCE3} %{buildroot}%{_unitdir}
-sed -e 's;iptables;ip6tables;g' -e 's;IPv4;IPv6;g' -e 's;/usr/libexec/ip6tables;/usr/libexec/iptables;g' < %{SOURCE3} > ip6tables.service
-install -m 0644 -c ip6tables.service %{buildroot}%{_unitdir}
-
-install -m 0755 -d %{buildroot}/%{legacy_actions}/iptables
-install -m 0755 -d %{buildroot}/%{legacy_actions}/ip6tables
-
-pushd  %{buildroot}/%{legacy_actions}/iptables
-cat << EOF > save
-#!/bin/bash
-exec %{script_path}/iptables.init save
-EOF
-chmod 0755 save
-popd
-sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildroot}/%{legacy_actions}/iptables/save > ip6tabes.save-legacy
-install -m 0755 -c ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save
-
-pushd %{buildroot}/%{legacy_actions}/iptables
-cat << EOF > panic
-#!/bin/bash
-exec %{script_path}/iptables.init panic
-EOF
-chmod 0755 panic
-popd
-sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildroot}/%{legacy_actions}/iptables/panic > ip6tabes.panic-legacy
-install -m 0755 -c ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables/panic
-
-install -m 0755 iptables/iptables-apply %{buildroot}%{_sbindir}
-install -m 0755 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8
-
-touch %{buildroot}%{_libexecdir}/arptables-helper
-
-touch %{buildroot}%{_mandir}/man8/arptables.8
-touch %{buildroot}%{_mandir}/man8/arptables-save.8
-touch %{buildroot}%{_mandir}/man8/arptables-restore.8
-touch %{buildroot}%{_mandir}/man8/ebtables.8
-
-%ldconfig_scriptlets
-
-%post
-pfx=%{_sbindir}/iptables
-pfx6=%{_sbindir}/ip6tables
-%{_sbindir}/update-alternatives --install \
-	$pfx iptables $pfx-legacy 10 \
-	--slave $pfx6 ip6tables $pfx6-legacy \
-        --slave $pfx-restore iptables-restore $pfx-legacy-restore \
-        --slave $pfx-save iptables-save $pfx-legacy-save \
-        --slave $pfx6-restore ip6tables-restore $pfx6-legacy-restore \
-        --slave $pfx6-save ip6tables-save $pfx6-legacy-save
-
-%systemd_post iptables.service ip6tables.service
-
-%preun
-%systemd_preun iptables.service ip6tables.service
-
-%postun
-if  $1 -eq 0 ; then
-	%{_sbindir}/update-alternatives --remove \
-		iptables %{_sbindir}/iptables-legacy
-fi
-%?ldconfig
-%systemd_postun iptables.service ip6tables.service
-
-%post             nft
-pfx=%{_sbindir}/iptables
-pfx6=%{_sbindir}/ip6tables
-%{_sbindir}/update-alternatives --install \
-	$pfx iptables $pfx-nft 10 \
-	--slave $pfx6 ip6tables $pfx6-nft \
-	--slave $pfx-restore iptables-restore $pfx-nft-restore \
-	--slave $pfx-save iptables-save $pfx-nft-save \
-	--slave $pfx6-restore ip6tables-restore $pfx6-nft-restore \
-	--slave $pfx6-save ip6tables-save $pfx6-nft-save
-
-pfx=%{_sbindir}/ebtables
-manpfx=%{_mandir}/man8/ebtables
-for sfx in "" "-restore" "-save"; do
-	if  "$(readlink -e $pfx$sfx)" == $pfx$sfx ; then
-		rm -f $pfx$sfx
-	fi
-done
-if  "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ; then
-	rm -f $manpfx.8.gz
-fi
-%{_sbindir}/update-alternatives --install \
-	$pfx ebtables $pfx-nft 10 \
-	--slave $pfx-save ebtables-save $pfx-nft-save \
-	--slave $pfx-restore ebtables-restore $pfx-nft-restore \
-	--slave $manpfx.8.gz ebtables-man $manpfx-nft.8.gz
-
-pfx=%{_sbindir}/arptables
-manpfx=%{_mandir}/man8/arptables
-lepfx=%{_libexecdir}/arptables
-for sfx in "" "-restore" "-save"; do
-	if  "$(readlink -e $pfx$sfx)" == $pfx$sfx ; then
-		rm -f $pfx$sfx
-	fi
-	if  "$(readlink -e $manpfx$sfx.8.gz)" == $manpfx$sfx.8.gz ; then

_service:tar_scm:iptables.spec Added

@@ -0,0 +1,398 @@
+%global script_path %{_libexecdir}/iptables
+%global legacy_actions %{_libexecdir}/initscripts/legacy-actions
+Name:		  iptables
+Version:	  1.8.7
+Release:	  11
+Summary:	  IP packet filter administration utilities
+License:	  GPLv2 and Artistic Licence 2.0 and ISC
+URL:		  https://www.netfilter.org/
+Source0:  	  https://www.netfilter.org/projects/iptables/files/iptables-%{version}.tar.bz2
+Source1:          iptables.init
+Source2:          iptables-config
+Source3:          iptables.service
+Source4:          sysconfig_iptables
+Source5:          sysconfig_ip6tables
+
+Patch0:           enabled-makecheck-in-extensions.patch
+
+BuildRequires:    bison flex gcc kernel-headers libpcap-devel libselinux-devel systemd
+BuildRequires:    libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel libnftnl-devel
+BuildRequires:    autogen autoconf automake libtool
+
+Requires:         %{name}-libs = %{version}-%{release}
+Conflicts:	  setup < 2.10.4-1
+
+Requires(post):   %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+%{?systemd_requires}
+
+Provides:         iptables-utils iptables-services
+Obsoletes:        iptables-utils iptables-services 
+
+%description
+Netfilter is a set of hooks inside the Linux kernel that allows kernel 
+modules to register callback functions with the network stack. A 
+registered callback function is then called back for every packet that 
+traverses the respective hook within the network stack.
+
+Iptables is a generic table structure for the definition of rulesets. 
+Each rule within an IP table consists of a number of classifiers 
+(iptables matches) and one connected action (iptables target).
+
+Netfilter, ip_tables, connection tracking (ip_conntrack, nf_conntrack) 
+and the NAT subsystem together build the major parts of the framework.
+
+%package          libs
+Summary:          iptables libraries
+
+%description      libs
+iptables libraries.
+
+%package          devel
+Summary:          header files for iproute
+Requires:         %{name} = %{version}-%{release} pkgconfig
+
+%description      devel
+Header files for iproute.
+
+%package          nft
+Summary:          nft package for iproute
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        iptables-compat < 1.6.2-4
+
+%description      nft
+Nft package for iproute.
+
+%package_help
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+./autogen.sh
+%configure --enable-devel --enable-bpf-compiler --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
+
+%disable_rpath
+
+rm -f include/linux/types.h
+
+%make_build
+
+%check
+make check
+
+%install
+%make_install 
+
+%delete_la
+
+install -m 0755 -d %{buildroot}%{_includedir}/iptables
+install -m 0644 include/ip*tables.h %{buildroot}%{_includedir}
+install -m 0644 include/iptables/internal.h %{buildroot}%{_includedir}/iptables
+
+install -m 0755 -d %{buildroot}%{_includedir}/libipulog/
+install -m 0644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog
+
+install -m 0755 -d %{buildroot}/%{script_path}
+install -m 0755 -c %{SOURCE1} %{buildroot}/%{script_path}/iptables.init
+sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init
+install -m 0755 ip6tables.init %{buildroot}/%{script_path}/ip6tables.init
+install -m 0755 -d %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0600 -c %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/iptables-config
+sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config
+install -m 0600 -c ip6tables-config %{buildroot}%{_sysconfdir}/sysconfig/ip6tables-config
+install -m 0600 -c %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/iptables
+install -m 0600 -c %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/ip6tables
+
+install -m 0755 -d %{buildroot}%{_unitdir}
+install -m 0644 -c %{SOURCE3} %{buildroot}%{_unitdir}
+sed -e 's;iptables;ip6tables;g' -e 's;IPv4;IPv6;g' -e 's;/usr/libexec/ip6tables;/usr/libexec/iptables;g' < %{SOURCE3} > ip6tables.service
+install -m 0644 -c ip6tables.service %{buildroot}%{_unitdir}
+
+install -m 0755 -d %{buildroot}/%{legacy_actions}/iptables
+install -m 0755 -d %{buildroot}/%{legacy_actions}/ip6tables
+
+pushd  %{buildroot}/%{legacy_actions}/iptables
+cat << EOF > save
+#!/bin/bash
+exec %{script_path}/iptables.init save
+EOF
+chmod 0755 save
+popd
+sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildroot}/%{legacy_actions}/iptables/save > ip6tabes.save-legacy
+install -m 0755 -c ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save
+
+pushd %{buildroot}/%{legacy_actions}/iptables
+cat << EOF > panic
+#!/bin/bash
+exec %{script_path}/iptables.init panic
+EOF
+chmod 0755 panic
+popd
+sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildroot}/%{legacy_actions}/iptables/panic > ip6tabes.panic-legacy
+install -m 0755 -c ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables/panic
+
+install -m 0755 iptables/iptables-apply %{buildroot}%{_sbindir}
+install -m 0755 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8
+
+# Remove /etc/ethertypes (now part of setup)
+rm -f %{buildroot}%{_sysconfdir}/ethertypes
+
+touch %{buildroot}%{_libexecdir}/arptables-helper
+
+touch %{buildroot}%{_mandir}/man8/arptables.8
+touch %{buildroot}%{_mandir}/man8/arptables-save.8
+touch %{buildroot}%{_mandir}/man8/arptables-restore.8
+touch %{buildroot}%{_mandir}/man8/ebtables.8
+
+%ldconfig_scriptlets
+
+%post
+pfx=%{_sbindir}/iptables
+pfx6=%{_sbindir}/ip6tables
+%{_sbindir}/update-alternatives --install \
+	$pfx iptables $pfx-legacy 10 \
+	--slave $pfx6 ip6tables $pfx6-legacy \
+        --slave $pfx-restore iptables-restore $pfx-legacy-restore \
+        --slave $pfx-save iptables-save $pfx-legacy-save \
+        --slave $pfx6-restore ip6tables-restore $pfx6-legacy-restore \
+        --slave $pfx6-save ip6tables-save $pfx6-legacy-save
+
+%systemd_post iptables.service ip6tables.service
+
+%preun
+%systemd_preun iptables.service ip6tables.service
+
+%postun
+if  $1 -eq 0 ; then
+	%{_sbindir}/update-alternatives --remove \
+		iptables %{_sbindir}/iptables-legacy
+fi
+%?ldconfig
+%systemd_postun iptables.service ip6tables.service
+
+%post             nft
+pfx=%{_sbindir}/iptables
+pfx6=%{_sbindir}/ip6tables
+%{_sbindir}/update-alternatives --install \
+	$pfx iptables $pfx-nft 10 \
+	--slave $pfx6 ip6tables $pfx6-nft \
+	--slave $pfx-restore iptables-restore $pfx-nft-restore \
+	--slave $pfx-save iptables-save $pfx-nft-save \
+	--slave $pfx6-restore ip6tables-restore $pfx6-nft-restore \
+	--slave $pfx6-save ip6tables-save $pfx6-nft-save
+
+pfx=%{_sbindir}/ebtables
+manpfx=%{_mandir}/man8/ebtables
+for sfx in "" "-restore" "-save"; do
+	if  "$(readlink -e $pfx$sfx)" == $pfx$sfx ; then
+		rm -f $pfx$sfx
+	fi
+done
+if  "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ; then
+	rm -f $manpfx.8.gz
+fi
+%{_sbindir}/update-alternatives --install \
+	$pfx ebtables $pfx-nft 10 \
+	--slave $pfx-save ebtables-save $pfx-nft-save \
+	--slave $pfx-restore ebtables-restore $pfx-nft-restore \
+	--slave $manpfx.8.gz ebtables-man $manpfx-nft.8.gz

_service:extract_file:bugfix-add-check-fw-in-entry.patch Deleted

@@ -1,135 +0,0 @@
-From cbc3a30711701f0e8d7f5df14f84adfb2c9fec1f Mon Sep 17 00:00:00 2001
-From: majun <majun65@huawei.com>
-Date: Fri, 16 Apr 2021 14:52:42 +0800
-Subject: PATCH 
-
-iptables: add null check for fw in X_entry
-If the fw pointer is empty, a core dump occurs.
-
----
- iptables/ip6tables.c | 21 +++++++++++++++++++++
- iptables/iptables.c  | 20 ++++++++++++++++++++
- 2 files changed, 41 insertions(+)
-
-diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
-index 576c2cf..db79906 100644
---- a/iptables/ip6tables.c
-+++ b/iptables/ip6tables.c
-@@ -557,6 +557,10 @@ append_entry(const xt_chainlabel chain,
- 	unsigned int i, j;
- 	int ret = 1;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ipv6.src = saddrsi;
- 		fw->ipv6.smsk = smasksi;
-@@ -581,6 +585,11 @@ replace_entry(const xt_chainlabel chain,
- 	      int verbose,
- 	      struct xtc_handle *handle)
- {
-+
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	fw->ipv6.src = *saddr;
- 	fw->ipv6.dst = *daddr;
- 	fw->ipv6.smsk = *smask;
-@@ -607,6 +616,10 @@ insert_entry(const xt_chainlabel chain,
- 	unsigned int i, j;
- 	int ret = 1;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ipv6.src = saddrsi;
- 		fw->ipv6.smsk = smasksi;
-@@ -674,6 +687,10 @@ delete_entry(const xt_chainlabel chain,
- 	int ret = 1;
- 	unsigned char *mask;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	mask = make_delete_mask(matches, target);
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ipv6.src = saddrsi;
-@@ -704,6 +721,10 @@ check_entry(const xt_chainlabel chain, struct ip6t_entry *fw,
- 	int ret = 1;
- 	unsigned char *mask;
- 
-+	if (!fw) {
-+                return 0;
-+        }
-+
- 	mask = make_delete_mask(matches, target);
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ipv6.src = saddrsi;
-diff --git a/iptables/iptables.c b/iptables/iptables.c
-index 88ef6cf..6507603 100644
---- a/iptables/iptables.c
-+++ b/iptables/iptables.c
-@@ -549,6 +549,10 @@ append_entry(const xt_chainlabel chain,
- 	unsigned int i, j;
- 	int ret = 1;
- 
-+	if (!fw) {
-+		return 0;
-+	}
-+
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ip.src.s_addr = saddrsi.s_addr;
- 		fw->ip.smsk.s_addr = smasksi.s_addr;
-@@ -573,6 +577,10 @@ replace_entry(const xt_chainlabel chain,
- 	      int verbose,
- 	      struct xtc_handle *handle)
- {
-+	if (!fw) {
-+                return 0;
-+        }
-+
- 	fw->ip.src.s_addr = saddr->s_addr;
- 	fw->ip.dst.s_addr = daddr->s_addr;
- 	fw->ip.smsk.s_addr = smask->s_addr;
-@@ -599,6 +607,10 @@ insert_entry(const xt_chainlabel chain,
- 	unsigned int i, j;
- 	int ret = 1;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ip.src.s_addr = saddrsi.s_addr;
- 		fw->ip.smsk.s_addr = smasksi.s_addr;
-@@ -666,6 +678,10 @@ delete_entry(const xt_chainlabel chain,
- 	int ret = 1;
- 	unsigned char *mask;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	mask = make_delete_mask(matches, target);
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ip.src.s_addr = saddrsi.s_addr;
-@@ -696,6 +712,10 @@ check_entry(const xt_chainlabel chain, struct ipt_entry *fw,
- 	int ret = 1;
- 	unsigned char *mask;
- 
-+        if (!fw) {
-+                return 0;
-+        }
-+
- 	mask = make_delete_mask(matches, target);
- 	for (i = 0; i < nsaddrs; i++) {
- 		fw->ip.src.s_addr = saddrsi.s_addr;
--- 
-2.27.0
-

_service:tar_scm:bugfix-add-check-fw-in-entry.patch Added

@@ -0,0 +1,135 @@
+From cbc3a30711701f0e8d7f5df14f84adfb2c9fec1f Mon Sep 17 00:00:00 2001
+From: majun <majun65@huawei.com>
+Date: Fri, 16 Apr 2021 14:52:42 +0800
+Subject: PATCH 
+
+iptables: add null check for fw in X_entry
+If the fw pointer is empty, a core dump occurs.
+
+---
+ iptables/ip6tables.c | 21 +++++++++++++++++++++
+ iptables/iptables.c  | 20 ++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
+index 576c2cf..db79906 100644
+--- a/iptables/ip6tables.c
++++ b/iptables/ip6tables.c
+@@ -557,6 +557,10 @@ append_entry(const xt_chainlabel chain,
+ 	unsigned int i, j;
+ 	int ret = 1;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ipv6.src = saddrsi;
+ 		fw->ipv6.smsk = smasksi;
+@@ -581,6 +585,11 @@ replace_entry(const xt_chainlabel chain,
+ 	      int verbose,
+ 	      struct xtc_handle *handle)
+ {
++
++        if (!fw) {
++                return 0;
++        }
++
+ 	fw->ipv6.src = *saddr;
+ 	fw->ipv6.dst = *daddr;
+ 	fw->ipv6.smsk = *smask;
+@@ -607,6 +616,10 @@ insert_entry(const xt_chainlabel chain,
+ 	unsigned int i, j;
+ 	int ret = 1;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ipv6.src = saddrsi;
+ 		fw->ipv6.smsk = smasksi;
+@@ -674,6 +687,10 @@ delete_entry(const xt_chainlabel chain,
+ 	int ret = 1;
+ 	unsigned char *mask;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	mask = make_delete_mask(matches, target);
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ipv6.src = saddrsi;
+@@ -704,6 +721,10 @@ check_entry(const xt_chainlabel chain, struct ip6t_entry *fw,
+ 	int ret = 1;
+ 	unsigned char *mask;
+ 
++	if (!fw) {
++                return 0;
++        }
++
+ 	mask = make_delete_mask(matches, target);
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ipv6.src = saddrsi;
+diff --git a/iptables/iptables.c b/iptables/iptables.c
+index 88ef6cf..6507603 100644
+--- a/iptables/iptables.c
++++ b/iptables/iptables.c
+@@ -549,6 +549,10 @@ append_entry(const xt_chainlabel chain,
+ 	unsigned int i, j;
+ 	int ret = 1;
+ 
++	if (!fw) {
++		return 0;
++	}
++
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ip.src.s_addr = saddrsi.s_addr;
+ 		fw->ip.smsk.s_addr = smasksi.s_addr;
+@@ -573,6 +577,10 @@ replace_entry(const xt_chainlabel chain,
+ 	      int verbose,
+ 	      struct xtc_handle *handle)
+ {
++	if (!fw) {
++                return 0;
++        }
++
+ 	fw->ip.src.s_addr = saddr->s_addr;
+ 	fw->ip.dst.s_addr = daddr->s_addr;
+ 	fw->ip.smsk.s_addr = smask->s_addr;
+@@ -599,6 +607,10 @@ insert_entry(const xt_chainlabel chain,
+ 	unsigned int i, j;
+ 	int ret = 1;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ip.src.s_addr = saddrsi.s_addr;
+ 		fw->ip.smsk.s_addr = smasksi.s_addr;
+@@ -666,6 +678,10 @@ delete_entry(const xt_chainlabel chain,
+ 	int ret = 1;
+ 	unsigned char *mask;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	mask = make_delete_mask(matches, target);
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ip.src.s_addr = saddrsi.s_addr;
+@@ -696,6 +712,10 @@ check_entry(const xt_chainlabel chain, struct ipt_entry *fw,
+ 	int ret = 1;
+ 	unsigned char *mask;
+ 
++        if (!fw) {
++                return 0;
++        }
++
+ 	mask = make_delete_mask(matches, target);
+ 	for (i = 0; i < nsaddrs; i++) {
+ 		fw->ip.src.s_addr = saddrsi.s_addr;
+-- 
+2.27.0
+

_service:tar_scm:enabled-makecheck-in-extensions.patch Added

_service Changed

_service:extract_file:iptables-1.8.7.tar.bz2 Deleted

_service:extract_file:iptables-config Deleted

@@ -1,59 +0,0 @@
-# Load additional iptables modules (nat helpers)
-#   Default: -none-
-# Space separated list of nat helpers (e.g. 'ip_nat_ftp ip_nat_irc'), which
-# are loaded after the firewall rules are applied. Options for the helpers are
-# stored in /etc/modprobe.conf.
-IPTABLES_MODULES=""
-
-# Save current firewall rules on stop.
-#   Value: yes|no,  default: no
-# Saves all firewall rules to /etc/sysconfig/iptables if firewall gets stopped
-# (e.g. on system shutdown).
-IPTABLES_SAVE_ON_STOP="no"
-
-# Save current firewall rules on restart.
-#   Value: yes|no,  default: no
-# Saves all firewall rules to /etc/sysconfig/iptables if firewall gets
-# restarted.
-IPTABLES_SAVE_ON_RESTART="no"
-
-# Save (and restore) rule and chain counter.
-#   Value: yes|no,  default: no
-# Save counters for rules and chains to /etc/sysconfig/iptables if
-# 'service iptables save' is called or on stop or restart if SAVE_ON_STOP or
-# SAVE_ON_RESTART is enabled.
-IPTABLES_SAVE_COUNTER="no"
-
-# Numeric status output
-#   Value: yes|no,  default: yes
-# Print IP addresses and port numbers in numeric format in the status output.
-IPTABLES_STATUS_NUMERIC="yes"
-
-# Verbose status output
-#   Value: yes|no,  default: yes
-# Print info about the number of packets and bytes plus the "input-" and
-# "outputdevice" in the status output.
-IPTABLES_STATUS_VERBOSE="no"
-
-# Status output with numbered lines
-#   Value: yes|no,  default: yes
-# Print a counter/number for every rule in the status output.
-IPTABLES_STATUS_LINENUMBERS="yes"
-
-# Reload sysctl settings on start and restart
-#   Default: -none-
-# Space separated list of sysctl items which are to be reloaded on start.
-# List items will be matched by fgrep.
-#IPTABLES_SYSCTL_LOAD_LIST=".nf_conntrack .bridge-nf"
-
-# Set wait option for iptables-restore calls in seconds
-#   Default: 600
-# Set to 0 to deactivate the wait.
-#IPTABLES_RESTORE_WAIT=600
-
-# Set wait interval option for iptables-restore calls in microseconds
-#   Default: 1000000
-# Set to 100000 to try to get the lock every 100000 microseconds, 10 times a
-# second.
-# Only usable with IPTABLES_RESTORE_WAIT > 0
-#IPTABLES_RESTORE_WAIT_INTERVAL=1000000

_service:extract_file:iptables.init Deleted

@@ -1,434 +0,0 @@
-#!/bin/bash
-#
-# iptables	Start iptables firewall
-#
-# chkconfig: 2345 08 92
-# description:	Starts, stops and saves iptables firewall
-#
-# config: /etc/sysconfig/iptables
-# config: /etc/sysconfig/iptables-config
-#
-### BEGIN INIT INFO
-# Provides: iptables
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop iptables firewall
-# Description: Start, stop and save iptables firewall
-### END INIT INFO
-
-# compat for removed initscripts dependency
-success() {
-	echo -n "  OK  "
-	return 0
-}
-
-warning() {
-	echo -n "WARNING"
-	return 1
-}
-
-failure() {
-	echo -n "FAILED"
-	return 1
-}
-
-IPTABLES=iptables
-IPTABLES_DATA=/etc/sysconfig/$IPTABLES
-IPTABLES_FALLBACK_DATA=${IPTABLES_DATA}.fallback
-IPTABLES_CONFIG=/etc/sysconfig/${IPTABLES}-config
-IPV=${IPTABLES%tables} # ip for ipv4 | ip6 for ipv6
- "$IPV" = "ip"  && _IPV="ipv4" || _IPV="ipv6"
-PROC_IPTABLES_NAMES=/proc/net/${IPV}_tables_names
-VAR_SUBSYS_IPTABLES=/var/lock/subsys/$IPTABLES
-
-# only usable for root
-if  $EUID != 0 ; then
-    echo -n $"${IPTABLES}: Only usable by root."; warning; echo
-    exit 4
-fi
-
-if  ! -x /sbin/$IPTABLES ; then
-    echo -n $"${IPTABLES}: /sbin/$IPTABLES does not exist."; warning; echo
-    exit 5
-fi
-
-# Old or new modutils
-/sbin/modprobe --version 2>&1 | grep -q 'kmod version' \
-    && NEW_MODUTILS=1 \
-    || NEW_MODUTILS=0
-
-# Default firewall configuration:
-IPTABLES_MODULES=""
-IPTABLES_SAVE_ON_STOP="no"
-IPTABLES_SAVE_ON_RESTART="no"
-IPTABLES_SAVE_COUNTER="no"
-IPTABLES_STATUS_NUMERIC="yes"
-IPTABLES_STATUS_VERBOSE="no"
-IPTABLES_STATUS_LINENUMBERS="yes"
-IPTABLES_SYSCTL_LOAD_LIST=""
-IPTABLES_RESTORE_WAIT=600
-IPTABLES_RESTORE_WAIT_INTERVAL=1000000
-
-# Load firewall configuration.
- -f "$IPTABLES_CONFIG"  && . "$IPTABLES_CONFIG"
-
-# Get active tables
-NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
-
-
-flush_n_delete() {
-    # Flush firewall rules and delete chains.
-     ! -e "$PROC_IPTABLES_NAMES"  && return 0
-
-    # Check if firewall is configured (has tables)
-     -z "$NF_TABLES"  && return 1
-
-    echo -n $"${IPTABLES}: Flushing firewall rules: "
-    ret=0
-    # For all tables
-    for i in $NF_TABLES; do
-        # Flush firewall rules.
-	$IPTABLES -t $i -F;
-	let ret+=$?;
-
-        # Delete firewall chains.
-	$IPTABLES -t $i -X;
-	let ret+=$?;
-
-	# Set counter to zero.
-	$IPTABLES -t $i -Z;
-	let ret+=$?;
-    done
-
-     $ret -eq 0  && success || failure
-    echo
-    return $ret
-}
-
-set_policy() {
-    # Set policy for configured tables.
-    policy=$1
-
-    # Check if iptable module is loaded
-     ! -e "$PROC_IPTABLES_NAMES"  && return 0
-
-    # Check if firewall is configured (has tables)
-    tables=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
-     -z "$tables"  && return 1
-
-    echo -n $"${IPTABLES}: Setting chains to policy $policy: "
-    ret=0
-    for i in $tables; do
-	echo -n "$i "
-	case "$i" in
-	    raw)
-		$IPTABLES -t raw -P PREROUTING $policy \
-		    && $IPTABLES -t raw -P OUTPUT $policy \
-		    || let ret+=1
-		;;
-	    filter)
-                $IPTABLES -t filter -P INPUT $policy \
-		    && $IPTABLES -t filter -P OUTPUT $policy \
-		    && $IPTABLES -t filter -P FORWARD $policy \
-		    || let ret+=1
-		;;
-	    nat)
-		$IPTABLES -t nat -P PREROUTING $policy \
-		    && $IPTABLES -t nat -P POSTROUTING $policy \
-		    && $IPTABLES -t nat -P OUTPUT $policy \
-		    || let ret+=1
-		;;
-	    mangle)
-	        $IPTABLES -t mangle -P PREROUTING $policy \
-		    && $IPTABLES -t mangle -P POSTROUTING $policy \
-		    && $IPTABLES -t mangle -P INPUT $policy \
-		    && $IPTABLES -t mangle -P OUTPUT $policy \
-		    && $IPTABLES -t mangle -P FORWARD $policy \
-		    || let ret+=1
-		;;
-	    *)
-	        let ret+=1
-		;;
-        esac
-    done
-
-     $ret -eq 0  && success || failure
-    echo
-    return $ret
-}
-
-load_sysctl() {
-    # load matched sysctl values
-    if  -n "$IPTABLES_SYSCTL_LOAD_LIST" ; then
-        echo -n $"Loading sysctl settings: "
-        ret=0
-        for item in $IPTABLES_SYSCTL_LOAD_LIST; do
-            fgrep -hs $item /etc/sysctl.d/* | sysctl -p - >/dev/null
-            let ret+=$?;
-        done
-         $ret -eq 0  && success || failure
-        echo
-    fi
-    return $ret
-}
-
-start() {
-    # Do not start if there is no config file.
-    if  ! -f "$IPTABLES_DATA" ; then
-	echo -n $"${IPTABLES}: No config file."; warning; echo
-	return 6
-    fi
-
-    # check if ipv6 module load is deactivated
-    if  "${_IPV}" = "ipv6"  \
-	&& grep -qIsE "^install:space:+${_IPV}:space:+/bin/(true|false)" /etc/modprobe.conf /etc/modprobe.d/* ; then
-	echo $"${IPTABLES}: ${_IPV} is disabled."
-	return 150
-    fi
-
-    echo -n $"${IPTABLES}: Applying firewall rules: "
-
-    OPT=
-     "x$IPTABLES_SAVE_COUNTER" = "xyes"  && OPT="-c"
-    if  $IPTABLES_RESTORE_WAIT -ne 0 ; then
-       OPT="${OPT} --wait ${IPTABLES_RESTORE_WAIT}"
-       if  $IPTABLES_RESTORE_WAIT_INTERVAL -lt 1000000 ; then
-           OPT="${OPT} --wait-interval ${IPTABLES_RESTORE_WAIT_INTERVAL}"
-       fi

_service:extract_file:iptables.service Deleted

_service:extract_file:iptables.yaml Deleted

_service:extract_file:sysconfig_ip6tables Deleted

_service:extract_file:sysconfig_iptables Deleted

_service:tar_scm:iptables-1653487903.7523b41.tar -> _service:tar_scm:iptables-1.8.7.tar.bz2 Changed

_service:tar_scm:iptables-config Added

@@ -0,0 +1,59 @@
+# Load additional iptables modules (nat helpers)
+#   Default: -none-
+# Space separated list of nat helpers (e.g. 'ip_nat_ftp ip_nat_irc'), which
+# are loaded after the firewall rules are applied. Options for the helpers are
+# stored in /etc/modprobe.conf.
+IPTABLES_MODULES=""
+
+# Save current firewall rules on stop.
+#   Value: yes|no,  default: no
+# Saves all firewall rules to /etc/sysconfig/iptables if firewall gets stopped
+# (e.g. on system shutdown).
+IPTABLES_SAVE_ON_STOP="no"
+
+# Save current firewall rules on restart.
+#   Value: yes|no,  default: no
+# Saves all firewall rules to /etc/sysconfig/iptables if firewall gets
+# restarted.
+IPTABLES_SAVE_ON_RESTART="no"
+
+# Save (and restore) rule and chain counter.
+#   Value: yes|no,  default: no
+# Save counters for rules and chains to /etc/sysconfig/iptables if
+# 'service iptables save' is called or on stop or restart if SAVE_ON_STOP or
+# SAVE_ON_RESTART is enabled.
+IPTABLES_SAVE_COUNTER="no"
+
+# Numeric status output
+#   Value: yes|no,  default: yes
+# Print IP addresses and port numbers in numeric format in the status output.
+IPTABLES_STATUS_NUMERIC="yes"
+
+# Verbose status output
+#   Value: yes|no,  default: yes
+# Print info about the number of packets and bytes plus the "input-" and
+# "outputdevice" in the status output.
+IPTABLES_STATUS_VERBOSE="no"
+
+# Status output with numbered lines
+#   Value: yes|no,  default: yes
+# Print a counter/number for every rule in the status output.
+IPTABLES_STATUS_LINENUMBERS="yes"
+
+# Reload sysctl settings on start and restart
+#   Default: -none-
+# Space separated list of sysctl items which are to be reloaded on start.
+# List items will be matched by fgrep.
+#IPTABLES_SYSCTL_LOAD_LIST=".nf_conntrack .bridge-nf"
+
+# Set wait option for iptables-restore calls in seconds
+#   Default: 600
+# Set to 0 to deactivate the wait.
+#IPTABLES_RESTORE_WAIT=600
+
+# Set wait interval option for iptables-restore calls in microseconds
+#   Default: 1000000
+# Set to 100000 to try to get the lock every 100000 microseconds, 10 times a
+# second.
+# Only usable with IPTABLES_RESTORE_WAIT > 0
+#IPTABLES_RESTORE_WAIT_INTERVAL=1000000

_service:tar_scm:iptables.init Added

@@ -0,0 +1,440 @@
+#!/bin/bash
+#
+# iptables	Start iptables firewall
+#
+# chkconfig: 2345 08 92
+# description:	Starts, stops and saves iptables firewall
+#
+# config: /etc/sysconfig/iptables
+# config: /etc/sysconfig/iptables-config
+#
+### BEGIN INIT INFO
+# Provides: iptables
+# Required-Start:
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop iptables firewall
+# Description: Start, stop and save iptables firewall
+### END INIT INFO
+
+# compat for removed initscripts dependency
+success() {
+	echo -n "  OK  "
+	return 0
+}
+
+warning() {
+	echo -n "WARNING"
+	return 1
+}
+
+failure() {
+	echo -n "FAILED"
+	return 1
+}
+
+IPTABLES=iptables
+IPTABLES_DATA=/etc/sysconfig/$IPTABLES
+IPTABLES_FALLBACK_DATA=${IPTABLES_DATA}.fallback
+IPTABLES_CONFIG=/etc/sysconfig/${IPTABLES}-config
+IPV=${IPTABLES%tables} # ip for ipv4 | ip6 for ipv6
+ "$IPV" = "ip"  && _IPV="ipv4" || _IPV="ipv6"
+PROC_IPTABLES_NAMES=/proc/net/${IPV}_tables_names
+VAR_SUBSYS_IPTABLES=/var/lock/subsys/$IPTABLES
+
+# only usable for root
+if  $EUID != 0 ; then
+    echo -n $"${IPTABLES}: Only usable by root."; warning; echo
+    exit 4
+fi
+
+if  ! -x /sbin/$IPTABLES ; then
+    echo -n $"${IPTABLES}: /sbin/$IPTABLES does not exist."; warning; echo
+    exit 5
+fi
+
+# Old or new modutils
+/sbin/modprobe --version 2>&1 | grep -q 'kmod version' \
+    && NEW_MODUTILS=1 \
+    || NEW_MODUTILS=0
+
+# Default firewall configuration:
+IPTABLES_MODULES=""
+IPTABLES_SAVE_ON_STOP="no"
+IPTABLES_SAVE_ON_RESTART="no"
+IPTABLES_SAVE_COUNTER="no"
+IPTABLES_STATUS_NUMERIC="yes"
+IPTABLES_STATUS_VERBOSE="no"
+IPTABLES_STATUS_LINENUMBERS="yes"
+IPTABLES_SYSCTL_LOAD_LIST=""
+IPTABLES_RESTORE_WAIT=600
+IPTABLES_RESTORE_WAIT_INTERVAL=1000000
+
+# Load firewall configuration.
+ -f "$IPTABLES_CONFIG"  && . "$IPTABLES_CONFIG"
+
+# Get active tables
+NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
+
+
+flush_n_delete() {
+    # Flush firewall rules and delete chains.
+     ! -e "$PROC_IPTABLES_NAMES"  && return 0
+
+    # Check if firewall is configured (has tables)
+     -z "$NF_TABLES"  && return 1
+
+    echo -n $"${IPTABLES}: Flushing firewall rules: "
+    ret=0
+    # For all tables
+    for i in $NF_TABLES; do
+        # Flush firewall rules.
+	$IPTABLES -t $i -F;
+	let ret+=$?;
+
+        # Delete firewall chains.
+	$IPTABLES -t $i -X;
+	let ret+=$?;
+
+	# Set counter to zero.
+	$IPTABLES -t $i -Z;
+	let ret+=$?;
+    done
+
+     $ret -eq 0  && success || failure
+    echo
+    return $ret
+}
+
+set_policy() {
+    # Set policy for configured tables.
+    policy=$1
+
+    # Check if iptable module is loaded
+     ! -e "$PROC_IPTABLES_NAMES"  && return 0
+
+    # Check if firewall is configured (has tables)
+    tables=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
+     -z "$tables"  && return 1
+
+    echo -n $"${IPTABLES}: Setting chains to policy $policy: "
+    ret=0
+    for i in $tables; do
+	echo -n "$i "
+	case "$i" in
+            security)
+		$IPTABLES -t filter -P INPUT $policy \
+		    && $IPTABLES -t filter -P OUTPUT $policy \
+		    && $IPTABLES -t filter -P FORWARD $policy \
+		    || let ret+=1
+		;;
+	    raw)
+		$IPTABLES -t raw -P PREROUTING $policy \
+		    && $IPTABLES -t raw -P OUTPUT $policy \
+		    || let ret+=1
+		;;
+	    filter)
+                $IPTABLES -t filter -P INPUT $policy \
+		    && $IPTABLES -t filter -P OUTPUT $policy \
+		    && $IPTABLES -t filter -P FORWARD $policy \
+		    || let ret+=1
+		;;
+	    nat)
+		$IPTABLES -t nat -P PREROUTING $policy \
+		    && $IPTABLES -t nat -P POSTROUTING $policy \
+		    && $IPTABLES -t nat -P OUTPUT $policy \
+		    || let ret+=1
+		;;
+	    mangle)
+	        $IPTABLES -t mangle -P PREROUTING $policy \
+		    && $IPTABLES -t mangle -P POSTROUTING $policy \
+		    && $IPTABLES -t mangle -P INPUT $policy \
+		    && $IPTABLES -t mangle -P OUTPUT $policy \
+		    && $IPTABLES -t mangle -P FORWARD $policy \
+		    || let ret+=1
+		;;
+	    *)
+	        let ret+=1
+		;;
+        esac
+    done
+
+     $ret -eq 0  && success || failure
+    echo
+    return $ret
+}
+
+load_sysctl() {
+    # load matched sysctl values
+    if  -n "$IPTABLES_SYSCTL_LOAD_LIST" ; then
+        echo -n $"Loading sysctl settings: "
+        ret=0
+        for item in $IPTABLES_SYSCTL_LOAD_LIST; do
+            fgrep -hs $item /etc/sysctl.d/* | sysctl -p - >/dev/null
+            let ret+=$?;
+        done
+         $ret -eq 0  && success || failure
+        echo
+    fi
+    return $ret
+}
+
+start() {
+    # Do not start if there is no config file.
+    if  ! -f "$IPTABLES_DATA" ; then
+	echo -n $"${IPTABLES}: No config file."; warning; echo
+	return 6
+    fi
+
+    # check if ipv6 module load is deactivated
+    if  "${_IPV}" = "ipv6"  \
+	&& grep -qIsE "^install:space:+${_IPV}:space:+/bin/(true|false)" /etc/modprobe.conf /etc/modprobe.d/* ; then
+	echo $"${IPTABLES}: ${_IPV} is disabled."
+	return 150
+    fi
+
+    echo -n $"${IPTABLES}: Applying firewall rules: "
+
+    OPT=

_service:tar_scm:iptables.service Added

_service:tar_scm:iptables.yaml Added

_service:tar_scm:sysconfig_ip6tables Added

_service:tar_scm:sysconfig_iptables Added

Changes of Revision 2