diff --git a/_service b/_service deleted file mode 100644 index 7509fef..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - git://netfilter.org/iptables - 0800d9b46b377bc24f15af2c6ae22550b954b6e2 - 1.8.0.g@TAG_OFFSET@ - - - *.tar - xz - - - diff --git a/iptables-1.8.0.g85.tar.xz b/iptables-1.8.0.g85.tar.xz deleted file mode 100644 index c5d69c4..0000000 --- a/iptables-1.8.0.g85.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0479c1b53a84f66eda0d9484d1a15c9a644049635bfe866af829df0976a1c737 -size 364504 diff --git a/iptables-1.8.1.tar.bz2 b/iptables-1.8.1.tar.bz2 new file mode 100644 index 0000000..21595c0 --- /dev/null +++ b/iptables-1.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fe4f297cf9c9bbab4972f95527f3e484f60c17c61800c9bff562f06c45461d8 +size 678706 diff --git a/iptables-1.8.1.tar.bz2.sig b/iptables-1.8.1.tar.bz2.sig new file mode 100644 index 0000000..3ed86a3 Binary files /dev/null and b/iptables-1.8.1.tar.bz2.sig differ diff --git a/iptables-apply-mktemp-fix.patch b/iptables-apply-mktemp-fix.patch index b1215d1..7bc9bcc 100644 --- a/iptables-apply-mktemp-fix.patch +++ b/iptables-apply-mktemp-fix.patch @@ -1,7 +1,11 @@ -Index: iptables-1.4.12.1+16/iptables/iptables-apply +--- + iptables/iptables-apply | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: iptables-1.8.1/iptables/iptables-apply =================================================================== ---- iptables-1.4.12.1+16.orig/iptables/iptables-apply -+++ iptables-1.4.12.1+16/iptables/iptables-apply +--- iptables-1.8.1.orig/iptables/iptables-apply ++++ iptables-1.8.1/iptables/iptables-apply @@ -111,7 +111,7 @@ if [[ ! -r "$FILE" ]]; then exit 2 fi @@ -17,6 +21,6 @@ Index: iptables-1.4.12.1+16/iptables/iptables-apply -TMPFILE=$(tempfile -p iptap) +TMPFILE=$(mktemp) - trap "rm -f $TMPFILE" EXIT 1 2 3 4 5 6 7 8 10 11 12 13 14 15 + trap "rm -f $TMPFILE" EXIT HUP INT QUIT ILL TRAP ABRT BUS \ + FPE USR1 SEGV USR2 PIPE ALRM TERM - if ! "$SAVE" >"$TMPFILE"; then diff --git a/iptables.changes b/iptables.changes index d6c14a2..55efc2e 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 23 14:25:53 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 1.8.1 + * New cgroup match revision with reduced memory footprint + ------------------------------------------------------------------- Mon Sep 24 08:14:16 UTC 2018 - astieger@suse.com diff --git a/iptables.spec b/iptables.spec index 5b3ac81..cfc4d01 100644 --- a/iptables.spec +++ b/iptables.spec @@ -12,21 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: iptables -Version: 1.8.0.g85 +Version: 1.8.1 Release: 0 Summary: IP packet filter administration utilities License: GPL-2.0-only AND Artistic-2.0 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/iptables/ #Git-Clone: git://git.netfilter.org/iptables -#Source: http://netfilter.org/projects/iptables/files/%%name-%%version.tar.bz2 -#Source2: http://netfilter.org/projects/iptables/files/%%name-%%version.tar.bz2.sig -Source: %name-%version.tar.xz +Source: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2 +Source2: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig Source3: %name.keyring Patch3: iptables-batch.patch Patch4: iptables-apply-mktemp-fix.patch @@ -152,7 +151,7 @@ rm -f extensions/libipt_unclean.man # includedir is overriden on purpose to detect projects that # fail to include libxtables_CFLAGS %configure --includedir="%_includedir/%name" --enable-libipq -%make_build V=1 +make %{?_smp_mflags} V=1 %install %make_install