Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/shotwell/PKGBUILD
	community-testing/texmaker/PKGBUILD
	community/i3lock/PKGBUILD
	core/dnsutils/PKGBUILD
	core/expat/PKGBUILD
	core/iptables/PKGBUILD
	extra/ntp/PKGBUILD
	extra/talloc/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/lib32-udev/PKGBUILD

1 files changed, 9 insertions, 8 deletions

diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index d1243e382..3e924c555 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $
+# $Id: PKGBUILD 142199 2011-11-06 05:47:47Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
 pkgver=1.4.12.1
-pkgrel=1
-pkgdesc="A Linux kernel packet control tool"
+pkgrel=2
+pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://www.netfilter.org/projects/iptables/index.html"
+url='http://www.netfilter.org/projects/iptables/index.html'
 depends=('glibc' 'bash')
 makedepends=('linux-api-headers')
 options=('!libtool')
-source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2
+source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
         iptables
         ip6tables
         empty.rules
@@ -35,6 +35,7 @@ sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728'
           '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -43,7 +44,7 @@ build() {
   sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
 
  # FS#25358: libxt_statistic.so undefined symbol: lround 
- export LDFLAGS="-lm"
+ export LDFLAGS='-lm'
 
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
@@ -64,6 +65,6 @@ package() {
   install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
   install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
 
-  mkdir -p "${pkgdir}/var/lib/iptables"
-  install -m644 empty-{filter,mangle,nat,raw,security}.rules ${pkgdir}/var/lib/iptables/
+  mkdir -p "${pkgdir}"/var/lib/iptables
+  install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
 }