From 96f1ee26aaef3bd00800fff9808f8a4a353a2b1151e42f51a32144389b562780 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 1 Oct 2013 00:26:03 +0000 Subject: [PATCH] iptables-1.4.20 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=76 --- iptables-1.4.19.1.tar.bz2 | 3 --- iptables-1.4.19.1.tar.bz2.sig | Bin 543 -> 0 bytes iptables-1.4.20.tar.bz2 | 3 +++ iptables-1.4.20.tar.bz2.sig | Bin 0 -> 543 bytes iptables-batch.patch | 14 +++++++------- iptables.changes | 7 +++++++ iptables.spec | 14 ++++---------- 7 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 iptables-1.4.19.1.tar.bz2 delete mode 100644 iptables-1.4.19.1.tar.bz2.sig create mode 100644 iptables-1.4.20.tar.bz2 create mode 100644 iptables-1.4.20.tar.bz2.sig 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 e181708b57e89d109c7f8999247b7f3a8115705b4a2f22c944cd587d08650d22..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-l~2b2H`2@s?aABnqPSj;qd5CG00t^_|CuO`hjNY4+V zRuX<4>n(8_iUSzNIB%XZ0dm-(k4q?YW%5`T-Rt(q2i5K6!xfbT5<0-Z57)Z0%GP&w z{fw$S$35asXjy%S{|PXvz(=;uPhstBh>3yTux{W-Hrul~v4{;-f~fC{QzG?yzc1@oDWXHt|8`5^`J5rSBl5p zJ7Ri9Y^i(Hxf9%r{d>?$&)x@Cm|Q&S!rdwfrMYu7t-#jPpR0d^nqEemp-(q^T7FYz zk0Hg2Z<5yS#`#RAL9aXw(V$Elc{xQ-p8sebuh-=%I{HP2-kI~cBRI3reTq|^4{L!o zTD-!7V+ke1h+|hE{*1jn3J-_0t{(&_j4xQ)=^SpbH-TnmA*woJH&JF^{LgPbl;pDZ h({p@lXD)wYizG1+G6g{Ge%&G3NwS*klb&&1om(GZb-()g*h_Avvll#Q;4Plc6j|)(qI)-mVTfgwFU5 zn~hYQxsI0GUrAt9B0N!eqGSvU4Ds}2%b$Cf#JF*EmRZf55t``Ljx=B+^%Sn)_*P?x zH0{Ft5G*p<)WGCJPs`KM$?_{i!gdN}?>1;uIA85-n|c{RFG`_A!y%j3ydyud;+@?I za~`Z-cKV!?!hs{^qa;#mqLXZ4rK;i^cNPML!YRq>M$j^6!0`>)EIgfUj5mwLtBWIi z=VnxBIdW!Jb10rRZrK2SLF6I}K5d?a-Nm<)--CC-dtX;<%#X zEq$#me-Y{`b^)^363O1g09wPFJ1bhb`^QQ<6;cpd?c4-U_m hb`PBze#UGSn1jsYz7Xu%Y34{>WT(k$R?yYXz1GK)2b%x@ literal 0 HcmV?d00001 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/