From 6372308c59ad73d20b9390e3be64400847d4845cbf84b067f7577a8145dfbbcf Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 26 Jul 2011 06:58:08 +0000 Subject: [PATCH 01/12] Updating link to change in openSUSE:Factory/iptables revision 34.0 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=dbfb036152b7401e2069445cc1c37cd8 --- iptables.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iptables.spec b/iptables.spec index 247aae8..b0b3c21 100644 --- a/iptables.spec +++ b/iptables.spec @@ -30,9 +30,9 @@ Summary: IP Packet Filter Administration #Git-Clone: git://git.netfilter.org/iptables Source: %name-%version.tar.xz Patch1: iptables-batch.patch -URL: http://netfilter.org/ -BuildRoot: %_tmppath/%name-%version-build -BuildRequires: pkg-config, sgmltool, xz +Url: http://netfilter.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkg-config sgmltool xz %description Iptables is used to set up, maintain, and inspect the tables of IP From 5d930c329cae5c8486b8b339e93c505a67486819be0a942779778f013b0eea66 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 18:28:45 +0000 Subject: [PATCH 02/12] Make build work for Fedorean systems OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=22 --- iptables.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/iptables.spec b/iptables.spec index b0b3c21..ae9417b 100644 --- a/iptables.spec +++ b/iptables.spec @@ -32,7 +32,13 @@ Source: %name-%version.tar.xz Patch1: iptables-batch.patch Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkg-config sgmltool xz +%if 0%{?suse_version} +BuildRequires: sgmltool +%endif +%if 0%{?fedora_version} +BuildRequires: sgml-common +%endif +BuildRequires: pkgconfig, xz %description Iptables is used to set up, maintain, and inspect the tables of IP From 3b61f64323aa0567bf26379bd07d730ab6f72d3331e3cfdf2f9384dce30fe769 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 18:46:26 +0000 Subject: [PATCH 03/12] Make build work for Fedorean systems OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=23 --- iptables.spec | 8 +++++++- proc-header.diff | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 proc-header.diff diff --git a/iptables.spec b/iptables.spec index ae9417b..dc898b7 100644 --- a/iptables.spec +++ b/iptables.spec @@ -30,6 +30,7 @@ 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 Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -58,8 +59,13 @@ These libraries are needed to compile - programs using libipq %prep +%if 0%{?__xz:1} %setup -q -%patch -P 1 -p1 +%else +tar -xf "%{S:0}" --use=xz; +%setup -DTq +%endif +%patch -P 1 -P 2 -p1 %build if [ ! -e configure ]; then diff --git a/proc-header.diff b/proc-header.diff new file mode 100644 index 0000000..9d9dbea --- /dev/null +++ b/proc-header.diff @@ -0,0 +1,30 @@ +parent 67156c0b9a3d35f5e7836e5683d8ca0b46ac36ca (v1.4.11.1-34-g67156c0) +commit 41a9b481693b4c43c16d0588cc558dd455168af0 +Author: Jan Engelhardt +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 +--- + 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 /* for PROC_SUPER_MAGIC */ + #elif defined(HAVE_LINUX_PROC_FS_H) + # include /* Linux 2.4 */ ++#else ++# define PROC_SUPER_MAGIC 0x9fa0 + #endif + + #include +-- +# Created with git-export-patch From 6a1feb3c6d3faf5a71cb523c7c47f9cb5b9180c75a8b6adac00651ea99e5b485 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 19:08:31 +0000 Subject: [PATCH 04/12] Add Obsoletes for obsolete iptables-ipv6 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=24 --- iptables.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iptables.spec b/iptables.spec index dc898b7..505085a 100644 --- a/iptables.spec +++ b/iptables.spec @@ -38,6 +38,8 @@ BuildRequires: sgmltool %endif %if 0%{?fedora_version} BuildRequires: sgml-common +Provides: iptables-ipv6 = %version-%release +Obsoletes: iptables-ipv6 < %version-%release %endif BuildRequires: pkgconfig, xz From e9ca75a855ef846da02a253756155fe4955de55696af7b5f1e1a218d568a2668 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 19:30:40 +0000 Subject: [PATCH 05/12] Make build work for Fedorean systems OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=25 --- iptables.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables.spec b/iptables.spec index 505085a..016fde1 100644 --- a/iptables.spec +++ b/iptables.spec @@ -36,7 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: sgmltool %endif -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?centos_version} BuildRequires: sgml-common Provides: iptables-ipv6 = %version-%release Obsoletes: iptables-ipv6 < %version-%release From f8b3b70a2094e099850edc22e7e43d877d4bd4ed7d6fa65738a30a89f1a526c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Aug 2011 19:49:24 +0000 Subject: [PATCH 06/12] Put include files into a separate directory OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=26 --- 4982fe4-libipq-pkgconfig.diff | 71 +++++++++++++++++++++++++++++++++++ iptables.changes | 6 +++ iptables.spec | 11 +++--- 3 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 4982fe4-libipq-pkgconfig.diff diff --git a/4982fe4-libipq-pkgconfig.diff b/4982fe4-libipq-pkgconfig.diff new file mode 100644 index 0000000..1d9fcaa --- /dev/null +++ b/4982fe4-libipq-pkgconfig.diff @@ -0,0 +1,71 @@ +parent fa2ce1ca2a3448350dee30c153dafe65abe7135d (v1.4.11.1-37-gfa2ce1c) +commit 4982fe43cf247cda6ddb946a8f1fd58177124735 +Author: Jan Engelhardt +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 +--- + 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 diff --git a/iptables.changes b/iptables.changes index 5b8b300..389cd13 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 00:42:53 UTC 2011 - jengelh@medozas.de + +- Put include files into a separate directory to flag up missing + CFLAGS. libipq.pc will now be provided. + ------------------------------------------------------------------- Fri Jul 22 13:12:50 UTC 2011 - jengelh@medozas.de diff --git a/iptables.spec b/iptables.spec index 016fde1..7cdbcb2 100644 --- a/iptables.spec +++ b/iptables.spec @@ -31,6 +31,7 @@ Summary: IP Packet Filter Administration 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} @@ -41,7 +42,7 @@ BuildRequires: sgml-common Provides: iptables-ipv6 = %version-%release Obsoletes: iptables-ipv6 < %version-%release %endif -BuildRequires: pkgconfig, xz +BuildRequires: fdupes, pkgconfig, xz %description Iptables is used to set up, maintain, and inspect the tables of IP @@ -67,7 +68,7 @@ These libraries are needed to compile tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build if [ ! -e configure ]; then @@ -75,7 +76,7 @@ if [ ! -e configure ]; then fi # bnc#561793 - do not include unclean module in iptables manpage rm -f extensions/libipt_unclean.man -%configure \ +%configure --includedir=%_includedir/%name-%version \ --enable-libipq make %{?_smp_mflags} @@ -85,6 +86,7 @@ make DESTDIR=%buildroot install install -m0755 iptables/iptables-apply %buildroot%_sbindir/ install -m0644 iptables/iptables-apply.8 %buildroot%_mandir/man8/ find "%buildroot" -iname "*.la" -delete +%fdupes %buildroot %post -p /sbin/ldconfig @@ -107,7 +109,6 @@ find "%buildroot" -iname "*.la" -delete %doc %_mandir/man3/* %_includedir/* %_libdir/*.so -%_libdir/pkgconfig/xtables.pc -%_libdir/pkgconfig/libiptc.pc +%_libdir/pkgconfig/*.pc %changelog From 0799229540ecff49a61c16a0277e35974eeeab3fc7b45eeb14c865b2e9c1f1e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Aug 2011 19:58:49 +0000 Subject: [PATCH 07/12] Enable build of nfnl_osf OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=27 --- iptables.changes | 2 ++ iptables.spec | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/iptables.changes b/iptables.changes index 389cd13..6e7a81a 100644 --- a/iptables.changes +++ b/iptables.changes @@ -3,6 +3,8 @@ Mon Aug 8 00:42:53 UTC 2011 - jengelh@medozas.de - Put include files into a separate directory to flag up missing CFLAGS. libipq.pc will now be provided. +- Enable build of nfnl_osf, a tool to upload OS fingerprints to + the kernel for use with xt_osf. ------------------------------------------------------------------- Fri Jul 22 13:12:50 UTC 2011 - jengelh@medozas.de diff --git a/iptables.spec b/iptables.spec index 7cdbcb2..7910a5d 100644 --- a/iptables.spec +++ b/iptables.spec @@ -42,7 +42,7 @@ BuildRequires: sgml-common Provides: iptables-ipv6 = %version-%release Obsoletes: iptables-ipv6 < %version-%release %endif -BuildRequires: fdupes, pkgconfig, xz +BuildRequires: fdupes, libnfnetlink-devel, pkgconfig, xz %description Iptables is used to set up, maintain, and inspect the tables of IP @@ -101,8 +101,10 @@ find "%buildroot" -iname "*.la" -delete %_sbindir/iptables* %_sbindir/ip6tables* %_sbindir/xtables* +%_sbindir/nfnl_osf %_libdir/xtables %_libdir/*.so.* +%_datadir/xtables %files devel %defattr(-,root,root) From 1ec25547d7d65dc01f0b55901a49daf0b1eac4905dd88d2883abb60f775c2a47 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Aug 2011 20:49:38 +0000 Subject: [PATCH 08/12] Additional RH build fixups OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=28 --- iptables.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iptables.spec b/iptables.spec index 7910a5d..3d25c26 100644 --- a/iptables.spec +++ b/iptables.spec @@ -86,7 +86,9 @@ make DESTDIR=%buildroot install install -m0755 iptables/iptables-apply %buildroot%_sbindir/ install -m0644 iptables/iptables-apply.8 %buildroot%_mandir/man8/ find "%buildroot" -iname "*.la" -delete +%if 0%{?suse_version} %fdupes %buildroot +%endif %post -p /sbin/ldconfig From 61c947eec5dcb3d3e20ee6f2698bdfdd75c5b19e046a91562d949c87f877a313 Mon Sep 17 00:00:00 2001 From: Roman Drahtmueller Date: Fri, 12 Aug 2011 23:39:54 +0000 Subject: [PATCH 09/12] - include path is /usr/include OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=29 --- iptables.changes | 5 +++++ iptables.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/iptables.changes b/iptables.changes index 6e7a81a..efbe8b8 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 13 01:39:38 CEST 2011 - draht@suse.de + +- include path is /usr/include + ------------------------------------------------------------------- Mon Aug 8 00:42:53 UTC 2011 - jengelh@medozas.de diff --git a/iptables.spec b/iptables.spec index 3d25c26..b8632c4 100644 --- a/iptables.spec +++ b/iptables.spec @@ -76,8 +76,7 @@ if [ ! -e configure ]; then fi # bnc#561793 - do not include unclean module in iptables manpage rm -f extensions/libipt_unclean.man -%configure --includedir=%_includedir/%name-%version \ - --enable-libipq +%configure --enable-libipq make %{?_smp_mflags} %install From 497a1d83cd506e21fc2bc8c482d0b5a749f067bebd60f0ada1482d25bc0b1caa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 1 Sep 2011 17:13:49 +0000 Subject: [PATCH 10/12] iptables 1.4.12.1 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=30 --- 4982fe4-libipq-pkgconfig.diff | 71 ----------------------------------- iptables-1.4.12.1.tar.xz | 3 ++ iptables-1.4.12.tar.xz | 3 -- iptables.changes | 7 ++++ iptables.spec | 10 ++--- proc-header.diff | 30 --------------- 6 files changed, 15 insertions(+), 109 deletions(-) delete mode 100644 4982fe4-libipq-pkgconfig.diff create mode 100644 iptables-1.4.12.1.tar.xz delete mode 100644 iptables-1.4.12.tar.xz delete mode 100644 proc-header.diff diff --git a/4982fe4-libipq-pkgconfig.diff b/4982fe4-libipq-pkgconfig.diff deleted file mode 100644 index 1d9fcaa..0000000 --- a/4982fe4-libipq-pkgconfig.diff +++ /dev/null @@ -1,71 +0,0 @@ -parent fa2ce1ca2a3448350dee30c153dafe65abe7135d (v1.4.11.1-37-gfa2ce1c) -commit 4982fe43cf247cda6ddb946a8f1fd58177124735 -Author: Jan Engelhardt -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 ---- - 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 diff --git a/iptables-1.4.12.1.tar.xz b/iptables-1.4.12.1.tar.xz new file mode 100644 index 0000000..5550533 --- /dev/null +++ b/iptables-1.4.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:201dc6cda40930cb072f7888401bb761a2e6b50d653ee28690cd61b226b64bd5 +size 412892 diff --git a/iptables-1.4.12.tar.xz b/iptables-1.4.12.tar.xz deleted file mode 100644 index 781dea0..0000000 --- a/iptables-1.4.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9a98a026e2f9d6795fcb209e61b938adecac05d002dd094b3ed7bf930a2047d -size 411544 diff --git a/iptables.changes b/iptables.changes index efbe8b8..4ee6d73 100644 --- a/iptables.changes +++ b/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 diff --git a/iptables.spec b/iptables.spec index b8632c4..d6e24ca 100644 --- a/iptables.spec +++ b/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 diff --git a/proc-header.diff b/proc-header.diff deleted file mode 100644 index 9d9dbea..0000000 --- a/proc-header.diff +++ /dev/null @@ -1,30 +0,0 @@ -parent 67156c0b9a3d35f5e7836e5683d8ca0b46ac36ca (v1.4.11.1-34-g67156c0) -commit 41a9b481693b4c43c16d0588cc558dd455168af0 -Author: Jan Engelhardt -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 ---- - 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 /* for PROC_SUPER_MAGIC */ - #elif defined(HAVE_LINUX_PROC_FS_H) - # include /* Linux 2.4 */ -+#else -+# define PROC_SUPER_MAGIC 0x9fa0 - #endif - - #include --- -# Created with git-export-patch From ce44d171b1b8dac5f37f7f80846b0f3d6b1d46769300ddd30c4da538aa82de16 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 2 Sep 2011 10:34:59 +0000 Subject: [PATCH 11/12] Separate package for libxtables7 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=31 --- iptables.changes | 2 ++ iptables.spec | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/iptables.changes b/iptables.changes index 4ee6d73..63f4515 100644 --- a/iptables.changes +++ b/iptables.changes @@ -4,6 +4,8 @@ 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 +- Put libxtables into its own subpackage so that one does not need + a lockstep update of iproute2 on a new iptables package ------------------------------------------------------------------- Sat Aug 13 01:39:38 CEST 2011 - draht@suse.de diff --git a/iptables.spec b/iptables.spec index d6e24ca..e8b8075 100644 --- a/iptables.spec +++ b/iptables.spec @@ -23,6 +23,7 @@ License: GPLv2+ Group: Productivity/Networking/Security Version: 1.4.12.1 Release: 1 +%define xt_sover 7 Summary: IP Packet Filter Administration #DL-URL: ftp://ftp.netfilter.org/pub/iptables/ @@ -59,6 +60,14 @@ These libraries are needed to compile - additional third-party extensions - programs using libipq +%package -n libxtables%xt_sover +Summary: Library for functions shared between iptables +Group: System/Libraries + +%description -n libxtables%xt_sover +This package contains shared functions exposed for integration with +iproute2's m_xt. + %prep %if 0%{?__xz:1} %setup -q @@ -93,6 +102,10 @@ find "%buildroot" -iname "*.la" -delete %postun -p /sbin/ldconfig +%post -n libxtables%xt_sover -p /sbin/ldconfig + +%postun -n libxtables%xt_sover -p /sbin/ldconfig + %files %defattr(-,root,root) %doc COPYING INCOMPATIBILITIES @@ -104,7 +117,7 @@ find "%buildroot" -iname "*.la" -delete %_sbindir/xtables* %_sbindir/nfnl_osf %_libdir/xtables -%_libdir/*.so.* +%_libdir/libip*.so.* %_datadir/xtables %files devel @@ -114,4 +127,8 @@ find "%buildroot" -iname "*.la" -delete %_libdir/*.so %_libdir/pkgconfig/*.pc +%files -n libxtables%xt_sover +%defattr(-,root,root) +%_libdir/libxtables.so.* + %changelog From da7ecfa1cd06da60d58737da3d113de8494d3c69aaec76976b1bf2d8c6f3879c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 2 Sep 2011 10:39:35 +0000 Subject: [PATCH 12/12] Remove redundant fields OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=32 --- iptables.changes | 2 ++ iptables.spec | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iptables.changes b/iptables.changes index 63f4515..16b7e85 100644 --- a/iptables.changes +++ b/iptables.changes @@ -6,6 +6,8 @@ Thu Sep 1 17:09:05 UTC 2011 - jengelh@medozas.de - restore --includedir= in spec file - Put libxtables into its own subpackage so that one does not need a lockstep update of iproute2 on a new iptables package +- Remove redundant fields (Autoreqprov defaults to on, License is + inherited from main package) ------------------------------------------------------------------- Sat Aug 13 01:39:38 CEST 2011 - draht@suse.de diff --git a/iptables.spec b/iptables.spec index e8b8075..49f9bff 100644 --- a/iptables.spec +++ b/iptables.spec @@ -49,11 +49,10 @@ packet filter rules in the Linux kernel. This version requires kernel 2.4.0 or newer. %package devel -License: GPLv2+ Summary: Libraries, Headers and Development Man Pages for iptables Group: Development/Libraries/C and C++ -AutoReqProv: on -Requires: %name = %version +Requires: %name = %version-%release +Requires: libxtables%xt_sover = %version-%release %description devel These libraries are needed to compile