From c2d1357248bfea67ced38063ea92e938249370b5 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Wed, 24 Nov 2010 02:51:09 +0000
Subject: iptables: upgrade

---
 abs/core/iptables/PKGBUILD        | 59 ++++++++++++++++++++++++++-------------
 abs/core/iptables/iptables.conf.d |  2 +-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/abs/core/iptables/PKGBUILD b/abs/core/iptables/PKGBUILD
index c796285..107e033 100644
--- a/abs/core/iptables/PKGBUILD
+++ b/abs/core/iptables/PKGBUILD
@@ -1,30 +1,49 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# $Id: PKGBUILD 86873 2010-08-06 09:59:22Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas Baechler <thomas@archlinux.org>
+
 pkgname=iptables
-pkgver=1.4.1
+pkgver=1.4.9
 pkgrel=1
 pkgdesc="A Linux kernel packet control tool"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2')
 url="http://www.netfilter.org/"
-depends=('glibc')
-source=(http://www.iptables.org/projects/iptables/files/iptables-$pkgver.tar.bz2 \
+depends=('glibc' 'bash')
+options=('!libtool')
+source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2 \
         iptables ip6tables empty.rules simple_firewall.rules iptables.conf.d)
-md5sums=('e628f033b95741266a315d54fe73db9c'
-         '89401d6f0cf1de46a455b7be6720a58b'
-         '6e0e88c2ed0c3715d1409ee3258a0046'
-         '14186bbafe21bb0638c0cb8e0903c829'
-         'e53a83bb4d8ac8b7eadd7bd58294751d'
-         'c7cf6e4455c228e50d20ce3edd75ee59')
+backup=(etc/conf.d/iptables)
+sha1sums=('c961b58c57cb99b10f5bb753bf3b436c0df05c7c'
+          'd7540316581bb66c5594885882a14ba394e95098'
+          '70d70113e3a23f0fe99404c5536507a887a4ca5c'
+          '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
+          '9907f9e815592837abc7fa3264a401567b7606ab'
+          '1c52444ffbecc09f56bb325db49e924dd32f9213')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # http://bugs.archlinux.org/task/17046
+  sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
+  sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
+
+ ./configure --prefix=/usr --with-kernel=usr/src/linux-$(uname -r) \
+	--libexecdir=/usr/lib/iptables --sysconfdir=/etc \
+	--with-xtlibdir=/usr/lib/iptables \
+	--enable-devel --enable-libipq
+
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D -m755 ../iptables $startdir/pkg/etc/rc.d/iptables
-  install -D -m755 ../ip6tables $startdir/pkg/etc/rc.d/ip6tables
-  install -D -m644 ../empty.rules $startdir/pkg/etc/iptables/empty.rules
-  install -D -m644 ../simple_firewall.rules $startdir/pkg/etc/iptables/simple_firewall.rules
-  install -D -m644 ../iptables.conf.d $startdir/pkg/etc/conf.d/iptables
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install || return 1
+
+  install -D -m755 ../iptables ${pkgdir}/etc/rc.d/iptables
+  install -D -m755 ../ip6tables ${pkgdir}/etc/rc.d/ip6tables
+  install -D -m644 ../empty.rules ${pkgdir}/etc/iptables/empty.rules
+  install -D -m644 ../simple_firewall.rules ${pkgdir}/etc/iptables/simple_firewall.rules
+  install -D -m644 ../iptables.conf.d ${pkgdir}/etc/conf.d/iptables
 }
diff --git a/abs/core/iptables/iptables.conf.d b/abs/core/iptables/iptables.conf.d
index e9afea2..07bc11a 100644
--- a/abs/core/iptables/iptables.conf.d
+++ b/abs/core/iptables/iptables.conf.d
@@ -5,4 +5,4 @@ IP6TABLES=/usr/sbin/ip6tables
 
 IPTABLES_CONF=/etc/iptables/iptables.rules
 IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-IPTABLES_FORWARD=1  # enable IP forwarding?
+IPTABLES_FORWARD=0  # enable IP forwarding?
-- 
cgit v0.12