[arch-commits] Commit in iptables/trunk (PKGBUILD)

[Ronald van Haren]

    Date: Tuesday, July 31, 2012 @ 16:15:24
  Author: ronald
Revision: 164377

upgpkg: iptables 1.4.15-1

update to 1.4.15; remove patch that is now upstream

Modified:
  iptables/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-31 20:07:54 UTC (rev 164376)
+++ PKGBUILD	2012-07-31 20:15:24 UTC (rev 164377)
@@ -3,8 +3,8 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.14
-pkgrel=3
+pkgver=1.4.15
+pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,12 +24,11 @@
         empty-raw.rules
         empty-security.rules
         0503-extension_cppflags.patch
-        iptables-1.4.12-fixresore.patch
         iptables.service
         ip6tables.service
         iptables-flush)
 backup=(etc/conf.d/iptables)
-sha1sums=('daf2972b81e52f562a644798013e946c88319ea3'
+sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
           '2db68906b603e5268736f48c8e251f3a49da1d75'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -41,7 +40,6 @@
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
           '44626980a52e49f345a0b1e1ca03060f3a35763c'
-          '7c018d48445ae41c0b9f345747e54b94cb0997b3'
           '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
           'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
@@ -54,11 +52,6 @@
 
   patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
 
-  # Fix scope issue exposed by gcc 4.7 (patch by fryasu)
-  # http://bugzilla.netfilter.org/show_bug.cgi?id=774
-  # (This will most likely be fixed in iptables 1.4.15)
-  patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch
-
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \