diff --git a/iptables-1.4.15.tar.bz2 b/iptables-1.4.15.tar.bz2 deleted file mode 100644 index 1e3e6c2..0000000 --- a/iptables-1.4.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:867c144e60075e7bebe6fcecf0b65169d5e2d1fa5ceec2ebd9780cd5026123ea -size 514830 diff --git a/iptables-1.4.15.tar.bz2.sig b/iptables-1.4.15.tar.bz2.sig deleted file mode 100644 index 0075ad8..0000000 Binary files a/iptables-1.4.15.tar.bz2.sig and /dev/null differ diff --git a/iptables-1.4.16.3.tar.bz2 b/iptables-1.4.16.3.tar.bz2 new file mode 100644 index 0000000..09df979 --- /dev/null +++ b/iptables-1.4.16.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79 +size 536872 diff --git a/iptables-1.4.16.3.tar.bz2.sig b/iptables-1.4.16.3.tar.bz2.sig new file mode 100644 index 0000000..1ea44ba Binary files /dev/null and b/iptables-1.4.16.3.tar.bz2.sig differ diff --git a/iptables-batch.patch b/iptables-batch.patch index c3f5c5e..e0a951f 100644 --- a/iptables-batch.patch +++ b/iptables-batch.patch @@ -3,10 +3,10 @@ iptables/iptables-batch.c | 468 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 477 insertions(+), 1 deletion(-) -Index: iptables-1.4.12.1+16/iptables/Makefile.am +Index: iptables-1.4.16.2/iptables/Makefile.am =================================================================== ---- iptables-1.4.12.1+16.orig/iptables/Makefile.am -+++ iptables-1.4.12.1+16/iptables/Makefile.am +--- iptables-1.4.16.2.orig/iptables/Makefile.am ++++ iptables-1.4.16.2/iptables/Makefile.am @@ -24,7 +24,15 @@ endif xtables_multi_SOURCES += xshared.c xtables_multi_LDADD += ../libxtables/libxtables.la -lm @@ -23,11 +23,11 @@ Index: iptables-1.4.12.1+16/iptables/Makefile.am +sbin_PROGRAMS = xtables-multi iptables-batch ip6tables-batch man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ iptables-xml.1 ip6tables.8 ip6tables-restore.8 \ - ip6tables-save.8 -Index: iptables-1.4.12.1+16/iptables/iptables-batch.c + ip6tables-save.8 iptables-extensions.8 +Index: iptables-1.4.16.2/iptables/iptables-batch.c =================================================================== --- /dev/null -+++ iptables-1.4.12.1+16/iptables/iptables-batch.c ++++ iptables-1.4.16.2/iptables/iptables-batch.c @@ -0,0 +1,468 @@ +/* + * Author: Ludwig Nussel diff --git a/iptables.changes b/iptables.changes index 96d1469..8dcdb48 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 8 12:42:37 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 1.4.16.3 +* This release includes aliasing support which translates command + lines using obsolete extensions into new ones. The option parser + now flags illegal negative numbers in some more extensions. + A division by zero was resolved in libxt_limit as well. + ------------------------------------------------------------------- Tue Jul 31 12:08:07 UTC 2012 - jengelh@inai.de diff --git a/iptables.spec b/iptables.spec index 3d3c13e..27ba3ce 100644 --- a/iptables.spec +++ b/iptables.spec @@ -19,19 +19,19 @@ Name: iptables %define lname_ipq libipq0 %define lname_iptc libiptc0 -%define lname_xt libxtables7 -Version: 1.4.15 +%define lname_xt libxtables9 +Version: 1.4.16.3 Release: 0 Summary: IP Packet Filter Administration utilities License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://netfilter.org/ -#DL-URL: ftp://ftp.netfilter.org/pub/iptables/ #Git-Web: http://git.netfilter.org/ #Git-Clone: git://git.netfilter.org/iptables -Source: ftp://ftp.netfilter.org/pub/iptables/%name-%version.tar.bz2 -Source2: ftp://ftp.netfilter.org/pub/iptables/%name-%version.tar.bz2.sig +#DL-URL: http://netfilter.org/projects/iptables/files/ +Source: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2 +Source2: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig Patch1: iptables-batch.patch Patch2: iptables-apply-mktemp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -138,8 +138,7 @@ xtables --variable=xtlibdir). tar -xf "%{S:0}" --use=bzip2; %setup -DTq %endif -%patch -P 1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -p1 %build if [ ! -e configure ]; then @@ -215,12 +214,13 @@ rm -f "%buildroot/%_libdir"/*.la; %files -n %lname_xt %defattr(-,root,root) -%_libdir/libxtables.so.7* +%_libdir/libxtables.so.9* %files -n libxtables-devel %defattr(-,root,root) %dir %_includedir/%name-%version %_includedir/%name-%version/xtables.h +%_includedir/%name-%version/xtables-version.h %_libdir/libxtables.so %_libdir/pkgconfig/xtables.pc