rpms/iptables/devel .cvsignore, 1.23, 1.24 iptables.spec, 1.72, 1.73 sources, 1.23, 1.24 iptables-1.4.1-nf_ext_init.patch, 1.1, NONE iptables-1.4.1.1-tos_value_mask.patch, 1.1, NONE

[Thomas Woerner]

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29115

Modified Files:
	.cvsignore iptables.spec sources 
Removed Files:
	iptables-1.4.1-nf_ext_init.patch 
	iptables-1.4.1.1-tos_value_mask.patch 
Log Message:
- 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)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	1 Jul 2008 09:57:56 -0000	1.23
+++ .cvsignore	20 Feb 2009 13:44:58 -0000	1.24
@@ -2,3 +2,4 @@
 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


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- iptables.spec	22 Jul 2008 15:37:03 -0000	1.72
+++ iptables.spec	20 Feb 2009 13:44:58 -0000	1.73
@@ -1,18 +1,16 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.1.1
-Release: 2%{?dist}
+Version: 1.4.2
+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 @@
 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 @@
 %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 @@
 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 @@
 %dir /%{_lib}/xtables
 /%{_lib}/xtables/libipt*
 /%{_lib}/xtables/libxt*
+%{_libdir}/libxtables.so.*
 
 %files ipv6
 %defattr(-,root,root)
@@ -128,11 +141,22 @@
 %{_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 at 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 at redhat.com> 1.4.1.1-2
 - fixed TOS value mask problem (rhbz#456244) (upstream patch)
 - two more cloexec fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	1 Jul 2008 09:57:56 -0000	1.23
+++ sources	20 Feb 2009 13:44:58 -0000	1.24
@@ -1 +1 @@
-723fa88d8a0915e184f99e03e9bf06cb  iptables-1.4.1.1.tar.bz2
+a138d1c2e74321e0e4e228a9fb301c9a  iptables-1.4.2.tar.bz2


--- iptables-1.4.1-nf_ext_init.patch DELETED ---


--- iptables-1.4.1.1-tos_value_mask.patch DELETED ---