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

Conflicts:
	community/darkhttpd/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpicview/PKGBUILD
	community/iftop/PKGBUILD
	community/lazarus/PKGBUILD
	community/netsurf/PKGBUILD
	community/polkit-gnome/PKGBUILD
	community/texvc/PKGBUILD
	community/unbound/PKGBUILD
	community/xfmedia/PKGBUILD
	core/glibc/PKGBUILD
	extra/arora/PKGBUILD
	extra/cairo/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/libmng/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/sqlite/PKGBUILD
	libre/midori-libre/PKGBUILD
	~fauno/distccd-zeroconf/PKGBUILD
	~fauno/kyotocabinet/PKGBUILD
	~fauno/kyototycoon/PKGBUILD

7 files changed, 54 insertions, 20 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 5c6e0be11..5825ee0eb 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $
+# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=bash
 _basever=4.2
 _patchlevel=045 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=4
+pkgrel=5
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,7 +21,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
         dot.bash_profile
         dot.bash_logout
         system.bashrc
-        system.bash_logout)
+        system.bash_logout
+        bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
 if [ $_patchlevel -gt 000 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
@@ -33,8 +34,10 @@ prepare() {
 
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+    patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
   done
+  
+  patch -p1 -i $srcdir/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
 }
 
 build() {
@@ -81,6 +84,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '42f4400ed2314bd7519c020d0187edc5'
          '3546099a1b2f667adc9794f52e78e35b'
          '472f536d7c9e8250dc4568ec4cfaf294'
+         '9e55d01f2d9dda4a0c96031b25d19f45'
          '1100bc1dda2cdc06ac44d7e5d17864a3'
          'SKIP'
          '30e7948079921d3261efcc6a40722135'
diff --git a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
new file mode 100644
index 000000000..c621f0af8
--- /dev/null
+++ b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
@@ -0,0 +1,12 @@
+diff -Naur bash-4.2-orig/general.c bash-4.2/general.c
+--- bash-4.2-orig/general.c	2010-12-13 06:06:27.000000000 +1000
++++ bash-4.2/general.c	2013-08-25 21:52:36.681484302 +1000
+@@ -766,7 +766,7 @@
+   *nbeg++ = '.';
+ 
+   nlen = nend - ntail;
+-  memcpy (nbeg, ntail, nlen);
++  memmove (nbeg, ntail, nlen);
+   nbeg[nlen] = '\0';
+ 
+   return name;
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7ccb55440..d3664345e 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193120 2013-08-16 21:44:47Z allan $
+# $Id: PKGBUILD 193742 2013-08-30 03:37:09Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
@@ -77,7 +77,9 @@ build() {
       --enable-obsolete-rpc \
       --enable-kernel=2.6.32 \
       --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization 
+      --enable-stackguard-randomization \
+      --enable-lock-elision \
+      --enable-multi-arch
 
   # build libraries with hardening disabled
   echo "build-programs=no" >> configparms
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index a0ab19609..52a9ac4b3 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 185682 2013-05-17 08:28:58Z tpowa $
+# $Id: PKGBUILD 193702 2013-08-28 15:19:04Z andyrtr $
 # Maintainer: 
 
+### rebuild on every ghostscript update -  FS#36562 ###
+
 pkgname=groff
 pkgver=1.22.2
-pkgrel=3
+pkgrel=5
 pkgdesc="GNU troff text-formatting system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/groff/groff.html"
diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD
index d69a06aff..f5649a84d 100644
--- a/core/reiserfsprogs/PKGBUILD
+++ b/core/reiserfsprogs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189852 2013-07-09 13:39:02Z tpowa $
+# $Id: PKGBUILD 193785 2013-08-31 10:51:10Z tpowa $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=reiserfsprogs
-pkgver=3.6.23
+pkgver=3.6.24
 pkgrel=1
 pkgdesc="Reiserfs utilities"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,6 +12,7 @@ license=('GPL')
 groups=('base')
 depends=('util-linux')
 source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('66787380fb418ff7d88a23e47cda7af6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,4 +29,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('e7224bbda4d366ba9b11cdf98616c8f6')
diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD
index 2eed8c3ff..e37b8c843 100644
--- a/core/rpcbind/PKGBUILD
+++ b/core/rpcbind/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 186778 2013-05-31 07:19:10Z tpowa $
+# $Id: PKGBUILD 193786 2013-08-31 10:51:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=rpcbind
-pkgver=0.2.0
-pkgrel=12
+pkgver=0.2.1
+pkgrel=2
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64 'mips64el')
 depends=('bash' 'glibc' 'libtirpc')
 url="http://rpcbind.sourceforge.net"
 license=('custom')
 replaces=('portmap')
-source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.1.tar.bz2
         rpcbind-sunrpc.patch
         rpcbind.service)
-md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
+install=rpcbind.install
+md5sums=('0a5f9c2142af814c55d957aaab3bcc68'
          'c02ac36a98baac70b8a26190524b7b73'
-         'a7b23a32be2eb52d7dec52da36d4eba1')
-
+         'a7b23a32be2eb52d7dec52da36d4eba1'
+)
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   # patch for iana services file
@@ -25,7 +26,7 @@ prepare() {
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run
+  ./configure --prefix=/usr --with-rpcuser=rpc --enable-warmstarts --with-statedir=/run
   make
 }
 
diff --git a/core/rpcbind/rpcbind.install b/core/rpcbind/rpcbind.install
new file mode 100644
index 000000000..3b5b7dc7f
--- /dev/null
+++ b/core/rpcbind/rpcbind.install
@@ -0,0 +1,13 @@
+post_install() {
+	getent group rpc &>/dev/null || groupadd -r -g 32 rpc >/dev/null
+	getent passwd rpc &>/dev/null || useradd -r -u 32 -g rpc -d /dev/null -s /bin/false -c "Rpcbind Daemon" rpc >/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+post_remove() {
+	getent passwd rpc &>/dev/null && userdel rpc >/dev/null
+	getent group rpc &>/dev/null && groupdel rpc >/dev/null
+	return 0
+}