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

Conflicts:
	community/bwbar/PKGBUILD
	community/dosbox/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fbgrab/PKGBUILD
	community/fbv/PKGBUILD
	community/flam3/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gdk-pixbuf/PKGBUILD
	community/ghemical/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/gnustep-base/PKGBUILD
	community/guvcview/PKGBUILD
	community/keepassx/PKGBUILD
	community/kvpnc/PKGBUILD
	community/libghemical/PKGBUILD
	community/liboglappth/PKGBUILD
	community/png2ico/PKGBUILD
	community/shapelib/PKGBUILD
	community/sloccount/PKGBUILD
	community/tmw/PKGBUILD
	community/xmoto/PKGBUILD
	core/links/PKGBUILD
	extra/amule/PKGBUILD
	extra/cairomm/PKGBUILD
	extra/calligra/PKGBUILD
	extra/evas/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gd/PKGBUILD
	extra/gif2png/PKGBUILD
	extra/glhack/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/imlib/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/lbreakout2/PKGBUILD
	extra/libgdiplus/PKGBUILD
	extra/libkate/PKGBUILD
	extra/libpano13/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxslt/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/ntp/PKGBUILD
	extra/nx/PKGBUILD
	extra/openjpeg/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/vice/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wv/PKGBUILD
	extra/wxgtk/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zvbi/PKGBUILD

10 files changed, 118 insertions, 68 deletions

diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD
index 9d2215e8a..30240c121 100644
--- a/core/dirmngr/PKGBUILD
+++ b/core/dirmngr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183488 2013-04-22 09:10:15Z tpowa $
+# $Id: PKGBUILD 184781 2013-05-08 13:18:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dirmngr
-pkgver=1.1.0
-pkgrel=5
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="A daemon to handle CRL and certificate requests"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,6 +11,7 @@ url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
 depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
 install=dirmngr.install
+md5sums=('f5a40e93bcf07a94522579bfd58a2c96')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -27,4 +28,3 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
-md5sums=('f2570f0248f5947daac200e85291b328')
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 406e8e54d..b452839e3 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183490 2013-04-22 09:10:17Z tpowa $
+# $Id: PKGBUILD 184779 2013-05-08 13:18:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gpgme
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('libgpg-error' 'pth' 'gnupg>=2')
 install=${pkgname}.install
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('a0f93aba6d8a831ba14905085027f2f9'
+md5sums=('07f1c0eb6596a94efa3ffb75e74bfbba'
          'SKIP')
 
 build() {
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 26f4be43c..cf06151aa 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180027 2013-03-14 20:45:46Z foutrelis $
+# $Id: PKGBUILD 184614 2013-05-07 16:15:47Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.8.0
+pkgver=3.9.0
 pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,17 +21,23 @@ 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=('6d40dd2b91aad9ae084c99973dcdfdbf6fb353fc'
+sha1sums=('3f48a6d3019f1766f26cda6c4de5d3858837d92b'
           '35b8cf2dc94b73eccad427235c07596146cd6f6c')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
 
   # set correct fhs structure
   patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
-  ./configure
+  # do not treat warnings as errors
+  sed -i 's/-Werror//' Makefile
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure
   make
 }
 
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index 59fe08c08..0a6da74b8 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162886 2012-07-02 17:59:15Z eric $
+# $Id: PKGBUILD 184459 2013-05-06 19:47:23Z foutrelis $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=links
 pkgver=2.7
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A text WWW browser, similar to Lynx"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://links.twibright.com/"
 license=('GPL')
-depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt')
+depends=('bzip2' 'xz' 'openssl' 'gpm')
+makedepends=('libtiff' 'libpng' 'libxt' 'optipng')
 optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
 provides=('links-g')
 conflicts=('links-g')
@@ -18,8 +18,14 @@ source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.d
 sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3'
           'f600e27c2a71184444f7dd07a10230aa44463a02')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
+  optipng graphics/font/century_school-medium-roman-serif-vari/045e.png
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   (cd intl; ./gen-intl; ./synclang)
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
     --enable-graphics --with-x --with-fb
@@ -32,7 +38,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index 5de4b2d70..44771a6c9 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179845 2013-03-10 12:44:09Z bluewind $
+# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar
         'paths.patch'
         'logrotate.conf'
         'logrotate.cron.daily')
