- new version 1.4.2

- removed TOS value mask patch (upstream)
- more review fixes (rhbz#225906)
- install all header files (rhbz#462207)
- dropped nf_ext_init (rhbz#472548)

.cvsignore

@@ -2,3 +2,4 @@ iptables-1.3.8.tar.bz2
 iptables-1.4.0.tar.bz2
 iptables-1.4.1.tar.bz2
 iptables-1.4.1.1.tar.bz2
+iptables-1.4.2.tar.bz2

iptables-1.4.1-nf_ext_init.patch

@@ -1,32 +0,0 @@
-diff -up iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init iptables-1.4.1-rc2/include/xtables.h.in
---- iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init	2008-06-05 14:13:49.000000000 +0200
-+++ iptables-1.4.1-rc2/include/xtables.h.in	2008-06-05 14:14:03.000000000 +0200
-@@ -199,13 +199,13 @@ extern void ip6parse_hostnetworkmask(con
- extern void save_string(const char *value);
- 
- #ifdef NO_SHARED_LIBS
--#	ifdef _INIT
--#		undef _init
--#		define _init _INIT
-+#	ifdef NF_EXT_INIT
-+#		undef nf_ext_init
-+#		define nf_ext_init NF_EXT_INIT
- #	endif
- 	extern void init_extensions(void);
- #else
--#	define _init __attribute__((constructor)) _INIT
-+#	define nf_ext_init __attribute__((constructor)) NF_EXT_INIT
- #endif
- 
- /* Present in both iptables.c and ip6tables.c */
-diff -up iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init iptables-1.4.1-rc2/include/xtables/internal.h
---- iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init	2008-06-05 14:13:24.000000000 +0200
-+++ iptables-1.4.1-rc2/include/xtables/internal.h	2008-06-05 14:13:26.000000000 +0200
-@@ -61,6 +61,6 @@ extern struct xtables_match *find_match(
- 					struct xtables_rule_match **match);
- extern struct xtables_target *find_target(const char *name, enum xt_tryload);
- 
--extern void _init(void);
-+extern void nf_ext_init(void);
- 
- #endif /* _XTABLES_INTERNAL_H */

iptables-1.4.1.1-tos_value_mask.patch

@@ -1,14 +0,0 @@
-diff -up iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask iptables-1.4.1.1/extensions/tos_values.c
---- iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask	2008-07-22 16:48:36.000000000 +0200
-+++ iptables-1.4.1.1/extensions/tos_values.c	2008-07-22 17:23:46.000000000 +0200
-@@ -56,8 +56,9 @@ static bool tos_parse_symbolic(const cha
- {
- 	const unsigned int max = 255;
- 	const struct tos_symbol_info *symbol;
-+	char *tmp;
- 
--	if (strtonum(str, NULL, NULL, 0, max))
-+	if (strtonum(str, &tmp, NULL, 0, max))
- 		return tos_parse_numeric(str, tvm, max);
- 
- 	/* Do not consider ECN bits */

iptables.spec

@@ -1,18 +1,16 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.1.1
+Version: 1.4.2
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Patch4: iptables-1.3.8-typo_latter.patch
 Patch5: iptables-1.4.1.1-cloexec.patch
-Patch8: iptables-1.4.1-nf_ext_init.patch
-Patch9: iptables-1.4.1.1-tos_value_mask.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: GPLv2
+License: GPL+
 BuildRequires: libselinux-devel
 BuildRequires: kernel-headers
 Conflicts: kernel < 2.4.20
@@ -44,6 +42,7 @@ network and you are using ipv6.
 Summary: Development package for iptables
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 iptables development headers and libraries.
@@ -55,25 +54,35 @@ stable and may change with every new version. It is therefore unsupported.
 %setup -q
 %patch4 -p1 -b .typo_latter
 %patch5 -p1 -b .cloexec
-%patch8 -p1 -b .nf_ext_init
-%patch9 -p1 -b .tos_value_mask
-
-# fix constructor names, see also nf_ext_init patch
-perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
-perl -pi -e "s/^_init\(/__attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
 
 %build
 ./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
+
+# do not use rpath
+perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$li
+bdir\"|g;' libtool
+
 make
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} 
+# remove la file(s)
+rm -f %{buildroot}/%{_libdir}/*.la
 
-# install iptc devel library
+# install iptc header files
+install -d -m 755 %{buildroot}%{_includedir}/libiptc/
+install -m 644 include/libiptc/*.h %{buildroot}%{_includedir}/libiptc/
 install -m 644 libiptc/libiptc.a %{buildroot}/%{_libdir}
 
+# install ip*tables.h header files
+install -m 644 include/ip*tables.h %{buildroot}%{_includedir}/
+
+# install ipulog header file
+install -d -m 755 %{buildroot}%{_includedir}/libipulog/
+install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/
+
 # install init scripts and configuration files
 install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables
@@ -88,8 +97,11 @@ install -c -m 755 ip6tables-config $RPM_BUILD_ROOT/etc/sysconfig/ip6tables-confi
 rm -rf $RPM_BUILD_ROOT 
 
 %post
+/sbin/ldconfig
 /sbin/chkconfig --add iptables
 
+%postun -p /sbin/ldconfig
+
 %preun
 if [ "$1" = 0 ]; then
 	/sbin/chkconfig --del iptables
@@ -113,6 +125,7 @@ fi
 %dir /%{_lib}/xtables
 /%{_lib}/xtables/libipt*
 /%{_lib}/xtables/libxt*
+%{_libdir}/libxtables.so.*
 
 %files ipv6
 %defattr(-,root,root)
@@ -128,11 +141,22 @@ fi
 %{_includedir}/*.h
 %dir %{_includedir}/libiptc
 %{_includedir}/libiptc/*.h
+%dir %{_includedir}/libipulog
+%{_includedir}/libipulog/*.h
 %{_libdir}/libipq.a
 %{_libdir}/libiptc.a
 %{_mandir}/man3/*
+%{_libdir}/libxtables.so
+%{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Fri Feb 20 2009 Thomas Woerner <twoerner@redhat.com> 1.4.2-1
+- new version 1.4.2
+- removed TOS value mask patch (upstream)
+- more review fixes (rhbz#225906)
+- install all header files (rhbz#462207)
+- dropped nf_ext_init (rhbz#472548)
+
 * Tue Jul 22 2008 Thomas Woerner <twoerner@redhat.com> 1.4.1.1-2
 - fixed TOS value mask problem (rhbz#456244) (upstream patch)
 - two more cloexec fixes

sources

@@ -1 +1 @@
-723fa88d8a0915e184f99e03e9bf06cb  iptables-1.4.1.1.tar.bz2
+a138d1c2e74321e0e4e228a9fb301c9a  iptables-1.4.2.tar.bz2