grep: Update to version 2.18.

[people/ms/ipfire-3.x.git] / iptables / iptables.nm

diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index b7ce6aa3dcade3e1df4d959fffa9f584743d96b2..0350b17ce657b61e3dff4cc143189904db12bc72 100644 (file)
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.12
+version    = 1.4.19.1
 release    = 1
 
 groups     = Networking/Tools
@@ -13,12 +13,12 @@ license    = GPL+
 summary    = Tools for managing Linux kernel packet filtering capabilities.
 
 description
-       The iptables utility controls the network packet filtering code in the \
-       Linux kernel. If you need to set up firewalls and/or IP masquerading, \
+       The iptables utility controls the network packet filtering code in the
+       Linux kernel. If you need to set up firewalls and/or IP masquerading,
        you should install this package.
 end
 
-source_dl  =
+source_dl  = http://ftp.netfilter.org/pub/iptables/
 sources    = %{thisapp}.tar.bz2
 
 build
@@ -30,12 +30,9 @@ build
        CFLAGS += -fno-strict-aliasing
 
        configure_options += \
-               --bindir=/bin \
-               --sbindir=/sbin \
-               --libdir=/lib \
-               --libexecdir=/lib \
+               --libexecdir=/%{lib} \
                --sysconfdir=/etc \
-               --with-pkgconfigdir=/usr/lib/pkgconfig \
+               --with-pkgconfigdir=%{libdir}/pkgconfig \
                --mandir=/usr/share/man \
                --with-kernel=/usr \
                --with-kbuild=/usr \
@@ -45,7 +42,10 @@ build
 
        prepare_cmds
                # Make more space for target name on output.
-               cd iptables && sed -e "s/%-9s/%-18s/g" -i ip{,6}tables.c
+               sed -e "s/%-9s/%-18s/g" -i iptables/ip{,6}tables.c
+
+               sed -i extensions/GNUmakefile* \
+                       -e "s@ip6t_NETMAP_LIBADD.*@& -L../libiptc/.libs@"
        end
 
        install_cmds
@@ -58,20 +58,8 @@ build
                install -v -m 644 include/libiptc/*.h \
                        %{BUILDROOT}/usr/include/libiptc
 
-               mkdir -pv %{BUILDROOT}/usr/lib
-               rm -vf %{BUILDROOT}/lib/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/lib/libxtables.so
-               ln -svf ../../lib/libiptc.so.0 %{BUILDROOT}/usr/lib/libiptc.so
-               ln -svf ../../lib/libip4tc.so.0 %{BUILDROOT}/usr/lib/libip4tc.so
-               ln -svf ../../lib/libip6tc.so.0 %{BUILDROOT}/usr/lib/libip6tc.so
-               ln -svf ../../lib/libipq.so.0 %{BUILDROOT}/usr/lib/libipq.so
-               ln -svf ../../lib/libxtables.so.7 %{BUILDROOT}/usr/lib/libxtables.so
-
-               # Replace absolute symlink
-               ln -svf ../sbin/xtables-multi %{BUILDROOT}/bin/iptables-xml
-
-               # Move binary which links to /usr/lib to /usr.
-               mkdir -pv %{BUILDROOT}/usr/sbin
-               mv -v %{BUILDROOT}/{,usr/}sbin/nfnl_osf
+               # Remove relative symlinks.
+               ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml
        end
 end
 
@@ -79,8 +67,12 @@ packages
        package %{name}
                groups += Base
        end
-       
+
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end