From 313e0f9055e21c1ddcb4f22fe2a7f455d011b33db2269f290c705893e5c8a7cf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 11:14:57 +0000 Subject: [PATCH] Accepting request 27487 from Base:System Copy from Base:System/iptables based on submit request 27487 from user puzel OBS-URL: https://build.opensuse.org/request/show/27487 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=17 --- iptables-1.4.4.tar.bz2 | 3 -- iptables-1.4.6.tar.bz2 | 3 ++ iptables-batch.patch | 64 ++++++++++++++++++++---------------------- iptables.changes | 19 +++++++++++++ iptables.spec | 21 +++++++------- 5 files changed, 63 insertions(+), 47 deletions(-) delete mode 100644 iptables-1.4.4.tar.bz2 create mode 100644 iptables-1.4.6.tar.bz2 diff --git a/iptables-1.4.4.tar.bz2 b/iptables-1.4.4.tar.bz2 deleted file mode 100644 index fb86afa..0000000 --- a/iptables-1.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f38274d992d16220373422c33ba39247b154cd1f4fe5245950596b1602185b6f -size 452656 diff --git a/iptables-1.4.6.tar.bz2 b/iptables-1.4.6.tar.bz2 new file mode 100644 index 0000000..848b71c --- /dev/null +++ b/iptables-1.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4 +size 463758 diff --git a/iptables-batch.patch b/iptables-batch.patch index d597c43..1213114 100644 --- a/iptables-batch.patch +++ b/iptables-batch.patch @@ -1,48 +1,46 @@ +--- + Makefile.am | 12 + + iptables-batch.c | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 478 insertions(+), 2 deletions(-) + Index: Makefile.am =================================================================== ---- Makefile.am.orig 2009-04-06 13:09:17.000000000 +0200 -+++ Makefile.am 2009-05-11 17:05:23.000000000 +0200 -@@ -44,6 +44,11 @@ iptables_save_SOURCES = iptables-sav - iptables_save_LDFLAGS = ${iptables_LDFLAGS} - iptables_save_LDADD = ${iptables_LDADD} +--- Makefile.am.orig ++++ Makefile.am +@@ -54,6 +54,14 @@ endif + ip6tables_multi_LDFLAGS = -rdynamic + ip6tables_multi_LDADD = libiptc/libip6tc.la extensions/libext6.a libxtables.la -lm -+iptables_batch_SOURCES = iptables-batch.c iptables.c xtables.c -+iptables_batch_CFLAGS = ${AM_CFLAGS} -+iptables_batch_LDFLAGS = ${iptables_LDFLAGS} -+iptables_batch_LDADD = ${iptables_LDADD} -+ - # iptables-multi, semi-static - iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c - iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -@@ -71,6 +76,11 @@ ip6tables_save_SOURCES = ip6tables-sa - ip6tables_save_LDFLAGS = ${ip6tables_LDFLAGS} - ip6tables_save_LDADD = ${ip6tables_LDADD} - -+ip6tables_batch_SOURCES = iptables-batch.c ip6tables.c xtables.c ++iptables_batch_SOURCES = iptables-batch.c iptables.c xtables.c xshared.c ++iptables_batch_LDFLAGS = ${iptables_multi_LDFLAGS} ++iptables_batch_LDADD = ${iptables_multi_LDADD} ++ip6tables_batch_SOURCES = iptables-batch.c ip6tables.c xtables.c xshared.c +ip6tables_batch_CFLAGS = ${AM_CFLAGS} -DIP6T -+ip6tables_batch_LDFLAGS = ${ip6tables_LDFLAGS} -+ip6tables_batch_LDADD = ${ip6tables_LDADD} ++ip6tables_batch_LDFLAGS = ${ip6tables_multi_LDFLAGS} ++ip6tables_batch_LDADD = ${ip6tables_multi_LDADD} + - # iptables-multi, semi-static - ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c - ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -@@ -94,10 +104,10 @@ endif - endif - if ENABLE_SHARED + sbin_PROGRAMS = + man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ + iptables-xml.8 ip6tables.8 ip6tables-restore.8 \ +@@ -61,12 +69,12 @@ man_MANS = iptables.8 iptables-r + CLEANFILES = iptables.8 ip6tables.8 + if ENABLE_IPV4 --sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save -+sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save iptables-batch +-sbin_PROGRAMS += iptables-multi ++sbin_PROGRAMS += iptables-multi iptables-batch + v4_bin_links = iptables-xml + v4_sbin_links = iptables iptables-restore iptables-save endif if ENABLE_IPV6 --sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save -+sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save ip6tables-batch - endif +-sbin_PROGRAMS += ip6tables-multi ++sbin_PROGRAMS += ip6tables-multi ip6tables-batch + v6_sbin_links = ip6tables ip6tables-restore ip6tables-save endif Index: iptables-batch.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ iptables-batch.c 2009-05-11 17:07:58.000000000 +0200 +--- /dev/null ++++ iptables-batch.c @@ -0,0 +1,468 @@ +/* + * Author: Ludwig Nussel diff --git a/iptables.changes b/iptables.changes index 1bca73f..4ea0a15 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Dec 22 18:09:11 CET 2009 - jengelh@medozas.de + +- update specfile descriptions (bnc#553801) +- update to iptables 1.4.6: + * combine iptables subprograms into a new multi-purpose binary + * support for new implementations: NFQUEUE v1, conntrack v2 + * helper: fix invalid passed option to check_inverse + * iprange accepts single host specifications again + * iprange: do accept non-ranges for xt_iprange v1 + * iprange: warn on reverse range + * libiptc: fix wrong maptype of base chain counters on restore + * iptables: fix undersized deletion mask creation + * iptables/extensions: make bundled options work again + * iptables: take masks into consideration for replace command + * xtables: warn of missing version identifier in extensions + * documentation updates +- refresh iptables-batch + ------------------------------------------------------------------- Thu Nov 12 08:21:35 UTC 2009 - puzel@novell.com diff --git a/iptables.spec b/iptables.spec index a800b22..e0d984d 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,5 +1,5 @@ # -# spec file for package iptables (Version 1.4.4) +# spec file for package iptables (Version 1.4.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: iptables -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Security -Version: 1.4.4 -Release: 4 +Version: 1.4.6 +Release: 1 Summary: IP Packet Filter Administration Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-batch.patch -Url: http://www.iptables.org +Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: linux-kernel-headers sgmltool @@ -39,11 +39,11 @@ packet filter rules in the Linux kernel. This version requires kernel Authors: -------- - Netfilter Core Team + Netfilter developer team %package devel -License: GPL v2 or later -Summary: Libraries, Headers and Development Man Pages for libipq +License: GPLv2+ +Summary: Libraries, Headers and Development Man Pages for iptables Group: Development/Libraries/C and C++ AutoReqProv: on Requires: %{name} = %{version} @@ -55,7 +55,7 @@ These libraries are needed to compile programs against libipq. Authors: -------- - Netfilter Core Team + Netfilter developer team %prep %setup -q @@ -73,8 +73,7 @@ make DESTDIR=$RPM_BUILD_ROOT install # iptables-apply is not installed by upstream Makefile install -m0755 iptables-apply $RPM_BUILD_ROOT%{_sbindir}/ install -m0644 iptables-apply.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -rm -f $RPM_BUILD_ROOT%{_libdir}/libxtables.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libiptc.la +find "$RPM_BUILD_ROOT" -iname "*.la" -print0 | xargs -0 rm -f; %clean rm -rf $RPM_BUILD_ROOT