!7 optimization the spec

Merge pull request !7 from yanan-rock/aa

iptables-apply-Use-mktemp-instead-of-tempfile.patch

@@ -1,26 +1,25 @@
-0d0a2c9c269dc5ed9e7d841b8ecb9dc060af Mon Sep 17 00:00:00 2001
+From 6c3a1a5c29a7c41af9da1a3bbf137df994479518 Mon Sep 17 00:00:00 2001
 From: Phil Sutter <psutter@redhat.com>
 Date: Fri, 12 Apr 2019 18:02:19 +0200
 Subject: [PATCH] iptables-apply: Use mktemp instead of tempfile
 
-Signed-off-by: Phil Sutter <psutter@redhat.com>
 ---
- iptables/iptables-apply | 4 ++--
+ iptables-apply | 4 ++--
-  1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
- diff --git a/iptables/iptables-apply b/iptables/iptables-apply
+diff --git a/iptables-apply b/iptables-apply
- index 819ca4a459c42..a685b6bbcd7dc 100755
+index 819ca4a..a685b6b 100755
- --- a/iptables/iptables-apply
+--- a/iptables/iptables-apply
- +++ b/iptables/iptables-apply
++++ b/iptables/iptables-apply
- @@ -111,7 +111,7 @@ if [[ ! -r "$FILE" ]]; then
+@@ -111,7 +111,7 @@ if [[ ! -r "$FILE" ]]; then
-  	exit 2
+ 	exit 2
-fi
+ fi
  
 -COMMANDS=(tempfile "$SAVE" "$RESTORE")
 +COMMANDS=(mktemp "$SAVE" "$RESTORE")
  
  for cmd in "${COMMANDS[@]}"; do
-	if ! command -v $cmd >/dev/null; then
+ 	if ! command -v $cmd >/dev/null; then
 @@ -122,7 +122,7 @@ done
  
  umask 0700
@@ -28,7 +27,7 @@ fi
 -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
+ 		      FPE USR1 SEGV USR2 PIPE ALRM TERM
  
 -- 
-2.21.0
+1.8.3.1

iptables.spec

@@ -2,7 +2,7 @@
 %global legacy_actions %{_libexecdir}/initscripts/legacy-actions
 Name:		  iptables
 Version:	  1.8.1
-Release:	  1
+Release:	  2
 Summary:	  IP packet filter administration utilities
 License:	  GPLv2 and Artistic Licence 2.0 and ISC
 URL:		  https://www.netfilter.org/
@@ -248,6 +248,9 @@ fi
 %{_mandir}/*
 
 %changelog
+* Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.8.1-2
+- optimization the patch
+
 * Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.8.1-1
 - Package update