diff --git a/iptables-1.8.4.tar.bz2 b/iptables-1.8.4.tar.bz2 deleted file mode 100644 index e95fb7a24cada577d192cf565eefb51d273a99f1..0000000000000000000000000000000000000000 Binary files a/iptables-1.8.4.tar.bz2 and /dev/null differ diff --git a/iptables-1.8.5.tar.bz2 b/iptables-1.8.5.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..4533c20d9a3466c90e1fe08bc97e663110061d4d Binary files /dev/null and b/iptables-1.8.5.tar.bz2 differ diff --git a/iptables-apply-Use-mktemp-instead-of-tempfile.patch b/iptables-apply-Use-mktemp-instead-of-tempfile.patch deleted file mode 100644 index d44df53d784d4ef05afc85ea705a90a5f29b3f0d..0000000000000000000000000000000000000000 --- a/iptables-apply-Use-mktemp-instead-of-tempfile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6c3a1a5c29a7c41af9da1a3bbf137df994479518 Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Fri, 12 Apr 2019 18:02:19 +0200 -Subject: [PATCH] iptables-apply: Use mktemp instead of tempfile - ---- - iptables-apply | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/iptables-apply b/iptables-apply -index 819ca4a..a685b6b 100755 ---- a/iptables/iptables-apply -+++ b/iptables/iptables-apply -@@ -111,7 +111,7 @@ if [[ ! -r "$FILE" ]]; then - exit 2 - fi - --COMMANDS=(tempfile "$SAVE" "$RESTORE") -+COMMANDS=(mktemp "$SAVE" "$RESTORE") - - for cmd in "${COMMANDS[@]}"; do - if ! command -v $cmd >/dev/null; then -@@ -122,7 +122,7 @@ done - - umask 0700 - --TMPFILE=$(tempfile -p iptap) -+TMPFILE=$(mktemp) - trap "rm -f $TMPFILE" EXIT HUP INT QUIT ILL TRAP ABRT BUS \ - FPE USR1 SEGV USR2 PIPE ALRM TERM - --- -1.8.3.1 diff --git a/iptables.spec b/iptables.spec index a3994c23f14492ca97680b1b2052003c7151ef2a..aff4d10513c0d12d8a847d28858d424794281434 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,8 +1,8 @@ %global script_path %{_libexecdir}/iptables %global legacy_actions %{_libexecdir}/initscripts/legacy-actions Name: iptables -Version: 1.8.4 -Release: 6 +Version: 1.8.5 +Release: 1 Summary: IP packet filter administration utilities License: GPLv2 and Artistic Licence 2.0 and ISC URL: https://www.netfilter.org/ @@ -13,8 +13,6 @@ Source3: iptables.service Source4: sysconfig_iptables Source5: sysconfig_ip6tables -Patch1: iptables-apply-Use-mktemp-instead-of-tempfile.patch - BuildRequires: bison flex gcc kernel-headers libpcap-devel libselinux-devel systemd git BuildRequires: libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel libnftnl-devel BuildRequires: autogen autoconf automake libtool iptables @@ -239,6 +237,7 @@ fi %{_sbindir}/nfnl_osf %{_sbindir}/nfbpf_* %{_sbindir}/iptables-apply +%{_sbindir}/ip6tables-apply %{_sbindir}/ip*tables-legacy* %{_sbindir}/xtables-legacy-multi %exclude %{_sbindir}/*-nft* @@ -316,6 +315,12 @@ fi %{_mandir}/man8/xtables-legacy* %changelog +* Wed Aug 26 yuboyun - 1.8.5-1 +- Type: bugfix +- ID: NA +- SUG: NA +- update to 1.8.5 + * Tue Jun 2 2020 gaihuiying - 1.8.4-6 - Type: bugfix - ID: NA @@ -375,4 +380,3 @@ fi * Fri Sep 20 2019 openEuler Buildteam - 1.8.0-5 - Package init -