-md5sums=('df67c8bda9139131d919931da443794d'
+md5sums=('7be7f1eabea33a1d0483438a6e33d634'
          'cd76976b5ce37d328b452c806b55a015'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '86209d257c8b8bc0ae34d6f6ef057c0f'
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 76eeae271..02a59f6e3 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179010 2013-03-01 10:28:10Z andrea $
+# $Id: PKGBUILD 184780 2013-05-08 13:18:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,6 +14,8 @@ optdepends=('gtk2: for gtk2 backend'
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
         qt4-pinentry-window.patch)
 install=pinentry.install
+md5sums=('2ae681cbca0d9fb774b2c90b11ebf56c'
+         '450b8713fe42f1bd93311ef84767c3d8')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -36,5 +38,3 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install 
 }
-md5sums=('82e6114e5e27a8ab36f314b332a6e024'
-         '450b8713fe42f1bd93311ef84767c3d8')
diff --git a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch b/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
new file mode 100644
index 000000000..dee8e549e
--- /dev/null
+++ b/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
@@ -0,0 +1,25 @@
+From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 7 May 2013 12:47:30 +0200
+Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
+
+---
+ src/login/sd-login.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/sd-login.c b/src/login/sd-login.c
+index 66c4487..d0dc42f 100644
+--- a/src/login/sd-login.c
++++ b/src/login/sd-login.c
+@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
+         return r;
+ }
+ 
+-int sd_get_machine_names(char ***machines) {
++_public_ int sd_get_machine_names(char ***machines) {
+         _cleanup_closedir_ DIR *d = NULL;
+         _cleanup_strv_free_ char **l = NULL;
+         _cleanup_free_ char *md = NULL;
+-- 
+1.8.2.2
+
diff --git a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
deleted file mode 100644
index 24dd6d766..000000000
--- a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 19 Apr 2013 16:31:25 -0400
-Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used
-
----
- src/nss-myhostname/nss-myhostname.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
-index 16ccb3e..8699098 100644
---- a/src/nss-myhostname/nss-myhostname.c
-+++ b/src/nss-myhostname/nss-myhostname.c
-@@ -25,7 +25,6 @@
- #include <netdb.h>
- #include <errno.h>
- #include <string.h>
--#include <assert.h>
- #include <unistd.h>
- #include <net/if.h>
- #include <stdlib.h>
-@@ -35,6 +34,11 @@
- #include "macro.h"
- #include "util.h"
- 
-+/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
-+ * libnss_myhostname will be linked into arbitrary programs which will, in turn
-+ * attempt to write to the journal via log_dispatch() */
-+#include <assert.h>
-+
- /* We use 127.0.0.2 as IPv4 address. This has the advantage over
-  * 127.0.0.1 that it can be translated back to the local hostname. For
-  * IPv6 we use ::1 which unfortunately will not translate back to the
--- 
-1.8.2.1
-
diff --git a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch b/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
new file mode 100644
index 000000000..186a9c554
--- /dev/null
+++ b/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
@@ -0,0 +1,45 @@
+From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 7 May 2013 11:35:23 -0400
+Subject: [PATCH] systemd-sleep: it is not an error if the config file is
+ missing
+
+---
+ src/shared/sleep-config.c | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index 73a3acb..cd3238b 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
+         FILE _cleanup_fclose_ *f;
+ 
+         f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
+-        if (!f) {
+-                if (errno == ENOENT)
+-                        return 0;
+-
+-                log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
+-                return 0;
++        if (!f)
++                log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
++                         "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
++        else {
++                r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
++                                 config_item_table_lookup, (void*) items, false, false, NULL);
++                if (r < 0)
++                        log_warning("Failed to parse configuration file: %s", strerror(-r));
+         }
+ 
+-        r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
+-                         config_item_table_lookup, (void*) items, false, false, NULL);
+-        if (r < 0)
+-                log_warning("Failed to parse configuration file: %s", strerror(-r));
+-
+         if (streq(verb, "suspend")) {
+                 /* empty by default */
+                 *modes = suspend_mode;
+-- 
+1.8.2.2
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 899059afe..29303f28c 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=202
+pkgver=203
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -16,13 +16,15 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch'
+        '0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
+        '0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch'
         'use-split-usr-path.patch')
-md5sums=('3136c6912d3ee1f6d4deb16234783731'
+md5sums=('b5a124ae8aee2b9fa357f912e87e9048'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         '3090c0b9b19b76731b4cf9c01c10c534'
+         '8504a59afaa5d52fa6b5b26fc89873cf'
+         '988cf83af952990ff48d3b97bcf06845'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -31,7 +33,8 @@ prepare() {
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
-  patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch"
+  patch -Np1 <"$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch"
+  patch -Np1 <"$srcdir/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch"
 }
 
 build() {
@@ -56,7 +59,8 @@ build() {
 }
 
 check() {
-  make -C "$pkgname-$pkgver" check
+  # two tests fail due to running under nspawn
+  make -C "$pkgname-$pkgver" check || true
 }
 
 package_systemd() {