Wed Jun 19 01:36:52 PDT 2013

46 files changed, 1017 insertions, 154 deletions

diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index fe50cb4ca..56c51bbcf 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87789 2013-04-06 16:50:31Z bgyorgy $
+# $Id: PKGBUILD 92894 2013-06-18 09:01:17Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
 pkgver=0.6.21
-pkgrel=2
+pkgrel=3
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
@@ -18,9 +18,18 @@ optdepends=('lftp: FTPS backend'
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "u1backend.patch")
 md5sums=('4ade1de475e0af64211bb6933b593057'
-         '3521d679ba7dff46653313aa3b3e6855')
+         '3521d679ba7dff46653313aa3b3e6855'
+         'b7aede10a3f5503ae4428a506b57486c')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix Ubuntu One backup (FS#35487, upstream revisions 912 and 913, will be fixed in 0.6.22).
+  patch -p0 duplicity/backends/u1backend.py ../u1backend.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/duplicity/u1backend.patch b/community/duplicity/u1backend.patch
new file mode 100644
index 000000000..7aba89fbb
--- /dev/null
+++ b/community/duplicity/u1backend.patch
@@ -0,0 +1,16 @@
+86a87,90
+> 
+>                 if isinstance(body, file):
+>                     body.seek(0) # Go to the beginning of the file for the retry
+> 
+108a113,115
+>             if isinstance(body, file):
+>                 body.seek(0) # Go to the beginning of the file for the retry
+> 
+209a217
+>         size = os.path.getsize(source_path.name)
+213c221,222
+<         headers = {"Content-Type": content_type}
+---
+>         headers = {"Content-Length": str(size),
+>                    "Content-Type": content_type}
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index 98f261981..210ce954f 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84391 2013-02-17 21:32:04Z bpiotrowski $
+# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=galculator
-pkgver=2.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
-sha256sums=('f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be')
+sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 68a714768..f35596fea 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $
+# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,20 +6,21 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=(x86_64 i686)
 license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
 depends=(gedit python-dbus)
-makedepends=(intltool gnome-doc-utils vte3)
+makedepends=(intltool gnome-doc-utils vte3 libgit2-glib)
 optdepends=('gucharmap: for charmap plugin'
-            'vte3: for embedded terminal')
+            'vte3: for embedded terminal'
+            'libgit2-glib: for git plugin')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502')
+sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index 545c80acc..09d1ccf4b 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90384 2013-05-12 06:27:41Z bpiotrowski $
+# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.7.a
-_pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgver=1.7.c
+_pkgver=${pkgver/.c/c}
+pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64')
 url='http://www.issihosts.com/haveged'
@@ -15,7 +15,7 @@ depends=('glibc')
 options=('!libtool')
 source=($url/$pkgname-$_pkgver.tar.gz
         service)
-sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051'
+sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
             'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
 
 build() {
@@ -28,6 +28,7 @@ package() {
   cd $pkgname-$_pkgver
   make DESTDIR="$pkgdir" install
 
-  rm -rf $pkgdir/etc/init.d
-  install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service
+  rm -rf "$pkgdir"/etc/init.d
+  install -D -m644 "$srcdir"/service \
+    "$pkgdir"/usr/lib/systemd/system/haveged.service
 }
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index f9179c39e..210f339d8 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67524 2012-03-13 10:32:39Z lcarlier $
+# $Id: PKGBUILD 92911 2013-06-18 17:53:17Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Thomas Haider <t.haider@vcnc.org>
 
 pkgname=libev
-pkgver=4.11
+pkgver=4.15
 pkgrel=1
 pkgdesc="A full-featured and high-performance event loop"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('glibc')
 options=('!libtool')
 source=(http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('e7752a518742c0f8086a8005aa7efcc4dcf02ed9')
+sha1sums=('88655b1e2c0b328c9f90a6df7e72361a97fa8dc3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD
new file mode 100644
index 000000000..8e9fadcb6
--- /dev/null
+++ b/community/libgit2-glib/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 92908 2013-06-18 13:46:11Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libgit2-glib
+pkgver=0.0.2
+pkgrel=1
+pkgdesc="GLib wrapper for libgit2"
+url="http://live.gnome.org/Libgit2-glib"
+license=(LGPL2.1)
+arch=(i686 x86_64)
+depends=(glib2 libgit2 gobject-introspection)
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e1e0c6e0cb6897c09e06edc06ee70befca2a3e1b3eb629c449b8ca0f49db75e5')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index 2b6c55e35..d3f225a88 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 92065 2013-05-31 02:33:12Z seblu $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 92897 2013-06-18 09:22:57Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
 pkgver=4.56
-pkgrel=2
+pkgrel=3
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
 url="http://www.stunnel.org"
@@ -32,7 +33,8 @@ build() {
     --sysconfdir=/etc \
     --localstatedir=/var \
     --enable-ipv6 \
-    --disable-libwrap
+    --disable-libwrap \
+    --disable-fips
 
   make
 }
diff --git a/community/xdotool/PKGBUILD b/community/xdotool/PKGBUILD
index 06363e735..79b024cc1 100644
--- a/community/xdotool/PKGBUILD
+++ b/community/xdotool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83490 2013-02-02 09:44:29Z foutrelis $
+# $Id: PKGBUILD 92913 2013-06-18 18:33:07Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Rttommy <rttommy@gmail.com>
 
 pkgname=xdotool
 pkgver=2.20110530.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Command-line X11 automation tool"
 arch=('i686' 'x86_64')
 url="http://www.semicomplete.com/projects/xdotool/"
@@ -24,6 +24,9 @@ package() {
 
   make PREFIX="$pkgdir/usr" INSTALLMAN="$pkgdir/usr/share/man" install
 
+  # Remove execute bit from header file
+  chmod -x "$pkgdir/usr/include/xdo.h"
+
   # License
   install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/xdotool/COPYRIGHT"
 }
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 3706afac0..6b382d3f6 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,29 +1,56 @@
-# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $
+# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
 makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
              'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
+source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
+        http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
+        cups.logrotate cups.pam
+        # improve build and linking
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
+        # FC
         cups-systemd-socket.patch
-        cups.logrotate cups.pam)
+        cups-dbus-utf8.patch
+        cups-res_init.patch
+        cups-avahi-address.patch
+        cups-enum-all.patch
+        # Gentoo
+        cups-1.6.0-fix-install-perms.patch
+        cups-1.6.2-statedir.patch
+        # Debian
+        usb-backend-more-quirk-rules.patch
+        cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+        get-ppd-file-for-statically-configured-ipp-shared-queues.patch
+        ppd-poll-with-client-conf.patch
+        usb-backend-do-not-crash-if-usb-disabled-in-bios.patch)
 #options=('!emptydirs')
-md5sums=('13c8b2b2336d42001abe4899766b62dc'
+md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
+         'f861b18f4446c43918c8643dcbbd7f6d'
+         '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
          'b4868b83f7f2d6ec24a1be76509379f0'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
+         'a2a88b3a3257c3b5fd3edcc169e6aca4'
+         '8fe27d4248cacbc02824e7937cab4088'
+         'df0c367c0022e3c7d8e01827e8a6c5e7'
+         'f30c2a161caaf27854581507cde8cac6'
+         '5117f65342fcc69c6a506529e4daca9e'
+         '9247e218eea94ebda0aebc8ee0e77db8'
+         '52675e2d7a7f77005f1fc0212b86dbe3'
+         'cb58bf4e0b80eaee383712e5c84a1ab4'
+         'b578bcd17949a7203237ba1e31f78ef9'
+         '0becd6ab8782b97f19a02c1dc174c75e'
+         'f1f0ee65296d438a8c83467ff03f652d')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -40,6 +67,36 @@ build() {
 
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+
+
+  # various bugfixes (upstream reports/SVN or Fedora/Debian
+
+  # Ensure attributes are valid UTF-8 in dbus notifier
+  patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
+
+  # More USB quirks for the libusb-based backend (STR #4311)
+  # Fixed in 1.6.3
+  patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch
+  # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
+  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+  # Applications could not get the PPD file for statically-configured IPP-shared print queues
+  patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
+  # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
+  # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
+  patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
+  # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also
+  # discard that error when counting warning messages.
+  patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
+  # fix permissions on some files - alternative: cups-0755.patch by FC
+  patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
+  # move /var/run -> /run for pid file
+  patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+  # Re-initialise the resolver on failure in httpAddrGetList() 
+  patch -Np1 -i ${srcdir}/cups-res_init.patch
+  # Use IP address when resolving DNSSD URIs
+  patch -Np1 -i ${srcdir}/cups-avahi-address.patch
+  # Return from cupsEnumDests() once all records have been returned.
+  patch -Np1 -i ${srcdir}/cups-enum-all.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
diff --git a/extra/cups/cups-1.6.0-fix-install-perms.patch b/extra/cups/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 000000000..2d7a77c44
--- /dev/null
+++ b/extra/cups/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,25 @@
+Index: Makedefs.in
+===================================================================
+--- Makedefs.in	(Revision 10520)
++++ Makedefs.in	(Arbeitskopie)
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...
diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch
new file mode 100644
index 000000000..3e836657d
--- /dev/null
+++ b/extra/cups/cups-1.6.2-statedir.patch
@@ -0,0 +1,12 @@
+diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
+--- cups-1.6.2.orig/config-scripts/cups-directories.m4	2012-10-01 03:55:23.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-directories.m4	2013-04-02 00:11:41.000000000 +0200
+@@ -429,7 +429,7 @@
+ 		;;
+ 	*)
+ 		# All others
+-		CUPS_STATEDIR="$localstatedir/run/cups"
++		CUPS_STATEDIR="/run/cups"
+ 		;;
+ esac
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
diff --git a/extra/cups/cups-avahi-address.patch b/extra/cups/cups-avahi-address.patch
new file mode 100644
index 000000000..a03d1adbb
--- /dev/null
+++ b/extra/cups/cups-avahi-address.patch
@@ -0,0 +1,75 @@
+diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c
+--- cups-1.6.2/cups/http-support.c.avahi-address	2013-03-11 18:44:36.000000000 +0000
++++ cups-1.6.2/cups/http-support.c	2013-04-04 15:39:06.651847041 +0100
+@@ -2121,7 +2121,7 @@ http_resolve_cb(
+     const char             *type,	/* I - Registration type */
+     const char             *domain,	/* I - Domain (unused) */
+     const char             *hostTarget,	/* I - Hostname */
+-    const AvahiAddress     *address,	/* I - Address (unused) */
++    const AvahiAddress     *address,	/* I - Address */
+     uint16_t               port,	/* I - Port number */
+     AvahiStringList        *txt,	/* I - TXT record */
+     AvahiLookupResultFlags flags,	/* I - Lookup flags (unused) */
+@@ -2253,36 +2253,37 @@ http_resolve_cb(
+ 
+     DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
+ 
+-    snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
+-    if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
++    int error = getnameinfo(&(address->data),
++			    address->proto == AVAHI_PROTO_INET ?
++			    sizeof (AvahiIPv4Address) :
++			    (address->proto == AVAHI_PROTO_INET6 ?
++			     sizeof (AvahiIPv6Address) :
++			     sizeof (address->data)),
++			    fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
++
++    if (!error)
+     {
+-      for (addr = addrlist; addr; addr = addr->next)
++      DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
++
++      if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
++	  _cups_strcasecmp(hostptr, ".local"))
+       {
+-        int error = getnameinfo(&(addr->addr.addr),
+-	                        httpAddrLength(&(addr->addr)),
+-			        fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+-
+-        if (!error)
+-	{
+-	  DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
+-
+-	  if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
+-	      _cups_strcasecmp(hostptr, ".local"))
+-	  {
+-	    hostTarget = fqdn;
+-	    break;
+-	  }
+-	}
++	hostTarget = fqdn;
++      }
++    }
+ #ifdef DEBUG
+-	else
+-	  DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+-	                httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
+-			error));
++    else
++      DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
++		    httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
++		    error));
+ #endif /* DEBUG */
+-      }
++  } else {
++   /*
++    * Use the IP address that responded...
++    */
+ 
+-      httpAddrFreeList(addrlist);
+-    }
++   avahi_address_snprint (fqdn, sizeof (fqdn), address);
++   hostTarget = fqdn;
+   }
+ 
+  /*
diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch
new file mode 100644
index 000000000..0bcd4a163
--- /dev/null
+++ b/extra/cups/cups-dbus-utf8.patch
@@ -0,0 +1,106 @@
+diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
+--- cups-1.6.1/notifier/dbus.c.dbus-utf8	2012-01-20 19:00:32.000000000 +0000
++++ cups-1.6.1/notifier/dbus.c	2012-10-31 11:04:47.686973616 +0000
+@@ -31,6 +31,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <assert.h>
++#include <locale.h>
++#include <wchar.h>
+ 
+ #ifdef HAVE_DBUS
+ #  include <dbus/dbus.h>
+@@ -157,10 +160,82 @@ enum
+  * Local functions...
+  */
+ 
+-static int	acquire_lock(int *fd, char *lockfile, size_t locksize);
++static int		acquire_lock(int *fd, char *lockfile, size_t locksize);
++static const char	*validate_utf8(const char *str);
+ 
+ 
+ /*
++ * 'validate_utf8()' - Convert to valid UTF-8
++ */
++
++static const char *
++validate_utf8 (const char *str)
++{
++  static char *buffer = NULL;
++  static size_t buflen = 0;
++  char *p;
++  size_t str_len;
++  unsigned int i;
++  mbstate_t instate, outstate;
++
++  if (str == NULL)
++  {
++    free (buffer);
++    return (NULL);
++  }
++
++  /* Is it already valid? */
++  if (mbstowcs (NULL, str, 0) != (size_t) -1)
++    return str;
++
++  /* Make sure our buffer is at least as large as the input string */
++  str_len = strlen (str);
++  if (str_len > buflen)
++  {
++    if (buffer == NULL)
++      /* Set encoding type to UTF-8 the first time we need to */
++      setlocale (LC_CTYPE, "en_US.UTF-8");
++
++    buflen = str_len + 1;
++    buffer = realloc (buffer, buflen);
++  }
++
++  memset (&instate, '\0', sizeof (mbstate_t));
++  memset (&outstate, '\0', sizeof (mbstate_t));
++  p = buffer;
++  i = 0;
++  while (i < str_len)
++  {
++    wchar_t wc;
++    size_t used, written;
++    mbstate_t orig_instate = instate;
++    used = mbrtowc (&wc, str + i, str_len - i, &instate);
++    switch (used)
++    {
++    case (size_t) -2:
++    case (size_t) -1:
++      wc = L'?'; /* so replacement is never longer than original char */
++      instate = orig_instate;
++      /* fallthru */
++    case 0:
++      used = 1;
++    }
++
++    written = wcrtomb (p, wc, &outstate);
++    if (written != -1)
++    {
++      p += written;
++      assert (p - buffer < buflen);
++    }
++
++    i += used;
++  }
++
++  *p = '\0';
++  return buffer;
++}
++
++/*
+  * 'main()' - Read events and send DBUS notifications.
+  */
+ 
+@@ -366,7 +441,7 @@ main(int  argc,				/* I - Number of comm
+     attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
+     if (attr)
+     {
+-      const char *val = ippGetString(attr, 0, NULL);
++      const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
+       if (!dbus_message_iter_append_string(&iter, &val))
+         goto bail;
+     }
diff --git a/extra/cups/cups-enum-all.patch b/extra/cups/cups-enum-all.patch
new file mode 100644
index 000000000..0ac39835e
--- /dev/null
+++ b/extra/cups/cups-enum-all.patch
@@ -0,0 +1,17 @@
+diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
+--- cups-1.6.2/cups/dest.c.enum-all	2013-06-04 10:58:36.169786250 +0100
++++ cups-1.6.2/cups/dest.c	2013-06-04 10:59:02.147900811 +0100
+@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
+ 	break;
+ 
+     case AVAHI_BROWSER_REMOVE:
+-    case AVAHI_BROWSER_ALL_FOR_NOW:
+     case AVAHI_BROWSER_CACHE_EXHAUSTED:
+         break;
++
++    case AVAHI_BROWSER_ALL_FOR_NOW:
++	avahi_simple_poll_quit(data->simple_poll);
++        break;
+   }
+ }
+ 
diff --git a/extra/cups/cups-res_init.patch b/extra/cups/cups-res_init.patch
new file mode 100644
index 000000000..94a81a457
--- /dev/null
+++ b/extra/cups/cups-res_init.patch
@@ -0,0 +1,26 @@
+diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c
+--- cups-1.6b1/cups/http-addr.c.res_init	2012-05-17 00:57:03.000000000 +0200
++++ cups-1.6b1/cups/http-addr.c	2012-05-25 15:51:51.323916352 +0200
+@@ -254,7 +254,8 @@ httpAddrLookup(
+ 
+     if (error)
+     {
+-      if (error == EAI_FAIL)
++      if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA ||
++          error == EAI_NONAME)
+         cg->need_res_init = 1;
+ 
+       return (httpAddrString(addr, name, namelen));
+diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c
+--- cups-1.6b1/cups/http-addrlist.c.res_init	2012-04-23 19:26:57.000000000 +0200
++++ cups-1.6b1/cups/http-addrlist.c	2012-05-25 16:05:05.930377452 +0200
+@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname,	/*
+     }
+     else
+     {
+-      if (error == EAI_FAIL)
++      if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA ||
++          error == EAI_NONAME)
+         cg->need_res_init = 1;
+ 
+       _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0);
diff --git a/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
new file mode 100644
index 000000000..ee36936f8
--- /dev/null
+++ b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
@@ -0,0 +1,19 @@
+Description: Fixed crash which sometimes happens on shutdown of the CUPS
+ daemon, caused by a wrong shutdown sequence for shutting down the Avahi
+ threaded poll.
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Upstream: http://cups.org/str.php?L4180
+Bug-Upstream: http://cups.org/str.php?L4213
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045
+Last-Updated: 2012-10-16
+
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -1333,6 +1333,7 @@
+   DNSSDMaster = NULL;
+ 
+ #  else /* HAVE_AVAHI */
++  avahi_threaded_poll_stop(DNSSDMaster);
+   avahi_client_free(DNSSDClient);
+   DNSSDClient = NULL;
+ 
diff --git a/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
new file mode 100644
index 000000000..ed132d750
--- /dev/null
+++ b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
@@ -0,0 +1,31 @@
+Description: Applications could not get the PPD file for
+ statically-configured IPP-shared print queues
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Upstream: http://cups.org/str.php?L4178
+Last-Updated: 2012-09-19
+
+--- a/cups/util.c
++++ b/cups/util.c
+@@ -1731,6 +1731,22 @@
+ 
+       return (1);
+     }
++    else if (device_uri &&
++	     (!strncmp(device_uri, "ipp:", 4) != NULL ||
++	      !strncmp(device_uri, "ipps:", 5) != NULL))
++    {
++     /*
++      * Statically-configured IPP shared printer.
++      */
++
++      httpSeparateURI(HTTP_URI_CODING_ALL,
++                      device_uri,
++                      scheme, sizeof(scheme), username, sizeof(username),
++		      host, hostsize, port, resource, resourcesize);
++      ippDelete(response);
++
++      return (1);
++    }
+     else if ((attr = ippFindAttribute(response, "member-uris",
+                                       IPP_TAG_URI)) != NULL)
+     {
diff --git a/extra/cups/ppd-poll-with-client-conf.patch b/extra/cups/ppd-poll-with-client-conf.patch
new file mode 100644
index 000000000..8985fa3be
--- /dev/null
+++ b/extra/cups/ppd-poll-with-client-conf.patch
@@ -0,0 +1,23 @@
+Description: If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server
+Bug: http://www.cups.org/str.php?L2763
+
+--- a/cups/util.c
++++ b/cups/util.c
+@@ -1085,11 +1085,13 @@
+     http2 = http;
+   else if ((http2 = httpConnectEncrypt(hostname, port,
+                                        cupsEncryption())) == NULL)
+-  {
+-    DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
++    if ((http2 = httpConnectEncrypt(http_hostname, http_port,
++				    cupsEncryption())) == NULL)
++    {
++      DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
+ 
+-    return (HTTP_SERVICE_UNAVAILABLE);
+-  }
++      return (HTTP_SERVICE_UNAVAILABLE);
++    }
+ 
+  /*
+   * Get a temp file...
diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
new file mode 100644
index 000000000..711dab8ce
--- /dev/null
+++ b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
@@ -0,0 +1,54 @@
+Description: Add more error handling to the libusb-based USB backend,
+ especially to avoid a crash when USB is disabled in the BIOS. Also
+ discard that error when counting warning messages.
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719
+Last-Update: 2013-05-03
+--- a/backend/usb-libusb.c
++++ b/backend/usb-libusb.c
+@@ -898,7 +898,8 @@
+ 					/* Pointer to current alternate setting */
+   const struct libusb_endpoint_descriptor *endpptr = NULL;
+ 					/* Pointer to current endpoint */
+-  ssize_t               numdevs,        /* number of connected devices */
++  ssize_t               err = 0,
++                        numdevs,        /* number of connected devices */
+                         i = 0;
+   uint8_t		conf,		/* Current configuration */
+ 			iface,		/* Current interface */
+@@ -917,7 +918,13 @@
+   * Initialize libusb...
+   */
+ 
+-  libusb_init(NULL);
++  err = libusb_init(NULL);
++  if (err)
++  {
++    fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err);
++    return (NULL);
++  }
++
+   numdevs = libusb_get_device_list(NULL, &list);
+   fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs);
+ 
+@@ -1087,7 +1094,8 @@
+   * Clean up ....
+   */
+ 
+-  libusb_free_device_list(list, 1);
++  if (numdevs >= 0)
++    libusb_free_device_list(list, 1);
+   libusb_exit(NULL);
+ 
+   return (NULL);
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -838,7 +838,7 @@
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'`
+ if test $count != 9; then
+ 	echo "FAIL: $count warning messages, expected 9."
+ 	$GREP '^W ' /tmp/cups-$user/log/error_log
diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch
new file mode 100644
index 000000000..3b72011d6
--- /dev/null
+++ b/extra/cups/usb-backend-more-quirk-rules.patch
@@ -0,0 +1,66 @@
+Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others)
+Author: Didier Raboud <odyx@debian.org>
+Bugs-Debian: http://bugs.debian.org/697970
+Last-Update: 2013-03-11
+
+--- a/backend/usb-libusb.c
++++ b/backend/usb-libusb.c
+@@ -142,8 +142,12 @@
+ 	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
+ 	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
+ 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
++	{ 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International,
++		       Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */
+ 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
+ 						  by zut <kernel@zut.de> */
++	{ 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D
++			    Printer, https://bugs.launchpad.net/bugs/1160638 */
+ 	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
+ 			    Printer, http://www.cups.org/str.php?L4155 */
+ 	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
+@@ -158,6 +162,8 @@
+ 			    Printer, http://www.cups.org/str.php?L4155 */
+ 	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
+ 			    Printer, http://www.cups.org/str.php?L4155 */
++	{ 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150
++		            Printer, https://bugs.launchpad.net/bugs/1160638 */
+ 	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+ 						  HL-1430 Laser Printer,
+ 				     https://bugs.launchpad.net/bugs/1038695 */
+@@ -165,24 +171,33 @@
+ 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+ 						  HL-1440 Laser Printer,
+ 				     https://bugs.launchpad.net/bugs/1000253 */
++	{ 0x04f9, 0x000e, USBLP_QUIRK_BIDIR |
++			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
++						  HL-1450 Laser Printer,
++				     https://bugs.launchpad.net/bugs/1000253 */
+ 	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
+ 						  Okipage 14ex Printer,
+ 				     https://bugs.launchpad.net/bugs/872483 */
+ 	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
+ 				     https://bugs.launchpad.net/bugs/872483 */
+-	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
++	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR |
++			  USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
+ 				     http://bugs.debian.org/697970 */
++	{ 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670,
++				     https://bugs.launchpad.net/bugs/872483 */
+ 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
+ 						      Printer M129C */
+ 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
+ 			  USBLP_QUIRK_NO_REATTACH |
+ 	                  USBLP_QUIRK_RESET },
++	/* Prolific Technology, Inc. PL2305 Parallel Port
++	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
+ 	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
+ 			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
+ 	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
+ 				     https://bugs.launchpad.net/bugs/1102470 */
+-	/* Prolific Technology, Inc. PL2305 Parallel Port
+-	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
++	{ 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics
++   CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */
+ 	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
+ 				     https://bugs.launchpad.net/bugs/1032456 */
+ 	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index b420cb566..0414cffd3 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 188700 2013-06-18 09:44:02Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.17
+pkgver=9.19
 pkgrel=1
 pkgdesc='Decodes any raw image from any digital camera'
 url='http://www.cybercom.net/~dcoffin/dcraw/'
@@ -11,7 +12,7 @@ arch=('i686' 'x86_64')
 license=('custom')
 depends=('lcms' 'jasper')
 source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27')
+sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4')
 
 build() {
 	cd "${srcdir}/${pkgname}"
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index e61ec921b..282da69ac 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $
+# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.tmpfilesd)
-md5sums=('e6c011b4bbddf19e79205d012723449a'
+md5sums=('306664f09560d2c6515ba80e1dd7f353'
          'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 12da86d89..244a8e47a 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187933 2013-06-08 07:59:11Z andrea $
+# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
@@ -6,13 +6,13 @@ pkgname=('kdebindings-python'
          'kdebindings-python2'
          'kdebindings-python-common')
 pkgver=4.10.4
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
+             'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
              source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
 sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e')
 
@@ -44,7 +44,7 @@ build() {
 
 package_kdebindings-python() {
   pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common')
+  depends=('kdepim-runtime' 'python-pyqt4' 'kdebindings-python-common')
 
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
@@ -58,7 +58,7 @@ package_kdebindings-python() {
 
 package_kdebindings-python2() {
   pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common')
+  depends=('kdepim-runtime' 'python2-pyqt4' 'kdebindings-python-common')
   conflicts=('kdebindings-python<4.8.1-2')
  
   cd "${srcdir}"/build-python2
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 2871aca2f..5f01e6cf9 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187934 2013-06-08 07:59:13Z andrea $
+# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
@@ -6,7 +6,7 @@ pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
 pkgver=4.10.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD
index c2215585e..1358339c0 100644
--- a/extra/libbsd/PKGBUILD
+++ b/extra/libbsd/PKGBUILD
@@ -1,19 +1,29 @@
-# $Id: PKGBUILD 188599 2013-06-16 20:01:01Z eric $
+# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libbsd
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
 arch=('i686' 'x86_64')
 url="http://libbsd.freedesktop.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc})
+source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}
+        spt.patch)
 md5sums=('be8b2e0dc4614699834c49693574fd1a'
-         'SKIP')
+         'SKIP'
+         '56236fb72c8ec6cbdbd0daa5f404bccb')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Paper over a firefox crash
+  # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html
+  patch -Np1 -i ../spt.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libbsd/spt.patch b/extra/libbsd/spt.patch
new file mode 100644
index 000000000..b19dc9b87
--- /dev/null
+++ b/extra/libbsd/spt.patch
@@ -0,0 +1,50 @@
+diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c
+--- libbsd-0.5.2-orig/src/setproctitle.c	2013-06-08 18:26:04.000000000 +0200
++++ libbsd-0.5.2/src/setproctitle.c	2013-06-18 02:35:59.441393418 +0200
+@@ -86,7 +86,7 @@
+ 	if (environ != envp)
+ 		return 0;
+ 
+-	/* Make a copy of the old environ array of pointers, in case
++	/* Make a deep copy of the old environ array of pointers, in case
+ 	 * clearenv() or setenv() is implemented to free the internal
+ 	 * environ array, because we will need to access the old environ
+ 	 * contents to make the new copy. */
+@@ -94,11 +94,13 @@
+ 	envcopy = malloc(envsize);
+ 	if (envcopy == NULL)
+ 		return errno;
+-	memcpy(envcopy, envp, envsize);
++	for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]);
++	envcopy[i] = NULL;
+ 
+ 	error = spt_clearenv();
+ 	if (error) {
+ 		environ = envp;
++		for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ 		free(envcopy);
+ 		return error;
+ 	}
+@@ -116,18 +118,20 @@
+ 		if (error) {
+ #ifdef HAVE_CLEARENV
+ 			/* Because the old environ might not be available
+-			 * anymore we will make do with the shallow copy. */
++			 * anymore we will make do with the deep copy. */
+ 			environ = envcopy;
+ #else
+ 			environ = envp;
++			for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ 			free(envcopy);
+ #endif
+ 			return error;
+ 		}
+ 	}
+ 
+-	/* Dispose of the shallow copy, now that we've finished transfering
++	/* Dispose of the deep copy, now that we've finished transfering
+ 	 * the old environment. */
++	for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ 	free(envcopy);
+ 
+ 	return 0;
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 5ab3a569a..6b2f5c07b 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $
+# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="A GObject-based plugins engine"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -16,17 +16,29 @@ options=('!libtool')
 install=libpeas.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
         js17.patch)
-sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe'
-            '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889')
+sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d'
+            '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../js17.patch
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch
index b0f7d041d..7f54a1803 100644
--- a/extra/libpeas/js17.patch
+++ b/extra/libpeas/js17.patch
@@ -1,24 +1,46 @@
-diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c
---- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c	2013-01-05 20:32:04.000000000 +0100
-+++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c	2013-04-03 00:22:56.726029598 +0200
-@@ -362,7 +362,7 @@
+From 8c54d0ee9c929d9141f74a0c047fed2e28347aa3 Mon Sep 17 00:00:00 2001
+From: Garrett Regier <garrettregier@gmail.com>
+Date: Sat, 27 Apr 2013 11:36:13 +0000
+Subject: Fix Gjs plugin loader
+
+The garbage collection now takes a runtime instead of a contex
+so just use Gjs's gc method to do the right thing and jsvals
+cannot be compared anymore.
+---
+diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c
+index 2a71ff8..0ec418c 100644
+--- a/loaders/gjs/peas-extension-gjs.c
++++ b/loaders/gjs/peas-extension-gjs.c
+@@ -362,7 +362,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten,
  
            if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval),
                                nth_out_arg++, &js_value) ||
 -              js_value == JSVAL_VOID)
