diff --git a/iptables-1.4.19.1.tar.bz2 b/iptables-1.4.19.1.tar.bz2 deleted file mode 100644 index fca0977..0000000 --- a/iptables-1.4.19.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2 -size 543785 diff --git a/iptables-1.4.19.1.tar.bz2.sig b/iptables-1.4.19.1.tar.bz2.sig deleted file mode 100644 index e181708..0000000 Binary files a/iptables-1.4.19.1.tar.bz2.sig and /dev/null differ diff --git a/iptables-1.4.20.tar.bz2 b/iptables-1.4.20.tar.bz2 new file mode 100644 index 0000000..a0affb6 --- /dev/null +++ b/iptables-1.4.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad +size 546864 diff --git a/iptables-1.4.20.tar.bz2.sig b/iptables-1.4.20.tar.bz2.sig new file mode 100644 index 0000000..93f9c46 Binary files /dev/null and b/iptables-1.4.20.tar.bz2.sig differ diff --git a/iptables-batch.patch b/iptables-batch.patch index e0a951f..57f0b60 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.16.2/iptables/Makefile.am +Index: iptables-1.4.20/iptables/Makefile.am =================================================================== ---- iptables-1.4.16.2.orig/iptables/Makefile.am -+++ iptables-1.4.16.2/iptables/Makefile.am +--- iptables-1.4.20.orig/iptables/Makefile.am ++++ iptables-1.4.20/iptables/Makefile.am @@ -24,7 +24,15 @@ endif xtables_multi_SOURCES += xshared.c xtables_multi_LDADD += ../libxtables/libxtables.la -lm @@ -24,10 +24,10 @@ Index: iptables-1.4.16.2/iptables/Makefile.am man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ iptables-xml.1 ip6tables.8 ip6tables-restore.8 \ ip6tables-save.8 iptables-extensions.8 -Index: iptables-1.4.16.2/iptables/iptables-batch.c +Index: iptables-1.4.20/iptables/iptables-batch.c =================================================================== --- /dev/null -+++ iptables-1.4.16.2/iptables/iptables-batch.c ++++ iptables-1.4.20/iptables/iptables-batch.c @@ -0,0 +1,468 @@ +/* + * Author: Ludwig Nussel @@ -296,7 +296,7 @@ Index: iptables-1.4.16.2/iptables/iptables-batch.c + return 0; + +#ifdef IP6T -+ ret = do_command6(argc, argv, &table, ¤t_table->handle); ++ ret = do_command6(argc, argv, &table, ¤t_table->handle, true); + + if (!ret) + { @@ -312,7 +312,7 @@ Index: iptables-1.4.16.2/iptables/iptables-batch.c + } + } +#else -+ ret = do_command4(argc, argv, &table, ¤t_table->handle); ++ ret = do_command4(argc, argv, &table, ¤t_table->handle, true); + + if (!ret) + { diff --git a/iptables.changes b/iptables.changes index 3537684..0205be3 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 7 13:19:02 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 1.4.20 +* Introduce a new revision for the set match with the counters support +* Add locking to prevent concurrent instances + ------------------------------------------------------------------- Fri May 31 20:00:39 UTC 2013 - jengelh@inai.de diff --git a/iptables.spec b/iptables.spec index 45d2696..1b6cde5 100644 --- a/iptables.spec +++ b/iptables.spec @@ -20,7 +20,7 @@ Name: iptables %define lname_ipq libipq0 %define lname_iptc libiptc0 %define lname_xt libxtables10 -Version: 1.4.19.1 +Version: 1.4.20 Release: 0 Summary: IP Packet Filter Administration utilities License: GPL-2.0 and Artistic-2.0 @@ -54,12 +54,11 @@ BuildRequires: fdupes BuildRequires: gpg-offline %endif %if 0%{?suse_version} >= 1140 +BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: libnfnetlink-devel >= 1.0.0 -%endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} +%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version} +BuildRequires: libnetfilter_conntrack >= 1.0.4 BuildRequires: libnfnetlink-devel >= 1.0.0 %endif Requires: xtables-plugins = %version @@ -170,9 +169,6 @@ rm -f "%buildroot/%_libdir"/*.la; %fdupes %buildroot/%_prefix %endif -%clean -: - %post -n %lname_ipq -p /sbin/ldconfig %postun -n %lname_ipq -p /sbin/ldconfig %post -n %lname_iptc -p /sbin/ldconfig @@ -199,8 +195,6 @@ rm -f "%buildroot/%_libdir"/*.la; %files -n xtables-plugins %defattr(-,root,root) -%dir %_sysconfdir/xtables/ -%config %_sysconfdir/xtables/*.conf %_libdir/xtables/ %_sbindir/nfnl_osf %_datadir/xtables/