diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
| commit | 8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (patch) | |
| tree | 0b9c9ccac567cbaf87b22dcd32f10ceed2db065c /core/iptables | |
| parent | 0d18015803bebeb58911bf791653597291056095 (diff) | |
| parent | 43983783a3e8bf61896eb93a2858a14bbaf3a53b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/emerald/PKGBUILD
community/gmic/PKGBUILD
community/libcompizconfig/PKGBUILD
core/xinetd/PKGBUILD
extra/archboot/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/live-media/PKGBUILD
extra/mysql/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/r/PKGBUILD
extra/telepathy-mission-control/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libldap/ntlm.patch
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/iptables')
| -rw-r--r-- | core/iptables/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 314b55af3..57f866273 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102057 2010-12-04 09:52:03Z allan $ +# $Id: PKGBUILD 131995 2011-07-18 20:27:00Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.10 +pkgver=1.4.11.1 pkgrel=1 pkgdesc="A Linux kernel packet control tool" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar simple_firewall.rules iptables.conf.d) backup=(etc/conf.d/iptables) -sha1sums=('8190b8c9714a3eec825317e8ac1deeb3d11c6d29' +sha1sums=('2aa0d215485133f2817973b0914a132f628d9f3a' 'd7540316581bb66c5594885882a14ba394e95098' '70d70113e3a23f0fe99404c5536507a887a4ca5c' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' |