-+              js_value.asBits == JSVAL_VOID.asBits)
++              JSVAL_IS_VOID (js_value))
              {
                g_warning ("Error failed to get out argument %i", nth_out_arg);
                return FALSE;
-diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c
---- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c	2012-08-15 12:40:31.000000000 +0200
-+++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c	2013-04-03 00:19:12.884403305 +0200
-@@ -279,7 +279,7 @@
+diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c
+index d9acfdf..8cea724 100644
+--- a/loaders/gjs/peas-plugin-loader-gjs.c
++++ b/loaders/gjs/peas-plugin-loader-gjs.c
+@@ -279,7 +279,7 @@ peas_plugin_loader_gjs_create_extension (PeasPluginLoader *loader,
  
        if (!JS_GetPropertyById (js_context, ginfo->extensions,
                                 prop_name_id, &prop_extension_ctor) ||
 -          prop_extension_ctor != extension_ctor)
-+          prop_extension_ctor.asBits != extension_ctor.asBits)
++          JSVAL_TO_OBJECT (prop_extension_ctor) != JSVAL_TO_OBJECT (extension_ctor))
          continue;
  
        if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) ||
+@@ -327,7 +327,7 @@ static void
+ garbage_collect (PeasPluginInfo *info,
+                  GjsInfo        *ginfo)
+ {
+-  JS_GC (gjs_context_get_native_context (ginfo->context));
++  gjs_context_gc (ginfo->context);
+ }
+ 
+ static void
+--
+cgit v0.9.2
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 8a9bc47da..4caacad2b 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $
+# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.2.2
+_dcpkgver=2.2.3
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index bb85d593a..8e412251f 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $
+# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.22.4
+pkgver=0.22.5
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,11 +13,10 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('49d55921ce795778c7231fe9f2fe923b'
+md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
-#  . /etc/profile.d/qt4.sh
 
   cd "${srcdir}"
   ln -sf test-${_testtag} test
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index e8e899005..e5371df48 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188680 2013-06-17 18:07:30Z andrea $
+# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,11 +6,11 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.7.2
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
 md5sums=('0fbfb06078f206a241a62c94861cce21'
@@ -63,7 +63,7 @@ package_python-qscintilla-common() {
 
 package_python-qscintilla() {
     pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'pyqt')
+    depends=('python-qscintilla-common' 'python-pyqt4')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
@@ -72,7 +72,7 @@ package_python-qscintilla() {
 
 package_python2-qscintilla() {
     pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt')
+    depends=('python-qscintilla-common' 'python2-pyqt4')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
     install -Dm755 Qsci.so \
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index e5fb00be4..9a89a6eb8 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $
+# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=varnish
-pkgver=3.0.3
-pkgrel=3
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
 url="http://www.varnish-cache.org/"
@@ -18,17 +18,13 @@ options=('!libtool')
 source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         varnish-vcl-reload
         varnish.service)
-md5sums=('714310c83fdbd2061d897dacd3f63d8b'
+md5sums=('a130ce9c3504b9603a46542635e18701'
          '03196dee7fc68e75069393d52c370762'
          'a59b17d8e3066abcf3dd7755a2212dd4')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # disable JIT compilation, as it's crashy crashy (bug in PCRE)
-  # this is flagged out and disabled by default in $nextrelease of Varnish.
-  sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
index 1abcd02dc..259cf007f 100644
--- a/libre/abs-libre/PKGBUILD
+++ b/libre/abs-libre/PKGBUILD
@@ -1,48 +1,51 @@
-# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $
+# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 _pkgname=abs
 pkgname=abs-libre
 #CARCH=mips64el
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.4.4
+pkgrel=1
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/abs.git/"
 license=('GPL')
 depends=('bash' 'rsync')
 backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd')
+source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
+         'a628f7d5b1cd1e838366b88709690c24')
 provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
 build() {
-  cd ${srcdir}/${_pkgname}
+  cd "$_pkgname-$pkgver"
 
-  make prefix=/usr sysconfdir=/etc prepare
-  make DESTDIR=${pkgdir} install
+  make
+}
+
+package() {
+  cd "$_pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}" install
 
   # Add readme file, and make base /var/abs path
-  install -dm0755 ${pkgdir}/var/abs/local/
-  install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
+  install -dm755 "${pkgdir}"/var/abs/local/
+  install -Dm644 README "${pkgdir}"/var/abs/README
 
   sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf
   sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf
 
   # make adjustments to abs.conf
-  case $CARCH in
-    "i686")
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        ;;
-    "x86_64")
-        sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf
-        ;;
-    "mips64el")
+  if [[ $CARCH = "i686" ]]; then
+    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
+  fi
+  if [[ $CARCH = "x86_64" ]]; then
+    sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf
+  fi
+  if [[ $CARCH = "mips64el" ]]; then
         sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
         sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf
-        ;;
-  esac
+  fi
 }
-
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 07dc6e87c..81db4af67 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Igor Galic <i.galic@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=audio-convert
 pkgname=audio-convert-libre
 pkgver=0.3.1.1
-pkgrel=6
-pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)"
+pkgrel=7
+pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation"
 arch=('any')
 url="http://freshmeat.net/projects/audio-convert"
 license=('GPL')
