iptables: Remove package

This is replaced by nftables.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index f11c7a8d70916711b2d852bc108770628e45cec2..27d8dea926389e9f2be420250da3ab31f183c4ef 100644 (file)
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -5,7 +5,7 @@
 
 name       = iproute2
 version    = 3.14.0
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://www.linuxfoundation.org/en/Net:Iproute2
@@ -28,7 +28,6 @@ build
                libdb-devel
                libnl-devel
                linux-atm-devel >= 2.5.1
-               iptables-devel >= 1.4.19
        end
 
        prepare_cmds
@@ -60,10 +59,7 @@ build
                ln -svf lnstat %{BUILDROOT}%{sbindir}/rtstat
 
                # Install libs.
-               for lib in tc/q_atm.so tc/m_xt.so; do
-                       install -v -m 755 ${lib} %{BUILDROOT}%{libdir}/tc
-               done
-               ln -svf m_xt.so %{BUILDROOT}%{libdir}/tc/m_ipt.so
+               install -v -m 755 tc/q_atm.so %{BUILDROOT}%{libdir}/tc
 
                # libnetlink
                install -v -m 644 include/libnetlink.h %{BUILDROOT}%{includedir}

diff --git a/iptables/iptables.nm b/iptables/iptables.nm
deleted file mode 100644 (file)
index 0350b17..0000000
--- a/iptables/iptables.nm
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = iptables
-version    = 1.4.19.1
-release    = 1
-
-groups     = Networking/Tools
-url        = http://www.netfilter.org/
-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,
-       you should install this package.
-end
-
-source_dl  = http://ftp.netfilter.org/pub/iptables/
-sources    = %{thisapp}.tar.bz2
-
-build
-       requires
-               libnfnetlink-devel
-               libselinux-devel
-       end
-
-       CFLAGS += -fno-strict-aliasing
-
-       configure_options += \
-               --libexecdir=/%{lib} \
-               --sysconfdir=/etc \
-               --with-pkgconfigdir=%{libdir}/pkgconfig \
-               --mandir=/usr/share/man \
-               --with-kernel=/usr \
-               --with-kbuild=/usr \
-               --with-ksource=/usr \
-               --enable-devel \
-               --enable-libipq
-
-       prepare_cmds
-               # Make more space for target name on output.
-               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
-               # install ip*tables.h header files
-               mkdir -pv %{BUILDROOT}/usr/include/{iptables,libiptc}
-               install -v -m 644 include/ip{,6}tables.h \
-                       %{BUILDROOT}/usr/include
-               install -v -m 644 include/iptables/internal.h \
-                       %{BUILDROOT}/usr/include/iptables/
-               install -v -m 644 include/libiptc/*.h \
-                       %{BUILDROOT}/usr/include/libiptc
-
-               # Remove relative symlinks.
-               ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml
-       end
-end
-
-packages
-       package %{name}
-               groups += Base
-       end
-
-       package %{name}-devel
-               template DEVEL
-       end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
-end

diff --git a/squid/squid.nm b/squid/squid.nm
index 7a8fa129aaaf819eb82158dbb2816ee3239ceb77..52821cf8ade48749b804f73cae241fe123d8ea02 100644 (file)
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -6,7 +6,7 @@
 name       = squid
 major_ver  = 3.1
 version    = %{major_ver}.19
-release    = 1
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -32,7 +32,6 @@ build
                openssl-devel
                openldap-devel
                samba-devel
-               iptables-devel
                pam-devel
                libcap-devel
                /usr/bin/smbclient