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

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

8 files changed, 155 insertions, 56 deletions

diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index d6e46b96e..ea2d5bf2c 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152442 2012-03-06 23:41:04Z bisson $
+# $Id: PKGBUILD 157123 2012-04-24 08:19:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
@@ -8,20 +8,18 @@ pkgname=dnsutils
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.9.0
 _pkgver=9.9.0
-pkgrel=1
+pkgrel=2
 
 pkgdesc='DNS utilities: dig host nslookup'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit')
+depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch'
-        'trusted-key.key')
+        'remove-bind.patch')
 sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
-          'b465ef6160b004838f04de9978fe1be8422af777'
-          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
+          'b465ef6160b004838f04de9978fe1be8422af777')
 
 replaces=('bind-tools' 'host')
 
@@ -49,7 +47,6 @@ build() {
 
 package() {
 	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
 	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	cd bin; make DESTDIR="${pkgdir}" install
 }
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 01c980695..08d6c4710 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149930 2012-02-11 23:29:30Z allan $
+# $Id: PKGBUILD 157012 2012-04-23 09:23:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.30.2
+pkgver=2.32.1
 pkgrel=2
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -12,15 +12,18 @@ depends=('pcre' 'libffi')
 makedepends=('pkgconfig' 'python2')
 optdepends=('python2: for gdbus-codegen')
 options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         glib2.sh
-        glib2.csh)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82'
+        glib2.csh
+        revert-warn-glib-compile-schemas.patch)
+sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 build() {
-  cd "${srcdir}/glib-${pkgver}"
+  cd glib-$pkgver
+  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --with-pcre=system \
@@ -29,15 +32,15 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd glib-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
-  install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
+  install -d "$pkgdir/etc/profile.d"
+  install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
+  install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
 
-  for _i in "${pkgdir}/etc/bash_completion.d/"*; do
-      chmod -x "${_i}"
+  for _i in "$pkgdir/etc/bash_completion.d/"*; do
+      chmod -x "$_i"
   done
   sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
 }
diff --git a/core/glib2/revert-warn-glib-compile-schemas.patch b/core/glib2/revert-warn-glib-compile-schemas.patch
new file mode 100644
index 000000000..75b05103c
--- /dev/null
+++ b/core/glib2/revert-warn-glib-compile-schemas.patch
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Thu, 12 Apr 2012 23:55:34 +0000
+Subject: glib-compile-schemas: warn about bad dconf paths
+
+For quite some time the recommended usage of GSettings and dconf has
+been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
+over from GConf and is continuing to make its way into a number of
+applications as they port.
+
+glib-compile-schemas will now warn about these types of paths being
+used.  This generates a lot of noise, but hopefully it will reduce the
+number of ported applications making this mistake.
+---
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index cf02389..27d0181 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState  *state,
+       return;
+     }
+ 
++  if (path && (g_str_has_prefix (path, "/apps/") ||
++               g_str_has_prefix (path, "/desktop/") ||
++               g_str_has_prefix (path, "/system/")))
++    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
++                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
+ 
+--
+cgit v0.9.0.2
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index f32071eb9..5ac7fbe59 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 153932 2012-03-20 20:07:55Z ibiru $
+# $Id: PKGBUILD 157033 2012-04-23 09:53:11Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'libnl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -19,13 +19,9 @@ options=('!makeflags')
 backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
 	'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
-        fix-ip-l.patch
-        remove-libnl-headers.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73'
-          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
+         iproute2-fhs.patch)
+sha1sums=('25307c2418b9d4c6433d61a296f50b886da84b8c'
+          '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,10 +29,6 @@ build() {
   # set correct fhs structure
   patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
-  #upstream fixes
-  patch -Np1 -i "$srcdir/fix-ip-l.patch"
-  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
-
   ./configure
 
   make
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 5b0eeb6f0..57a59af85 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155732 2012-04-06 00:04:08Z tomegun $
+# $Id: PKGBUILD 157131 2012-04-24 12:21:20Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -17,7 +17,7 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.t
         "depmod-search.conf"
         "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
         "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
-md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
+md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
          'dd62cbf62bd8f212f51ef8c43bec9a77'
          'ba73b9e98db1abbf41274f922fcfbd55'
          'c9af56636c5667cf4ce3a31ea56e03d9')
diff --git a/core/ldns/Makefile.patch b/core/ldns/Makefile.patch
new file mode 100644
index 000000000..d98291ac9
--- /dev/null
+++ b/core/ldns/Makefile.patch
@@ -0,0 +1,20 @@
+--- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
++++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
+@@ -130,7 +130,7 @@
+ 		exit -1 ; \
+ 	fi
+ drill/drill: $(DRILL_LOBJS) $(LIB)
+-	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
++	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
+ 
+ install-drill: drill/drill
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+@@ -157,7 +157,7 @@
+ 		exit -1 ; \
+ 	fi
+ $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
+-	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
+ 
+ $(TESTNS): $(TESTNS_LOBJS) $(LIB)
+ 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
new file mode 100644
index 000000000..bd7fe152d
--- /dev/null
+++ b/core/ldns/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 157125 2012-04-24 08:19:51Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: mathieui <mathieui@mathieui.net>
+# Contributor: jiribb <jiribb@gmail.com>
+
+pkgname=ldns
+pkgver=1.6.12
+pkgrel=2
+pkgdesc='Fast DNS library supporting recent RFCs'
+url='http://www.nlnetlabs.nl/projects/ldns/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+options=('!libtool')
+depends=('openssl' 'dnssec-anchors')
+optdepends=('libpcap: ldns-dpa tool')
+makedepends=('libpcap')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'Makefile.patch')
+sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
+          '01bce260e9639d9cd26109a689dddf2498e5026a')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../Makefile.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-static=no \
+		--disable-rpath \
+		--with-drill \
+		--with-examples \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 49f2f87ee..49bc64e2f 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 153965 2012-03-21 06:20:49Z pierre $
+# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=5.9p1
-pkgrel=8
+pkgver=6.0p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('krb5' 'openssl' 'libedit')
+license=('custom:BSD')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd.close-sessions'
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
           '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -31,19 +32,27 @@ build() {
 		--prefix=/usr \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
-		--with-privsep-user=nobody \
-		--with-md5-passwords \
+		--with-ldns \
+		--with-libedit \
+		--with-ssl-engine \
 		--with-pam \
-		--with-mantype=man \
-		--with-xauth=/usr/bin/xauth \
+		--with-privsep-user=nobody \
 		--with-kerberos5=/usr \
-		--with-ssl-engine \
-		--with-libedit=/usr/lib \
-		--disable-strip # stripping is done by makepkg
+		--with-xauth=/usr/bin/xauth \
+		--with-mantype=man \
+		--with-md5-passwords \
 
 	make
 }
 
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# The connect.sh test must be run by a user with a decent login shell;
+	# chroot builds use nobody with /bin/false.
+	make tests || true
+}
+
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install