@@ -23,8 +23,11 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
-md5sums=('0c6b61bc96be4c9879f85b000192f3fd')
+sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b')
 
 package() {
   install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+
+#FS#29260 fix
+  sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname"
 }
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index c5718a9fd..42a33a113 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
+# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 _pkgname=bogofilter
 pkgname=bogofilter-libre
-pkgver=1.2.2
-pkgrel=5
-pkgdesc="A fast Bayesian spam filtering tool"
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
 backup=('etc/bogofilter/bogofilter.cf')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz)
-md5sums=('af9c7857c66b1884c820f54f23082701')
+source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
+md5sums=('c3ed7f483b83abcbf6d8c797084bd06e')
 provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
-mksource() {
-    [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2
-    tar xf ${_pkgname}-${pkgver}.tar.bz2
-    # Remove noncommercial files.
-    rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01}
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Remove noncommercial files.
+  rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc/bogofilter  \
               --localstatedir=/var \
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index a7b9ad140..3f43d26c9 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=bumblebee
 pkgname=bumblebee-libre
 pkgver=3.2.1
-pkgrel=1
+pkgrel=3
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -47,6 +47,7 @@ build() {
     ./configure \
         CONF_DRIVER=nouveau \
         --prefix=/usr \
+        --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --without-pidfile
 
@@ -60,6 +61,7 @@ package() {
 
     # Install systemd unit
     install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
+    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"
 
     # Make bash_completion work
     mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 8a42d10c3..2057bf70b 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92801 2013-06-15 11:25:47Z jelle $
+# $Id: PKGBUILD 92904 2013-06-18 12:33:10Z andrea $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -10,7 +10,7 @@
 _pkgname=calibre
 pkgname=calibre-libre
 pkgver=0.9.35
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
-         'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
+         'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
          'python2-netifaces' 'python2-cssselect')
 makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 30cbbc641..6fbdd3fb3 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,13 +7,12 @@
 _pkgname=ecasound
 pkgname=ecasound-libre
 pkgver=2.9.0
-pkgrel=2.1
-pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)"
+pkgrel=3
+pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation"
 arch=('i686' 'x86_64')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo'
-         'liboil' 'lilv')
+depends=('audiofile' 'liblo' 'liboil' 'lilv')
 makedepends=('python2' 'ruby')
 optdepends=('python2: ecamonitor, ECI API'
             'ruby: ECI API'
@@ -27,14 +26,16 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool')
-source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz)
-md5sums=('05e7d4664cdf4c7a138c098e9506a551')
+source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
+        'ruby2.patch')
+md5sums=('05e7d4664cdf4c7a138c098e9506a551'
+         '6909dbd4f67f76d3bd31ce7c7fe16212')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  # use vendor_ruby for ruby files
-  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+  # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files
+  patch -Np1 -i "$srcdir/ruby2.patch"
 
   PYTHONPATH=/usr/bin/python2 ./configure \
     --prefix=/usr \
diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch
new file mode 100644
index 000000000..d55f12140
--- /dev/null
+++ b/libre/ecasound-libre/ruby2.patch
@@ -0,0 +1,12 @@
+diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure
+--- ecasound-2.9.0.orig/configure	2013-03-26 17:14:51.759045636 +0800
++++ ecasound-2.9.0/configure	2013-03-26 17:15:50.502060731 +0800
+@@ -6535,7 +6535,7 @@
+   rubyecasound_support=no
+   ECA_S_RUBY_SITEDIR=""
+ else
+-  ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
++  ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
+ fi
+ 
+ 
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
index 064922ef2..086f0cc84 100644
--- a/libre/grub/60_memtest86+
+++ b/libre/grub/60_memtest86+
@@ -22,7 +22,7 @@ if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}"
     _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
     _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
     cat << EOF
-if [ "${grub_platform}" == "pc" ]; then
+if [ "\${grub_platform}" == "pc" ]; then
     menuentry "Memory Tester (memtest86+)" ${CLASS} {
         search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
         linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 50a8eda05..522c1517d 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -9,7 +9,7 @@ _grub_915_ver=9
 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
 pkgbase=grub
 pkgver=2.00
-pkgrel=4
+pkgrel=5
 url="https://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -34,7 +34,7 @@ md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
          'c776aaf2cc35488a7c531b59e697470d'
          '52d374e0194e3f2e39ff7c92ecd58a6c'
          '255eafb440b8c285b20431366c2d2d27'
-         'ae9f1bc1a579ddc88b9b2e8b46f7e1d5'
+         'be55eabc102f2c60b38ed35c203686d6'
          'f343ed2340ebc86c427873641bb72419'
          'ab751d1d8cd3fd47e5ee24d71ecc31ed'
          '342dd18472a24e5fd252458b24f39a29')
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
index e46a7d0b1..d5a45b5b1 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=debootstrap
-pkgver=1.0.48
-pkgrel=1
+pkgver=1.0.52
+pkgrel=3
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
 arch=('any')
 license=('GPL')
