iptables 1.4.12.1

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=30

4982fe4-libipq-pkgconfig.diff

@@ -1,71 +0,0 @@
-parent fa2ce1ca2a3448350dee30c153dafe65abe7135d (v1.4.11.1-37-gfa2ce1c)
-commit 4982fe43cf247cda6ddb946a8f1fd58177124735
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Mon Aug 8 02:38:41 2011 +0200
-
-libipq: add pkgconfig file
-
-This is just to make sure that projects (still) using it do so with
-the right cflags, e.g. for when the include file ends up in a
-non-standard location due to ./configure having been called with
---include=/somewhere/else.
-
-Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
----
- configure.ac        |    3 ++-
- libipq/.gitignore   |    1 +
- libipq/Makefile.am  |    2 ++
- libipq/libipq.pc.in |   11 +++++++++++
- 4 files changed, 16 insertions(+), 1 deletions(-)
- create mode 100644 libipq/.gitignore
- create mode 100644 libipq/libipq.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 6aa0b2a..ab824a4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,6 +111,7 @@ AC_SUBST([libxtables_vmajor])
- 
- AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile
- 	iptables/Makefile iptables/xtables.pc
--	libipq/Makefile libiptc/Makefile libiptc/libiptc.pc utils/Makefile
-+	libipq/Makefile libipq/libipq.pc
-+	libiptc/Makefile libiptc/libiptc.pc utils/Makefile
- 	include/xtables.h include/iptables/internal.h])
- AC_OUTPUT
-diff --git a/libipq/.gitignore b/libipq/.gitignore
-new file mode 100644
-index 0000000..6cb21a3
---- /dev/null
-+++ b/libipq/.gitignore
-@@ -0,0 +1 @@
-+/libipq.pc
-diff --git a/libipq/Makefile.am b/libipq/Makefile.am
-index 93e5b1c..9e3a2ca 100644
---- a/libipq/Makefile.am
-+++ b/libipq/Makefile.am
-@@ -9,3 +9,5 @@ man_MANS         = ipq_create_handle.3 ipq_destroy_handle.3 ipq_errstr.3 \
-                    ipq_get_msgerr.3 ipq_get_packet.3 ipq_message_type.3 \
-                    ipq_perror.3 ipq_read.3 ipq_set_mode.3 ipq_set_verdict.3 \
-                    libipq.3
-+
-+pkgconfig_DATA = libipq.pc
-diff --git a/libipq/libipq.pc.in b/libipq/libipq.pc.in
-new file mode 100644
-index 0000000..ea31ec7
---- /dev/null
-+++ b/libipq/libipq.pc.in
-@@ -0,0 +1,11 @@
-+
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name:		libipq
-+Description:	Interface to the (old) ip_queue mechanism
-+Version:	@PACKAGE_VERSION@
-+Libs:		-L${libdir} -lipq
-+Cflags:		-I${includedir}
--- 
-# Created with git-export-patch

iptables-1.4.12.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:201dc6cda40930cb072f7888401bb761a2e6b50d653ee28690cd61b226b64bd5
+size 412892

iptables-1.4.12.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9a98a026e2f9d6795fcb209e61b938adecac05d002dd094b3ed7bf930a2047d
-size 411544

iptables.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep  1 17:09:05 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 1.4.12.1
+* regression fixes for the new (stricter) command-line parser
+- restore --includedir= in spec file
+
 -------------------------------------------------------------------
 Sat Aug 13 01:39:38 CEST 2011 - draht@suse.de
 

iptables.spec

@@ -21,7 +21,7 @@
 Name:           iptables
 License:        GPLv2+
 Group:          Productivity/Networking/Security
-Version:        1.4.12
+Version:        1.4.12.1
 Release:        1
 Summary:        IP Packet Filter Administration
 
@@ -30,8 +30,6 @@ Summary:        IP Packet Filter Administration
 #Git-Clone:	git://git.netfilter.org/iptables
 Source:         %name-%version.tar.xz
 Patch1:         iptables-batch.patch
-Patch2:		proc-header.diff
-Patch3:		4982fe4-libipq-pkgconfig.diff
 Url:            http://netfilter.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
@@ -68,7 +66,7 @@ These libraries are needed to compile
 tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -p1
 
 %build
 if [ ! -e configure ]; then
@@ -76,7 +74,9 @@ if [ ! -e configure ]; then
 fi
 # bnc#561793 - do not include unclean module in iptables manpage
 rm -f extensions/libipt_unclean.man
-%configure --enable-libipq
+# includedir is overriden on purpose to detect projects that
+# fail to include libxtables_CFLAGS
+%configure --includedir=%_includedir/%name-%version --enable-libipq
 make %{?_smp_mflags}
 
 %install

proc-header.diff

@@ -1,30 +0,0 @@
-parent 67156c0b9a3d35f5e7836e5683d8ca0b46ac36ca (v1.4.11.1-34-g67156c0)
-commit 41a9b481693b4c43c16d0588cc558dd455168af0
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Mon Aug 1 20:14:57 2011 +0200
-
-build: workaround broken linux-headers on RHEL-5
-
-maigc.h was not invented yet, but they do not
-ship proc_fs.h either, duh.
-
-Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
----
- iptables/xtables.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/iptables/xtables.c b/iptables/xtables.c
-index 1a5e568..233efa3 100644
---- a/iptables/xtables.c
-+++ b/iptables/xtables.c
-@@ -37,6 +37,8 @@
- #	include <linux/magic.h> /* for PROC_SUPER_MAGIC */
- #elif defined(HAVE_LINUX_PROC_FS_H)
- #	include <linux/proc_fs.h>	/* Linux 2.4 */
-+#else
-+#	define PROC_SUPER_MAGIC	0x9fa0
- #endif
- 
- #include <xtables.h>
--- 
-# Created with git-export-patch