diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
commit | 251b132bc8d5157b996afff54617d2483637aa4b (patch) | |
tree | 7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /core/iptables/PKGBUILD | |
parent | 3ed19e74567434fe0bc82d835513b5b62f151838 (diff) | |
parent | 07455ea1de16867b168628e8a9f7f5bffc169a5f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/r8168-lts/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/r8168-lts/PKGBUILD
community-testing/sage-mathematics/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/dhcpcd/PKGBUILD
core/glibc/PKGBUILD
core/net-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/cups/PKGBUILD
extra/maxima/PKGBUILD
extra/scim-hangul/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/subversion/PKGBUILD
extra/telepathy-idle/PKGBUILD
extra/x11vnc/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libxml2/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
testing/binutils/PKGBUILD
testing/calligra/PKGBUILD
testing/dhcp/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/inkscape/PKGBUILD
testing/iproute2/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.36
testing/poppler/PKGBUILD
Diffstat (limited to 'core/iptables/PKGBUILD')
-rw-r--r-- | core/iptables/PKGBUILD | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 490886f6e..6b77e6817 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ +# $Id: PKGBUILD 165282 2012-08-14 20:43:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@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' 'mips64el') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta 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 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { 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 \ |