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

Conflicts:
	community-testing/electricsheep/PKGBUILD
	community/bitcoin/PKGBUILD
	community/gnash/PKGBUILD
	community/mongodb/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xmoto/PKGBUILD
	core/kbd/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libpst/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/quota-tools/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xf86-video-siliconmotion/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/pacman/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/bash/PKGBUILD
	testing/bison/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus/PKGBUILD
	testing/readline/PKGBUILD
	testing/systemd/PKGBUILD

11 files changed, 180 insertions, 44 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 35bba67a7..567b7c9a9 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163494 2012-07-13 12:31:26Z allan $
+# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
 _basever=4.2
-_patchlevel=036 #prepare for some patches
+_patchlevel=037 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -151,4 +151,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '7cd9bfdf7cbfd45274d07620ee94c8d9'
          'a7d2eace0da5fd236c93dbfd93458838'
          '9c3142956064d175a880bcb186e51ef9'
-         'a1a87649853f20fe99572ddc02b0c67f')
+         'a1a87649853f20fe99572ddc02b0c67f'
+         'c10692f447d4966c879f8fb8d7c8ebc9'
+         '1bf5e34ad46566bc2d0eb7560ff8968e')
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 9db47829e..226bc9cb1 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161346 2012-06-10 05:52:18Z allan $
+# $Id: PKGBUILD 163856 2012-07-21 11:24:29Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=bison
-pkgver=2.5.1
+pkgver=2.6
 pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('012708d801a3c986d8654aa673530b61'
-         '6c7e9276aa8b89879126a611384897a8')
+md5sums=('f96a16e79daaef71c797ed88f52e59d1'
+         'd67a1a075ab0cccfb53ab23692be1a02')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}  
diff --git a/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
new file mode 100644
index 000000000..087b87cdb
--- /dev/null
+++ b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
@@ -0,0 +1,135 @@
+From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Thu, 10 May 2012 19:43:00 +0200
+Subject: [PATCH] ls: color each symlink-to-relative-name in / properly
+
+In order for ls --color to color each symlink, it must form the name
+of each referent and then stat it to see if the link is dangling, to
+a directory, to a file, etc.  When the symlink is to a relative name,
+ls must concatenate the starting directory name and that relative name.
+When, in addition, the starting directory was "/" or "/some-name",
+the result was ill-formed, and the subsequent stat would usually fail,
+making the caller color it as a dangling symlink.
+* src/ls.c (make_link_name): Don't botch the case in which
+dir_name(NAME) == "/" and LINKNAME is relative.
+* tests/ls/root-rel-symlink-color: New file.  Test for the above.
+* tests/Makefile.am (TESTS): Add it.
+* NEWS (Bug fixes): Mention it.
+Reported by Mike Frysinger in http://bugs.gnu.org/11453
+Bug introduced by commit v8.16-23-gbcb9078.
+---
+ NEWS                            |  5 ++++
+ src/ls.c                        |  9 +++++++-
+ tests/Makefile.am               |  1 +
+ tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 65 insertions(+), 1 deletion(-)
+ create mode 100755 tests/ls/root-rel-symlink-color
+
+diff --git a/NEWS b/NEWS
+index 6c620b3..f9e9c70 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,11 @@ GNU coreutils NEWS                                    -*- outline -*-
+ 
+ * Noteworthy changes in release ?.? (????-??-??) [?]
+ 
++** Bug fixes
++
++  ls --color would mis-color relative-named symlinks in /
++  [bug introduced in coreutils-8.17]
++
+ 
+ * Noteworthy changes in release 8.17 (2012-05-10) [stable]
+ 
+diff --git a/src/ls.c b/src/ls.c
+index 397e4ea..9494ae9 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname)
+     return xstrdup (linkname);
+ 
+   char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1);
+-  stpcpy (stpncpy (p, name, prefix_len + 1), linkname);
++
++  /* PREFIX_LEN usually specifies a string not ending in slash.
++     In that case, extend it by one, since the next byte *is* a slash.
++     Otherwise, the prefix is "/", so leave the length unchanged.  */
++  if ( ! ISSLASH (name[prefix_len - 1]))
++    ++prefix_len;
++
++  stpcpy (stpncpy (p, name, prefix_len), linkname);
+   return p;
+ }
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index a4370a6..0bafc5f 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -449,6 +449,7 @@ TESTS =						\
+   ls/proc-selinux-segfault			\
+   ls/readdir-mountpoint-inode			\
+   ls/recursive					\
++  ls/root-rel-symlink-color			\
+   ls/rt-1					\
+   ls/slink-acl					\
+   ls/stat-dtype					\
+diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color
+new file mode 100755
+index 0000000..d795432
+--- /dev/null
++++ b/tests/ls/root-rel-symlink-color
+@@ -0,0 +1,51 @@
++#!/bin/sh
++# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/".
++
++# Copyright (C) 2012 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/init.sh"; path_prepend_ ../src
++print_ver_ ls
++
++symlink_to_rel=
++for i in /*; do
++  # Skip non-symlinks:
++  env test -h "$i" || continue
++
++  # Skip dangling symlinks:
++  env test -e "$i" || continue
++
++  # Skip any symlink-to-absolute-name:
++  case $(readlink "$i") in /*) continue ;; esac
++
++  symlink_to_rel=$i
++  break
++done
++
++test -z "$symlink_to_rel" \
++  && skip_ no relative symlink in /
++
++e='\33'
++color_code='01;36'
++c_pre="$e[0m$e[${color_code}m"
++c_post="$e[0m"
++printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_
++
++env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \
++  ls -d --color=always "$symlink_to_rel" > out || fail=1
++
++compare exp out || fail=1
++
++Exit $fail
+-- 
+1.7.11.2
+
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index cd42a6766..36702c2bc 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158980 2012-05-14 04:41:15Z allan $
+# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
 pkgver=8.17
-pkgrel=1
+pkgrel=3
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -17,10 +17,12 @@ install=${pkgname}.install
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
 	coreutils-pam.patch
+	0001-ls-color-each-symlink-to-relative-name-in-properly.patch
 	su.pam)
 md5sums=('bbda656ce8ca2c6903948f9faa204ba3'
          'ebecd29b095aa21b0b2f833f1ec20d70'
          'aad79a2aa6d566c375d7bdd1b0767278'
+         'd7c691898a695a6284a927e6a9426fe4'
          'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
@@ -29,6 +31,10 @@ build() {
   # added su wheel group pam patch (from fedora git)
   patch -Np1 -i ${srcdir}/coreutils-pam.patch
 
+  # fix coloring for symlinks in /
+  # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7
+  patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
+
   autoreconf -v
   ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
               --enable-install-program=su \
@@ -45,18 +51,15 @@ check() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  
+
   cd ${pkgdir}/usr/bin
   install -dm755 ${pkgdir}/{bin,usr/sbin}
-  
+
   # binaries required by FHS
   _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
         'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync'
         'true' 'uname')
   mv ${_fhs[@]} ${pkgdir}/bin
-  
-  # makepkg uses the full path to this...
-  ln -s /usr/bin/du ${pkgdir}/bin/du
 
   mv chroot ${pkgdir}/usr/sbin
   install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 1e1464ad8..6ba597684 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159164 2012-05-16 20:53:29Z ibiru $
+# $Id: PKGBUILD 163895 2012-07-21 19:19:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.32.3
+pkgver=2.32.4
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta
         glib2.sh
         glib2.csh
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d'
+sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index c2cac3edd..158861cb8 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160239 2012-05-31 14:53:52Z eric $
+# $Id: PKGBUILD 163618 2012-07-17 05:32:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.6
-pkgrel=8
+pkgrel=10
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nico.schottelius.org/software/gpm/"
@@ -18,7 +18,7 @@ sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c'
           '19e1feb1493373512a77801699df012d186336ea'
           '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
           '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '2db35b5f587b8dd21f9943610e7dd70469f888c7')
+          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service
index 3e52af729..59e837d80 100644
--- a/core/gpm/gpm.service
+++ b/core/gpm/gpm.service
@@ -1,6 +1,9 @@
 [Unit]
-Description=GPM daemon
+Description=Virtual console mouse server
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/gpm
+ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 920b2b73c..bc4e35578 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163012 2012-07-05 13:49:01Z allan $
+# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
 pkgver=2.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -31,7 +31,4 @@ check() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  
-  install -dm755 ${pkgdir}/bin
-  ln -s /usr/bin/grep ${pkgdir}/bin/grep
 }
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index 23d04ad5c..7e31b2320 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $
+# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kbd
 pkgver=1.15.3
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
@@ -35,10 +35,4 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-
-  # this is needed because initscripts call /bin/loadkeys
-  # remove this when next versions of kbd
-  # and initscripts with /usr/bin/loadkeys usage will be released
-  mkdir ${pkgdir}/bin
-  ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 482d5419b..24723ca85 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161869 2012-06-16 00:19:50Z ibiru $
+# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=nilfs-utils
-pkgver=2.1.2
+pkgver=2.1.4
 pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,15 @@ backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux')
 options=(!libtool)
 source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('9a16a5ca459e64a903eac9c2fd456802')
+md5sums=('e72f941f5041a057a81a1ce22e03497d')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --enable-libmount
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
 }
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index c410bd922..43282abe3 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163490 2012-07-13 12:30:45Z allan $
+# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=readline
 _basever=6.2
-_patchlevel=003 #prepare for some patches
+_patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=2
+pkgrel=1
 pkgdesc="GNU readline library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -30,7 +30,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c'
          '0665020ea118e8434bd145fb71f452cc'
          '285361ca6d48c51ae2428157e174e812'
          'c9d5d79718856e711667dede87cb7622'
-         '4437205bb1462f5f32e4812b8292c675')
+         '4437205bb1462f5f32e4812b8292c675'
+         'c08e787f50579ce301075c523fa660a4'
+         '7e39cad1d349b8ae789e4fc33dbb235f')
 
 build() {
   cd ${srcdir}/${pkgname}-$_basever