Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/audex/PKGBUILD
	community/gimp-ufraw/PKGBUILD
	community/ogmrip/PKGBUILD
	community/oss/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/soundkonverter/PKGBUILD
	core/iptables/PKGBUILD
	core/libffi/PKGBUILD
	extra/clamav/PKGBUILD
	extra/ecasound/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD

3 files changed, 22 insertions, 21 deletions

diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index f2bbab89d..26f4be43c 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178093 2013-02-16 07:50:45Z ronald $
+# $Id: PKGBUILD 180027 2013-03-14 20:45:46Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.7.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
          iproute2-fhs.patch)
-sha1sums=('9b45ede534fd49d2ec5a7fe0f69e1926ef767a76'
+sha1sums=('6d40dd2b91aad9ae084c99973dcdfdbf6fb353fc'
           '35b8cf2dc94b73eccad427235c07596146cd6f6c')
 
 build() {
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index f3345c08e..e852b87fa 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 174851 2013-01-07 21:57:24Z ronald $
+# $Id: PKGBUILD 180028 2013-03-14 20:45:48Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.16.3
+pkgver=1.4.18
 pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://www.netfilter.org/projects/iptables/index.html'
 depends=('glibc' 'bash')
-makedepends=('linux-api-headers')
+makedepends=('linux-api-headers' 'chrpath')
 options=('!libtool')
-source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
         iptables
         ip6tables
         empty.rules
@@ -28,7 +28,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         ip6tables.service
         iptables-flush)
 backup=(etc/conf.d/iptables)
-sha1sums=('819949fdf4276a04c5061b82898b515f139b0117'
+sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
           '2db68906b603e5268736f48c8e251f3a49da1d75'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -52,14 +52,10 @@ build() {
 
   patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
 
-  [ "$CARCH" = "mips64el" ] || extra="--enable-libipq"
-
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel $extra \
-     --enable-shared 
-
+     --enable-devel --enable-shared
   make
 }
 
@@ -68,6 +64,10 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
+  # Remove RPATH from iptables libraries
+  # http://www.spinics.net/lists/netfilter-devel/msg24969.html
+  chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so
+
   cd "${srcdir}"
   install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
   install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index 5e0b4b4d1..50059763b 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 180006 2013-03-14 11:52:23Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libffi
-pkgver=3.0.11
-pkgrel=1.1
+pkgver=3.0.12
+pkgrel=1
 pkgdesc="A portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceware.org/libffi"
+url="http://sourceware.org/libffi/"
 license=('MIT')
 depends=('glibc')
 checkdepends=('dejagnu')
 options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('f69b9693227d976835b4857b1ba7d0e3')
+sha1sums=('463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
@@ -29,5 +30,5 @@ check() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }