diff --git a/network/iptables/iptables-1.3.8-make-devel.patch b/network/iptables/iptables-1.3.8-make-devel.patch.disabled similarity index 78% rename from network/iptables/iptables-1.3.8-make-devel.patch rename to network/iptables/iptables-1.3.8-make-devel.patch.disabled index 3e11b9509..3cbbadd22 100644 --- a/network/iptables/iptables-1.3.8-make-devel.patch +++ b/network/iptables/iptables-1.3.8-make-devel.patch.disabled @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../iptables/iptables-1.3.8-make-devel.patch +# Filename: package/.../iptables/iptables-1.3.8-make-devel.patch.disabled # Copyright (C) 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. @@ -69,25 +69,3 @@ index d9d9182..4a1fb4f 100644 -- 1.5.3.5 -From 87d1693db3f848bcead8f19caf474d5585987d64 Mon Sep 17 00:00:00 2001 -From: Christian Wiese -Date: Wed, 16 Jan 2008 20:05:13 +0200 -Subject: [PATCH] Changed libiptc Makefile to install libiptc.a - - -diff --git a/libiptc/Makefile b/libiptc/Makefile -index 180de13..01cc1fd 100644 ---- a/libiptc/Makefile -+++ b/libiptc/Makefile -@@ -3,7 +3,7 @@ - EXTRAS+=libiptc/libiptc.a - - # libiptc is not a public interface and therefore not installed --# DEVEL_LIBS+=libiptc/libiptc.a -+DEVEL_LIBS+=libiptc/libiptc.a - - ifndef TOPLEVEL_INCLUDED - local: --- -1.5.3.5 - diff --git a/network/iptables/iptables.conf b/network/iptables/iptables.conf index e396a7117..5134d5999 100644 --- a/network/iptables/iptables.conf +++ b/network/iptables/iptables.conf @@ -14,30 +14,7 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -for x in $( match_source_file -p patch ); do - var_append patchfiles ' ' "$x" -done - -# never ever use the kernel source - always use the installed headers -var_append makeopt ' ' "PREFIX=$root/$prefix" -var_append makeopt ' ' "BINDIR=$root/sbin" -var_append makeopt ' ' "KERNEL_DIR=$root/usr" - -if [ "$SDECFG_STATIC" == 1 ] ; then - var_append makeopt ' ' "DO_MULTI=1 NO_SHARED_LIBS=1" -fi - -makeinstopt="PREFIX=$root/$prefix install" - -iptables_install_devel() { - # libiptc headers are expected to be installed in /usr/include/libiptc - mkdir -vp "$root$includedir/libiptc" - cp -vf include/libiptc/{libiptc,ipt_kernel_headers}.h "$root$includedir/libiptc/" -} - if [ "$SDECFG_PKG_IPTABLES_DEVEL" != 0 ] ; then var_append confopt ' ' "--enable-devel" - hook_add postmake 5 'iptables_install_devel' + var_append confopt ' ' "--enable-libipq" fi - -runconf=0 diff --git a/network/iptables/iptables.desc b/network/iptables/iptables.desc index 532dc5064..a45a93861 100644 --- a/network/iptables/iptables.desc +++ b/network/iptables/iptables.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 1.4.0 +[V] 1.4.2 [P] X -?---5---9 189.900 -[D] 153153588 iptables-1.4.0.tar.bz2 http://www.iptables.org/projects/iptables/files/ +[D] 2227860829 iptables-1.4.2.tar.bz2 http://www.iptables.org/projects/iptables/files/