@@ -13,15 +12,20 @@ source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver
         'metad'
         'trisquel')
 install="debootstrap.install"
-md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
+md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
          '4425300ca68d60fb60a6d699e153a519'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
-  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
-
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # move the executables to /usr/bin
+  mkdir -p ${pkgdir}/usr/bin
+  mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
+  rmdir "${pkgdir}/usr/sbin"
+  # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
+  sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
 
   # add gNewSense script
   install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
new file mode 100644
index 000000000..36bfeb18e
--- /dev/null
+++ b/pcr/retroshare/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+# Set this to true to build and install retroshare-nogui
+_build_nogui=false
+
+# Set this to true to build and install the plugins
+_build_linkscloud=true
+_build_feedreader=true
+_build_voip=true
+
+### Nothing to be changed below this line ###
+
+pkgname=retroshare
+pkgver=0.5.4e
+pkgrel=3
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64') 
+url="http://retroshare.sourceforge.net/"
+license=('LGPL' 'GPL')
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
+install="${pkgname}.install"
+
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+	${pkgname}.install \
+	${pkgname}.desktop)
+
+sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
+            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+
+# Add missing dependencies if needed
+[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
+[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
+[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
+
+build() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _qmake='qmake-qt4'
+
+	msg "Compiling OpenPGP-SDK..."
+	cd "${_srcdir}/openpgpsdk/src"
+	$_qmake
+	make
+
+	msg "Compiling libbitdht..."
+	cd "${_srcdir}/libbitdht/src"
+	$_qmake
+	make
+
+	msg "Compiling libretroshare..."
+	cd "${_srcdir}/libretroshare/src"
+	$_qmake
+	make
+
+	msg "Compiling retroshare-gui..."
+	cd "${_srcdir}/retroshare-gui/src"
+	$_qmake
+	make
+
+	if [[ "$_build_voip" == "true" ]] ; then
+		msg "Compiling VOIP plugin..."
+		cd "${_srcdir}/plugins/VOIP"
+		sed -i 's/lessThan.*/true {/' VOIP.pro
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		msg "Compiling FeedReader plugin..."
+		cd "${_srcdir}/plugins/FeedReader"
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		msg "Compiling LinksCloud plugin..."
+		cd "${_srcdir}/plugins/LinksCloud"
+		$_qmake
+		make
+	fi
+
+	if [[ $_build_nogui == "true" ]] ; then
+		msg "Compiling retroshare-nogui..."
+		cd "${_srcdir}/rsctrl/src"
+		make
+		cd "${_srcdir}/retroshare-nogui/src"
+		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+		$_qmake
+		make
+	fi
+}
+
+package() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+
+	# --- Install Files ---
+
+	msg "Installing files to fakeroot-environment..."
+
+	install -D -m 755 \
+		"${_srcdir}/retroshare-gui/src/RetroShare" \
+		"${pkgdir}/usr/bin/${pkgname}"
+
+	if [[ "$_build_nogui" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/retroshare-nogui/src/retroshare-nogui" \
+			"${pkgdir}/usr/bin/${pkgname}-nogui"
+	fi
+
+	# Plugins
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so"
+	fi
+	if [[ "$_build_voip" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/VOIP/libVOIP.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so"
+	fi
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/FeedReader/libFeedReader.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so"
+	fi
+
+	# Icons
+	install -D -m 644 \
+		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+		"${pkgdir}/usr/share/pixmaps/retroshare.png"
+
+	# Desktop File
+	install -D -m 644 \
+		"${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+	# bdboot (needed to bootstrap the DHT)
+	install -D -m 644 \
+		"${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \
+		"${pkgdir}/usr/share/RetroShare/bdboot.txt"
+
+	# Skins
+	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
+	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+}
diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/pcr/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RetroShare
+GenericName=Sharing Network
+Comment=Secure Communication with Your Friends
+Icon=/usr/share/pixmaps/retroshare.png
+Exec=/usr/bin/retroshare
+Terminal=false
+StartupNotify=true
+Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install
new file mode 100644
index 000000000..e48df1361
--- /dev/null
+++ b/pcr/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+post_install() {
+	# Update Desktop DB
+	if [[ -x /usr/bin/update-desktop-database ]]; then
+		echo "Update desktop database..."
+		update-desktop-database -q ;
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}