From c2a236f82497d0e3509bb0800abebe638baec8bd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Dec 2014 21:36:29 +0000
Subject: iptables: update to 1.4.21

---
 abs/core/iptables/0503-extension_cppflags.patch | 13 -------------
 abs/core/iptables/PKGBUILD                      | 14 +++++++-------
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 abs/core/iptables/0503-extension_cppflags.patch

diff --git a/abs/core/iptables/0503-extension_cppflags.patch b/abs/core/iptables/0503-extension_cppflags.patch
deleted file mode 100644
index 0eb6457..0000000
--- a/abs/core/iptables/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/extensions/GNUmakefile.in
-===================================================================
---- a/extensions/GNUmakefile.in	2012-03-27 12:14:05.000000000 -0400
-+++ b/extensions/GNUmakefile.in	2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
diff --git a/abs/core/iptables/PKGBUILD b/abs/core/iptables/PKGBUILD
index 0c65bd1..65fd20e 100644
--- a/abs/core/iptables/PKGBUILD
+++ b/abs/core/iptables/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $
+# $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.20
+pkgver=1.4.21
 pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
@@ -20,11 +20,10 @@ source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         empty-nat.rules
         empty-raw.rules
         empty-security.rules
-        0503-extension_cppflags.patch
         iptables.service
         ip6tables.service
         iptables-flush)
-sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
+sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
           'SKIP'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
@@ -33,18 +32,19 @@ sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
           '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
-          '44626980a52e49f345a0b1e1ca03060f3a35763c'
           '9306cba67dbeaa004af084a816f66920a6a10faf'
           '38fa2ffe7965e63b494d333f69193029c1258c28'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # use system one
   rm include/linux/types.h
+}
 
-  patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
-- 
cgit v0.12