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

Conflicts:
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/libkexiv2/PKGBUILD
	testing/akonadi/PKGBUILD
	testing/k3b/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/openldap/PKGBUILD
	testing/openldap/slapd

37 files changed, 842 insertions, 169 deletions

diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index 99ddd75ba..73968cd4b 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-spacenav-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index f7962892f..8e2791853 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64667 2012-02-17 15:34:11Z lfleischer $
+# $Id: PKGBUILD 74674 2012-08-01 19:22:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
 # Contributor: bender02 at gmx dot com
 
 pkgname=dvtm
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc='Dynamic virtual terminal manager.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.brain-dump.org/projects/dvtm/'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('ncurses')
 source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('d8ef63bad5b48324ad040630c51a1c26'
+md5sums=('c565067557c9be4cdc63aecd0932452e'
          '50ae76c4b33864f0cf051417443cc422')
 
 build() {
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index e509458b5..6f526c274 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 74562 2012-07-30 14:14:51Z spupykin $
+# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
 license=('GPL')
 depends=('gcc-libs' 'bash')
 install=incron.install
-source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
-    	'incron.init')
 options=('emptydirs')
+source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
+	'incron.init'
+	'incrond.service')
 md5sums=('67f8b671db8169edccc8ef11c7d2c8be'
-         '648e1ca1a4b1e624401d9d71aa3756b3')
+         '648e1ca1a4b1e624401d9d71aa3756b3'
+         '859a90af9e4efe40db381ea07167a66a')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -38,4 +40,5 @@ package() {
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
   install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond
+  install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
 }
diff --git a/community/incron/incrond.service b/community/incron/incrond.service
new file mode 100644
index 000000000..54fcfa9d2
--- /dev/null
+++ b/community/incron/incrond.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Inotify System Scheduler
+
+[Service]
+Type=forking
+PIDFile=/run/incrond.pid
+ExecStart=/usr/sbin/incrond
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index f45e81d84..0220e4316 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 70971 2012-05-21 01:19:45Z stephane $
+# $Id: PKGBUILD 74680 2012-08-02 00:56:11Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.0_20120408
+pkgver=4.0_20120613
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
-source=("http://threadingbuildingblocks.org/uploads/77/185/4.0%20update%204/tbb40_20120408oss_src.tgz")
-sha1sums=('04390147d40b86ae6291a9971a9c8afd327db718')
+source=("http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb${pkgver/\./}oss_src.tgz")
+sha1sums=('48569b88450a78e8f1e7251500fdd951bb197f1b')
 
 build() {
   cd "${srcdir}"/tbb${pkgver/\./}oss
diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD
index ee1994319..463cc832a 100644
--- a/community/python-gnutls/PKGBUILD
+++ b/community/python-gnutls/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 72721 2012-06-21 11:07:34Z spupykin $
+# $Id: PKGBUILD 74656 2012-08-01 13:54:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: N3RD3X <n3rd3x@linuxmail.org>
 
 pkgname=python-gnutls
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
 depends=('python2' 'gnutls')
 license=('LGPL')
-source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e3536c421291a791869d875a41dcb26a')
+source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	gnutls3.patch)
+md5sums=('e3536c421291a791869d875a41dcb26a'
+         '24bc95d9f5e71e9f5e180706cbb09248')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 <$srcdir/gnutls3.patch
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/community/python-gnutls/gnutls3.patch b/community/python-gnutls/gnutls3.patch
new file mode 100644
index 000000000..5110de2f2
--- /dev/null
+++ b/community/python-gnutls/gnutls3.patch
@@ -0,0 +1,271 @@
+diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
+--- gnutls/library/functions.py	2011-08-19 04:48:14.000000000 +0100
++++ gnutls.fixed/library/functions.py	2012-08-01 11:56:43.450975419 +0100
+@@ -4,7 +4,7 @@
+ import sys
+ from ctypes import *
+ 
+-from gnutls.library import libgnutls, libgnutls_extra
++from gnutls.library import libgnutls
+ from gnutls.library.types import *
+ 
+ 
+@@ -121,14 +121,6 @@
+ gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t)
+ 
+-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas
+-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_cas.restype = None
+-
+-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls
+-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_crls.restype = None
+-
+ gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence
+ gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int]
+ gnutls_certificate_send_x509_rdn_sequence.restype = None
+@@ -221,10 +213,6 @@
+ gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)]
+ gnutls_certificate_type_set_priority.restype = c_int
+ 
+-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers
+-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t]
+-gnutls_certificate_verify_peers.restype = c_int
+-
+ gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2
+ gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_verify_peers2.restype = c_int
+@@ -393,10 +381,6 @@
+ gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)]
+ gnutls_error_to_alert.restype = c_int
+ 
+-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version
+-gnutls_extra_check_version.argtypes = [c_char_p]
+-gnutls_extra_check_version.restype = c_char_p
+-
+ gnutls_fingerprint = libgnutls.gnutls_fingerprint
+ gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
+ gnutls_fingerprint.restype = c_int
+@@ -409,10 +393,6 @@
+ gnutls_global_init.argtypes = []
+ gnutls_global_init.restype = c_int
+ 
+-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra
+-gnutls_global_init_extra.argtypes = []
+-gnutls_global_init_extra.restype = c_int
+-
+ gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function
+ gnutls_global_set_log_function.argtypes = [gnutls_log_func]
+ gnutls_global_set_log_function.restype = None
+@@ -461,86 +441,6 @@
+ gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_hex_encode.restype = c_int
+ 
+-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials
+-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)]
+-gnutls_ia_allocate_client_credentials.restype = c_int
+-
+-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials
+-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)]
+-gnutls_ia_allocate_server_credentials.restype = c_int
+-
+-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable
+-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_enable.restype = None
+-
+-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send
+-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_endphase_send.restype = c_int
+-
+-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret
+-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_extract_inner_secret.restype = None
+-
+-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials
+-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_free_client_credentials.restype = None
+-
+-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials
+-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_free_server_credentials.restype = None
+-
+-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge
+-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_generate_challenge.restype = c_int
+-
+-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr
+-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_get_client_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr
+-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_get_server_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake
+-gnutls_ia_handshake.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake.restype = c_int
+-
+-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p
+-gnutls_ia_handshake_p.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake_p.restype = c_int
+-
+-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret
+-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_permute_inner_secret.restype = c_int
+-
+-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv
+-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_recv.restype = ssize_t
+-
+-gnutls_ia_send = libgnutls_extra.gnutls_ia_send
+-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_send.restype = ssize_t
+-
+-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function
+-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_client_avp_function.restype = None
+-
+-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr
+-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p]
+-gnutls_ia_set_client_avp_ptr.restype = None
+-
+-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function
+-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_server_avp_function.restype = None
+-
+-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr
+-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p]
+-gnutls_ia_set_server_avp_ptr.restype = None
+-
+-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase
+-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_verify_endphase.restype = c_int
+-
+ gnutls_init = libgnutls.gnutls_init
+ gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t]
+ gnutls_init.restype = c_int
+@@ -733,10 +633,6 @@
+ gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t]
+ gnutls_psk_free_server_credentials.restype = None
+ 
+-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key
+-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)]
+-gnutls_psk_netconf_derive_key.restype = c_int
+-
+ gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username
+ gnutls_psk_server_get_username.argtypes = [gnutls_session_t]
+ gnutls_psk_server_get_username.restype = c_char_p
+@@ -857,10 +753,6 @@
+ gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t]
+ gnutls_session_enable_compatibility_mode.restype = None
+ 
+-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random
+-gnutls_session_get_client_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_client_random.restype = c_void_p
+-
+ gnutls_session_get_data = libgnutls.gnutls_session_get_data
+ gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_data.restype = c_int
+@@ -873,18 +765,10 @@
+ gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_id.restype = c_int
+ 
+-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret
+-gnutls_session_get_master_secret.argtypes = [gnutls_session_t]
+-gnutls_session_get_master_secret.restype = c_void_p
+-
+ gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr
+ gnutls_session_get_ptr.argtypes = [gnutls_session_t]
+ gnutls_session_get_ptr.restype = c_void_p
+ 
+-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random
+-gnutls_session_get_server_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_server_random.restype = c_void_p
+-
+ gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed
+ gnutls_session_is_resumed.argtypes = [gnutls_session_t]
+ gnutls_session_is_resumed.restype = c_int
+@@ -905,10 +789,6 @@
+ gnutls_set_default_priority.argtypes = [gnutls_session_t]
+ gnutls_set_default_priority.restype = c_int
+ 
+-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name
+-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t]
+-gnutls_sign_algorithm_get_name.restype = c_char_p
+-
+ gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get
+ gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)]
+ gnutls_sign_callback_get.restype = gnutls_sign_func
+@@ -937,14 +817,6 @@
+ gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int]
+ gnutls_transport_set_errno.restype = None
+ 
+-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno
+-gnutls_transport_set_global_errno.argtypes = [c_int]
+-gnutls_transport_set_global_errno.restype = None
+-
+-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat
+-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int]
+-gnutls_transport_set_lowat.restype = None
+-
+ gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr
+ gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t]
+ gnutls_transport_set_ptr.restype = None
+@@ -1501,10 +1373,6 @@
+ gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+ gnutls_x509_privkey_sign_hash.restype = c_int
+ 
+-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data
+-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+-gnutls_x509_privkey_verify_data.restype = c_int
+-
+ gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
+ gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_x509_rdn_get.restype = c_int
+diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
+--- gnutls/library/__init__.py	2011-11-11 17:23:49.000000000 +0000
++++ gnutls.fixed/library/__init__.py	2012-08-01 11:57:42.284290997 +0100
+@@ -53,6 +53,9 @@
+     else:
+         raise RuntimeError('cannot find lib%s on this system' % name)
+ 
++def do_nothing(*args, **kwargs):
++    pass
++
+ 
+ def initialize_gcrypt():
+     from ctypes import c_void_p
+@@ -104,7 +107,7 @@
+         libgcrypt = load_library(name='gcrypt', version=11)
+         gcry_control = libgcrypt.gcry_control
+     else:
+-        gcry_control = libgnutls.gcry_control
++        gcry_control = do_nothing
+ 
+     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
+     if system == 'cygwin':
+@@ -117,12 +120,10 @@
+ 
+ 
+ 
+-libgnutls = load_library(name='gnutls', version=26)
+-libgnutls_extra = load_library(name='gnutls-extra', version=26)
++libgnutls = load_library(name='gnutls', version=28)
+ 
+ initialize_gcrypt()
+ libgnutls.gnutls_global_init()
+-libgnutls_extra.gnutls_global_init_extra()
+ 
+ 
+ from gnutls.library import constants
+@@ -136,9 +137,6 @@
+ if functions.gnutls_check_version(__need_version__) is None:
+     version = functions.gnutls_check_version(None)
+     raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
+-if functions.gnutls_extra_check_version(__need_version__) is None:
+-    version = functions.gnutls_extra_check_version(None)
+-    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
+ 
+ 
+ del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 672ece806..9b212e8e2 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70698 2012-05-15 08:14:57Z arodseth $
+# $Id: PKGBUILD 74649 2012-08-01 07:21:31Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
 pkgname=python-pymongo
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Python driver for MongoDB"
 arch=('x86_64' 'i686' 'mips64el')
@@ -12,12 +12,12 @@ url="http://pypi.python.org/pypi/pymongo/"
 depends=('python')
 makedepends=('python-distribute')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('ac7952896ecfd5d9b4b9d8bb0077c95a0296ea21374df85e2ca32c237c0be57f')
+sha256sums=('0a6251742736dd3c80025e701ec97ea1540bc97df26ada7b3bf40ff01daa7032')
 
 package() {
   cd "$srcdir/pymongo-$pkgver"
 
-  LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index efa5f6f66..45c6dc52d 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73902 2012-07-16 23:37:35Z dwallace $
+# $Id: PKGBUILD 74657 2012-08-01 15:35:10Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -8,7 +8,7 @@
 
 pkgname=sage-mathematics
 pkgver=5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
@@ -53,11 +53,6 @@ build() {
   # comment out if you're only building it for yourself
   export SAGE_FAT_BINARY='yes'
 
-  # set ATLAS_ARCH to provide the most compatibility. try fast or just leaving it black if
-  # compiling for yourself. http://trac.sagemath.org/sage_trac/ticket/10226
-  # export SAGE_ATLAS_ARCH=fast
-  export SAGE_ATLAS_ARCH=base
-
   # can't write to root in a clean chroot
   export DOT_SAGE='/build/src/'
 
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index eb69418ac..1ef985d0b 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73535 2012-07-09 09:16:10Z spupykin $
+# $Id: PKGBUILD 74642 2012-08-01 04:56:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
@@ -9,21 +9,17 @@ kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim)
 pkgbase=tesseract
 pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 pkgver=3.01
-pkgrel=2
+pkgrel=3
 pkgdesc="An OCR programm"
 arch=(x86_64 i686 'mips64el')
 url="http://code.google.com/p/tesseract-ocr"
 license=("APACHE")
 depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica)
 source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz
         $(for l in ${_langs[@]}; do
         echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz
         done))
 md5sums=('1ba496e51a42358fb9d3ffe781b2d20a'
-         '127e0b742b615d81c3b97a555acd8285'
-         '06fce5f5c0221286eab591819406d91e'
          'f4ae2e5668f693cc51c6e3c3f57a8f1d'
          '3787ff0fc1a07517203466830f6f868e'
          '7b50075692e7a07ac8f59e0cde51cfb9'
diff --git a/core/krb5/MITKRB5-SA-2012-001.patch b/core/krb5/MITKRB5-SA-2012-001.patch
new file mode 100644
index 000000000..938b56570
--- /dev/null
+++ b/core/krb5/MITKRB5-SA-2012-001.patch
@@ -0,0 +1,61 @@
+diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
+index 23623fe..8ada9d0 100644
+--- a/src/kdc/do_as_req.c
++++ b/src/kdc/do_as_req.c
+@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
+     krb5_enctype useenctype;
+     struct as_req_state *state;
+ 
+-    state = malloc(sizeof(*state));
++    state = calloc(sizeof(*state), 1);
+     if (!state) {
+         (*respond)(arg, ENOMEM, NULL);
+         return;
+@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
+     state->authtime = 0;
+     state->c_flags = 0;
+     state->req_pkt = req_pkt;
++    state->inner_body = NULL;
+     state->rstate = NULL;
+     state->sname = 0;
+     state->cname = 0;
+diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
+index 9d8cb34..d4ece3f 100644
+--- a/src/kdc/kdc_preauth.c
++++ b/src/kdc/kdc_preauth.c
+@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request,
+                 continue;
+ 
+             }
+-            if (request_contains_enctype(context, request, db_etype)) {
++            if (krb5_is_permitted_enctype(context, db_etype) &&
++                request_contains_enctype(context, request, db_etype)) {
+                 retval = _make_etype_info_entry(context, client->princ,
+                                                 client_key, db_etype,
+                                                 &entry[i], etype_info2);
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index a43b291..94dad3a 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request,
+         return 0;
+     pa.magic = KV5M_PA_DATA;
+     pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP;
++    memset(&checksum, 0, sizeof(checksum));
+     retval = krb5_c_make_checksum(kdc_context,0, reply_key,
+                                   KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum);
+     if (retval != 0)
+diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
+index c4bf92e..367c894 100644
+--- a/src/lib/kdb/kdb_default.c
++++ b/src/lib/kdb/kdb_default.c
+@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
+     krb5_boolean        saw_non_permitted = FALSE;
+ 
+     ret = 0;
++    if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype))
++        return KRB5_KDB_NO_PERMITTED_KEY;
++
+     if (kvno == -1 && stype == -1 && ktype == -1)
+         kvno = 0;
+ 
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index a2973f06c..cb2fa1547 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $
+# $Id: PKGBUILD 164510 2012-08-01 10:29:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
@@ -20,7 +20,8 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-si
         krb5-kpropd
         krb5-kpropd.service
         krb5-kpropd@.service
-        krb5-kpropd.socket)
+        krb5-kpropd.socket
+        MITKRB5-SA-2012-001.patch)
 sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
           '78b759d566b1fdefd9bbcd06df14f07f12effe96'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
@@ -30,7 +31,8 @@ sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
           '7f402078fa65bb9ff1beb6cbbbb017450df78560'
           '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
           '023a8164f8ee7066ac814486a68bc605e79f6101'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
+          'f3677d30dbbd7106c581379c2c6ebb1bf7738912'
+          '7b32dd24e68dc801efb8be280083e4d8067e392a')
 options=('!emptydirs')
 
 build() {
@@ -46,6 +48,9 @@ build() {
    # FS#25384
    sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
 
+   # Fix KDC heap corruption and crash vulnerabilities
+   patch -Np2 -i ../../MITKRB5-SA-2012-001.patch
+
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD
index 99e000df3..72edc8776 100644
--- a/core/wpa_actiond/PKGBUILD
+++ b/core/wpa_actiond/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 155389 2012-04-03 08:18:09Z thomas $
+# $Id: PKGBUILD 164502 2012-08-01 09:59:07Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=wpa_actiond
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
 arch=('i686' 'x86_64' 'mips64el')
@@ -9,7 +9,7 @@ url="http://projects.archlinux.org/wpa_actiond.git/"
 license=('GPL')
 depends=('glibc' 'wpa_supplicant')
 source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('578efa1141fbf1acb56efff8061f4ac7ab99f257f8a3e1588db51a8ce77ac2b5')
+sha256sums=('4523b76980198666ac93f3a3772a10554ef608e6a18ab9eb1346303ee3a6f4b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 42bc6ceec..9aa5e46a1 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,34 +1,50 @@
-# $Id: PKGBUILD 158006 2012-04-30 22:55:59Z ibiru $
+# $Id: PKGBUILD 164512 2012-08-01 11:18:32Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
-pkgname=anjuta
-pkgver=3.4.1
+pkgbase=anjuta
+pkgname=('libanjuta' 'anjuta')
+pkgver=3.4.4
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
+url="http://www.anjuta.org/"
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('92edd96d7b7df178405cd229ff72d284c5499ad4496702f4efac7178e2d84369')
+sha256sums=('e97199a6b59bb25f0908018b141b3d6b2dbc23804b84b4be34be669f8556ef7a')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgbase-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make
 }
 
-package(){
-  cd "$pkgname-$pkgver"
+package_libanjuta(){
+  pkgdesc="Anjuta runtime library"
+  depends=('gdl')
+  conflicts=('anjuta<3.4.4')
+
+  cd "$pkgbase-$pkgver/libanjuta"
 
   # j1: Race during linking
   make -j1 DESTDIR="$pkgdir" install
+}
+
+package_anjuta(){
+  pkgdesc="GNOME Integrated Development Environment (IDE)"
+  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
+
+  install=anjuta.install
+
+  cd "$pkgbase-$pkgver"
+  make -j1 DESTDIR="$pkgdir" install
 
+  cd libanjuta
+  make -j1 DESTDIR="$pkgdir" uninstall
+  
   sed -i "1s|#!/usr/bin/python$|&2|" \
     $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
 }
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index b7d08bdc9..9349f02e7 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 157946 2012-04-30 07:18:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 164645 2012-08-01 17:50:06Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=cfitsio
-pkgver=3.300
+pkgver=3.310
 pkgrel=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +13,12 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-md5sums=('5045e82a30495ce23fd4be2c67b987f8')
+md5sums=('75b6411751c7f308d45b281b7beb92d6')
 
 build() {
   cd "${srcdir}"/${pkgname}
   ./configure --prefix=/usr
-  make  shared 
+  make shared
 }
 
 check() {
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index f716f733e..570f988a5 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163971 2012-07-23 03:03:28Z allan $
+# $Id: PKGBUILD 164655 2012-08-01 19:38:29Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.8
-pkgrel=2
+pkgver=2.1.9
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
@@ -22,8 +22,8 @@ install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('c6d962653b0a7f2ab8d892b53ddf0101'
-         '99118d4accb282d70242e813975d86b5'
+md5sums=('3cb45a55c011a2f8599ad70ccfaaf8f5'
+         '4ad189a6203aa1b2a595e7587908364a'
          '587159e84e2da6f83d70b3c706ba87cc'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 4d1807997..cc2ec9ed6 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 158564 2012-05-04 23:57:06Z allan $
+#$Id: PKGBUILD 164501 2012-08-01 09:36:07Z jgc $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -13,11 +13,14 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gpg-agent-fix-encoding.patch)
+sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249'
+            '05ae4ec8db316b1b7552099721226e3a211bcf3d2445f1ea464d26bf31590760')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/gpg-agent-fix-encoding.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \
diff --git a/extra/gnome-keyring/gpg-agent-fix-encoding.patch b/extra/gnome-keyring/gpg-agent-fix-encoding.patch
new file mode 100644
index 000000000..e6a7412b3
--- /dev/null
+++ b/extra/gnome-keyring/gpg-agent-fix-encoding.patch
@@ -0,0 +1,86 @@
+From d31a26df7ce8d9c084b9c66fe00458683dde9864 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Thu, 28 Jun 2012 15:51:54 +0200
+Subject: [PATCH] gpg-agent: Encode passwords when --data was requested
+
+ * Use URI encoding to return passwords when gnupg calls us with
+   a --data argument.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=678771
+---
+ daemon/gpg-agent/gkd-gpg-agent-ops.c |   41 ++++++++++++++++++++++++++++++----
+ 1 file changed, 37 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
+index be6c4d3..a1a21ff 100644
+--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
++++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
+@@ -632,11 +632,12 @@ command_has_option (gchar *command, gchar *option)
+ 	return has_option;
+ }
+ 
++static const char HEXC[] = "0123456789abcdef";
++
+ /* Encode a password in hex */
+ static gchar*
+-encode_password (const gchar *pass)
++hex_encode_password (const gchar *pass)
+ {
+-	static const char HEXC[] = "0123456789abcdef";
+ 	int j, c;
+ 	gchar *enc, *k;
+ 
+@@ -656,6 +657,36 @@ encode_password (const gchar *pass)
+ 	return enc;
+ }
+ 
++static gchar*
++uri_encode_password (const gchar *value)
++{
++	gchar *p;
++	gchar *result;
++
++	/* Just allocate for worst case */
++	result = egg_secure_alloc ((strlen (value) * 3) + 1);
++
++	/* Now loop through looking for escapes */
++	p = result;
++	while (*value) {
++
++		/* These characters we let through verbatim */
++		if (*value && (g_ascii_isalnum (*value) || strchr ("_-.", *value) != NULL)) {
++			*(p++) = *(value++);
++
++		/* All others get encoded */
++		} else {
++			*(p++) = '%';
++			*(p++) = HEXC[((unsigned char)*value) >> 4];
++			*(p++) = HEXC[((unsigned char)*value) & 0x0F];
++			++value;
++		}
++	}
++
++	*p = 0;
++	return result;
++}
++
+ /* ----------------------------------------------------------------------------------
+  * OPERATIONS
+  */
+@@ -737,10 +768,12 @@ gkd_gpg_agent_ops_getpass (GkdGpgAgentCall *call, gchar *args)
+ 	if (password == NULL) {
+ 		gkd_gpg_agent_send_reply (call, FALSE, "111 cancelled");
+ 	} else if (flags & GKD_GPG_AGENT_PASS_AS_DATA) {
+-		gkd_gpg_agent_send_data (call, password);
++		encoded = uri_encode_password (password);
++		gkd_gpg_agent_send_data (call, encoded);
+ 		gkd_gpg_agent_send_reply (call, TRUE, NULL);
++		egg_secure_strfree (encoded);
+ 	} else {
+-		encoded = encode_password (password);
++		encoded = hex_encode_password (password);
+ 		gkd_gpg_agent_send_reply (call, TRUE, encoded);
+ 		egg_secure_strfree (encoded);
+ 	}
+-- 
+1.7.10.2
\ No newline at end of file
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index 2c7160bbe..33cb31baf 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 164364 2012-07-31 19:42:49Z eric $
+# $Id: PKGBUILD 164515 2012-08-01 13:53:49Z jgc $
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
 license=('GPL')
-depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
+depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
 makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
 optdepends=('libmp4v2: MP4/h264 support'
             'vorbis-tools: OGG support'
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index b12233bbb..7c1de7797 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.2
+pkgver=1.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit')
 source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d')
+sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index e8051d7d1..f0f7b821a 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 153280 2012-03-12 20:33:58Z andyrtr $
+# $Id: PKGBUILD 164517 2012-08-01 14:21:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.2
+pkgver=1.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d')
+sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6')
 
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD
index bb96277ef..75784fd1a 100644
--- a/extra/libthai/PKGBUILD
+++ b/extra/libthai/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156262 2012-04-16 13:46:17Z jgc $
+# $Id: PKGBUILD 164508 2012-08-01 10:14:01Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com>
 
 pkgname=libthai
-pkgver=0.1.17
+pkgver=0.1.18
 pkgrel=1
 pkgdesc="Thai language support routines"
 url="http://linux.thai.net/projects/libthai"
@@ -13,7 +13,7 @@ depends=('libdatrie')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d94ddbf5e5a09a911c459f0a4ad1c041')
+md5sums=('0250fc5255c1e62b23f88c2d6b1d6262')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index b77bf726f..ef53e42c1 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162022 2012-06-18 22:10:00Z ibiru $
+# $Id: PKGBUILD 164506 2012-08-01 10:09:37Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('d36d7b65a38f5b43ebd50ad3ad227120'
+md5sums=('1a8cad110e0ae94f538610a00f595b33'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index daa218742..d5d87e527 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 162046 2012-06-19 06:07:57Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 164647 2012-08-01 18:37:45Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.46
+pkgver=0.47
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('glib2' 'bluez' 'libical')
+makedepends=('bluez' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('625f0417d119437429c9cce29479cfa4')
+md5sums=('af721152055c40a226e374c2dd989901')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -23,7 +22,7 @@ build() {
 
 package_obexd-client() {
   pkgdesc="D-Bus service providing high-level OBEX client side functionality"
-  depends=('bluez' 'glib2')
+  depends=('bluez')
   provides=("obexd=${pkgver}")
   replaces=('obexd')
   conflicts=('obexd')
@@ -37,7 +36,7 @@ package_obexd-client() {
 
 package_obexd-server() {
   pkgdesc="D-Bus service providing high-level OBEX server side functionality"
-  depends=('bluez' 'glib2' 'libical')
+  depends=('bluez' 'libical')
   conflicts=('obex-data-server')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/src"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 075c242cd..2f91724c0 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163624 2012-07-17 12:46:32Z bisson $
+# $Id: PKGBUILD 164657 2012-08-02 00:26:06Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.9.3
-pkgrel=3
+pkgver=2.9.4
+pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
@@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p
         'aliases.patch'
         'service'
         'rc.d')
-sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d'
+sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           'af621cf064813d9ddb13ffd579fee33e6b82d4be'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index b822b938a..e1342e7a3 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 154446 2012-03-28 18:30:40Z andrea $
+# $Id: PKGBUILD 164649 2012-08-01 18:38:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=pycups
-pkgver=1.9.61
+pkgver=1.9.62
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 url="http://cyberelk.net/tim/software/pycups/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libcups' 'python2')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('7464093b349b907dcdefb913674e959b'
-         'cb780142a614300792a08d462e198589')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('b62fb397c0997dc4adf44487f4bdf5ae'
+         'ced304a64389f2a0cf4178acc002562d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD
index 32dfc6840..1b950c66e 100644
--- a/extra/rssh/PKGBUILD
+++ b/extra/rssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149042 2012-02-05 15:15:17Z bisson $
+# $Id: PKGBUILD 164390 2012-08-01 04:02:33Z bisson $
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=rssh
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp'
 url='http://www.pizzashack.org/rssh/'
 license=('custom:rssh')
@@ -12,17 +12,20 @@ arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/rssh.conf')
 depends=('openssh')
 source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz"
+        'env-breach.patch'
         'destdir.patch'
         'rsync.patch')
 sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
+          '434712f82f24c60834a10142ca5c49b8a57555a7'
           '85bd1694decae5872cbeeafd578b147eb13313c6'
-          '41f32f8a77b3a2b924ede6044ab67846e06b5d20')
+          '86564eab4493f4b4502a022e5938babb31450a00')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	patch -p1 -i ../env-breach.patch # FS#30950
+	patch -p1 -i ../rsync.patch # FS#21783
 	patch -p1 -i ../destdir.patch
-	patch -p1 -i ../rsync.patch # FS#21783, debian patch
 
 	./configure \
 		--prefix=/usr \
diff --git a/extra/rssh/env-breach.patch b/extra/rssh/env-breach.patch
new file mode 100644
index 000000000..e9193c7bd
--- /dev/null
+++ b/extra/rssh/env-breach.patch
@@ -0,0 +1,228 @@
+--- rssh-2.3.3/main.c.in	2010-08-01 15:43:30.000000000 -0400
++++ rssh-2.3.3/main.c.in	2012-05-11 16:44:39.000000000 -0400
+@@ -184,7 +184,7 @@
+ 	 * determine if the command in cmdline is acceptable to run, and store
+ 	 * name of program to exec in cmd
+ 	 */
+-	if ( !(*cmd = check_command_line(cmdline, opts)) ) return NULL;
++	if ( !(*cmd = get_command(cmdline, opts)) ) return NULL;
+ 
+ 	/* if we need to do chroot processing, do it */
+ 	if ( opts->shell_flags & RSSH_USE_CHROOT ){
+@@ -252,7 +252,9 @@
+ 	}
+ 
+ 	/* return vector of pointers to command line arguments */
+-	return build_arg_vector(cmdline, 0);
++	argvec = build_arg_vector(cmdline, 0);
++	if (check_command_line(argvec, opts)) return argvec;
++	else return NULL;
+ }
+ 
+ void vers_info( void )
+--- rssh-2.3.3/util.c	2010-08-01 09:07:00.000000000 -0400
++++ rssh-2.3.3/util.c	2012-05-11 16:43:10.000000000 -0400
+@@ -106,7 +106,7 @@
+ 	/* print error message to user and log attempt */
+ 	fprintf(stderr, "\nThis account is restricted by rssh.\n"
+ 		"%s\n\nIf you believe this is in error, please contact "
+-	        "your system administrator.\n\n", cmd);
++		"your system administrator.\n\n", cmd);
+ 	if ( argc < 3 )
+ 		log_msg("user %s attempted to log in with a shell",
+ 			username);
+@@ -132,31 +132,35 @@
+  */
+ bool opt_exist(char *cl, char opt)
+ {
+-	int	i = 0;
++	int	i = 1;
+ 	int	len;
+-	char	*token;
+-	bool	optstring = FALSE;
+-
+ 
+ 	len = strlen(cl);
+ 
+ 	/* process command line character by character */
+-	while ( i < (len - 2) ){
+-		if ( cl[i] == ' ' || cl[i] == '\t' ){
+-			if ( cl[i+1] == '-' ){ 
+-				optstring = TRUE;
+-				i+=2;
+-			}
+-		}
+-		if ( cl[i] == opt && optstring ) return TRUE;
+-		if ( cl[i] == ' ' || cl[i] == '\t' || cl[i] == '-' ) 
+-			optstring = FALSE;
++	if (!(cl[0] == '-')) return FALSE;
++	while ( i < (len) ){
++		if ( cl[i] == opt ) return TRUE;
+ 		i++;
+ 	}
+ 	return FALSE;
+ }
+ 
+ 
++bool opt_filter(char **vec, const char opt)
++{
++	while (vec && *vec){
++		if (opt_exist(*vec, opt)){
++			fprintf(stderr, "\nillegal insecure %c option", opt);
++			log_msg("insecure %c option in scp command line!", opt);
++			return TRUE;
++		}
++		vec++;
++	}
++	return FALSE;
++}
++
++
+ bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag )
+ {
+ 	int	cl_len;		/* length of command line */
+@@ -186,69 +190,78 @@
+ 	return FALSE;
+ }
+ 
++
+ /*
+  * check_command_line() - take the command line passed to rssh, and verify
+- * 			  that the specified command is one the user is
+- * 			  allowed to run.  Return the path of the command
+- * 			  which will be run if it is ok, or return NULL if it
+- * 			  is not.
++ *			  that the specified command is one the user is
++ *			  allowed to run and validate the arguments.  Return the
++ *			  path of the command which will be run if it is ok, or
++ *			  return NULL if it is not.
+  */
+-char *check_command_line( char *cl, ShellOptions_t *opts )
++char *check_command_line( char **cl, ShellOptions_t *opts )
+ {
+ 
+-	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
++	if ( check_command(*cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
+ 		return PATH_SFTP_SERVER;
+ 
+-	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
++	if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
+ 		/* filter -S option */
+-		if ( opt_exist(cl, 'S') ){
+-			fprintf(stderr, "\ninsecure -S option not allowed.");
+-			log_msg("insecure -S option in scp command line!");
+-			return NULL;
+-		}
++		if ( opt_filter(cl, 'S') ) return NULL;
+ 		return PATH_SCP;
+ 	}
+ 
+-	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
+-		if ( opt_exist(cl, 'e') ){
+-			fprintf(stderr, "\ninsecure -e option not allowed.");
+-			log_msg("insecure -e option in cvs command line!");
+-			return NULL;
+-		}
++	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
++		if ( opt_filter(cl, 'e') ) return NULL;
+ 		return PATH_CVS;
+ 	}
+ 
+-	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
++	if ( check_command(*cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
+ 		/* filter -P option */
+-		if ( opt_exist(cl, 'P') ){
+-			fprintf(stderr, "\ninsecure -P option not allowed.");
+-			log_msg("insecure -P option in rdist command line!");
+-			return NULL;
+-		}
++		if ( opt_filter(cl, 'P') ) return NULL;
+ 		return PATH_RDIST;
+ 	}
+ 
+-	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
++	if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
+ 		/* filter -e option */
+-		if ( opt_exist(cl, 'e') ){
+-			fprintf(stderr, "\ninsecure -e option not allowed.");
+-			log_msg("insecure -e option in rdist command line!");
+-			return NULL;
+-		}
+-		
+-		if ( strstr(cl, "--rsh=" ) ){
+-			fprintf(stderr, "\ninsecure --rsh= not allowed.");
+-			log_msg("insecure --rsh option in rsync command line!");
+-			return NULL;
++		if ( opt_filter(cl, 'e') ) return NULL;
++		while (cl && *cl){
++			if ( strstr(*cl, "--rsh=" ) ){
++				fprintf(stderr, "\ninsecure --rsh= not allowed.");
++				log_msg("insecure --rsh option in rsync command line!");
++				return NULL;
++			}
+ 		}
+-
+ 		return PATH_RSYNC;
+ 	}
++	/* No match, return NULL */
++	return NULL;
++}
++
++
++/*
++ * get_command() - take the command line passed to rssh, and verify
++ *		   that the specified command is one the user is allowed to run.
++ *		   Return the path of the command which will be run if it is ok,
++ *		   or return NULL if it is not.
++ */
++char *get_command( char *cl, ShellOptions_t *opts )
++{
+ 
++	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
++		return PATH_SFTP_SERVER;
++	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) )
++		return PATH_SCP;
++	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) )
++		return PATH_CVS;
++	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) )
++		return PATH_RDIST;
++	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) )
++		return PATH_RSYNC;
+ 	return NULL;
+ }
+ 
+ 
++
+ /*
+  * extract_root() - takes a root directory and the full path to some other
+  *                  directory, and returns a pointer to a string which
+@@ -264,7 +277,7 @@
+ 	len = strlen(root);
+ 	/* get rid of a trailing / from the root path */
+ 	if ( root[len - 1] == '/' ){
+-	       	root[len - 1] = '\0';
++		root[len - 1] = '\0';
+ 		len--;
+ 	}
+ 	if ( (strncmp(root, path, len)) ) return NULL;
+@@ -309,7 +322,7 @@
+  *                     same name, and returns FALSE if the bits are not valid
+  */
+ int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
+-	       	     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
++		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
+ {
+ 	int	i;
+ 
+--- rssh-2.3.3/util.h	2006-12-21 17:22:38.000000000 -0500
++++ rssh-2.3.3/util.h	2012-05-11 16:21:12.000000000 -0400
+@@ -33,7 +33,8 @@
+ #include "rsshconf.h"
+ 
+ void fail( int flags, int argc, char **argv );
+-char *check_command_line( char *cl, ShellOptions_t *opts );
++char *check_command_line( char **cl, ShellOptions_t *opts );
++char *get_command( char *cl, ShellOptions_t *opts);
+ char *extract_root( char *root, char *path );
+ int  validate_umask( const char *temp, int *mask );
+ int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
diff --git a/extra/rssh/rsync.patch b/extra/rssh/rsync.patch
index cafd6c54b..7d0a51195 100644
--- a/extra/rssh/rsync.patch
+++ b/extra/rssh/rsync.patch
@@ -1,6 +1,6 @@
-diff -aur old//util.c new//util.c
---- old//util.c	2010-08-01 15:07:00.000000000 +0200
-+++ new//util.c	2010-11-25 18:16:24.086709600 +0100
+diff -Naur old/util.c new/util.c
+--- old/util.c	2012-08-01 13:48:47.803620731 +1000
++++ new/util.c	2012-08-01 13:55:13.622614598 +1000
 @@ -56,6 +56,7 @@
  #ifdef HAVE_LIBGEN_H
  #include <libgen.h>
@@ -9,8 +9,8 @@ diff -aur old//util.c new//util.c
  
  /* LOCAL INCLUDES */
  #include "pathnames.h"
-@@ -187,6 +188,33 @@
- }
+@@ -192,6 +193,33 @@
+ 
  
  /*
 + * check_rsync_e() - take the command line passed to rssh and look for a -e
@@ -41,17 +41,14 @@ diff -aur old//util.c new//util.c
 +
 +/*
   * check_command_line() - take the command line passed to rssh, and verify
-  * 			  that the specified command is one the user is
-  * 			  allowed to run.  Return the path of the command
-@@ -230,9 +258,9 @@
+  *			  that the specified command is one the user is
+  *			  allowed to run and validate the arguments.  Return the
+@@ -211,7 +239,7 @@
+ 	}
+ 
+ 	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
+-		if ( opt_filter(cl, 'e') ) return NULL;
++		if ( opt_filter(cl, 'e') && !check_rsync_e(cl) ) return NULL;
+ 		return PATH_CVS;
+ 	}
  
- 	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
- 		/* filter -e option */
--		if ( opt_exist(cl, 'e') ){
-+		if ( opt_exist(cl, 'e') && !check_rsync_e(cl) ){
- 			fprintf(stderr, "\ninsecure -e option not allowed.");
--			log_msg("insecure -e option in rdist command line!");
-+			log_msg("insecure -e option in rsync command line!");
- 			return NULL;
- 		}
- 		
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 1ebfdbcd5..d64942b22 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 148922 2012-02-05 11:56:01Z ibiru $
+# $Id: PKGBUILD 164496 2012-08-01 06:55:11Z remy $
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scribus
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scribus.net"
@@ -18,17 +18,19 @@ depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
 makedepends=('cmake')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ae19e62399941fb8e868d8e762caf494')
-sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
+md5sums=('c79593dc61bc137d9e7968b37d070993')
+sha1sums=('fb48bc492d79abc2275b1903692defe9b3931adf')
 
 build() {
 	cd "${srcdir}"
+
 	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
 	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+               Scribus/scribus/plugins/scriptplugin/{samples,scripts}/*
+
 	mkdir build
 	cd build
-	cmake ../${pkgname}-${pkgver} \
+	cmake ../Scribus \
 	   -DCMAKE_INSTALL_PREFIX=/usr \
 	   -DCMAKE_BUILD_TYPE=Release \
 	   -DCMAKE_SKIP_RPATH=ON \
@@ -43,8 +45,8 @@ package() {
 
 	# fix icon path in .desktop file
 	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
+	   "${srcdir}/Scribus/scribus.desktop"
 
-	install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
+	install -Dm644 "${srcdir}/Scribus/scribus.desktop" \
 	   "${pkgdir}/usr/share/applications/scribus.desktop"
 }
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 117f5a583..1a2648c2a 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160371 2012-06-01 12:58:45Z dreisner $
+# $Id: PKGBUILD 164651 2012-08-01 18:41:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
-pkgver=1.3.9
-pkgrel=3
+pkgver=1.3.10
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
              'libusb-compat' 'desktop-file-utils')
 source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('df424f127eede63965608e5ec5e27519'
-         'd105b7f7725c1ec538b6e6adb10667f3')
+md5sums=('9de9df07c4c97afa2cea3be2f05d6c18'
+         '8ef4287a04761bd0b96e8ec44a92c92c')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index ecac89959..06dedce66 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164195 2012-07-27 14:22:36Z andyrtr $
+# $Id: PKGBUILD 164523 2012-08-01 14:34:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf')
+sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2788e21d9..6e3228359 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 550ad4b3f..bed0b129a 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160829 2012-06-06 16:14:38Z andrea $
+# $Id: PKGBUILD 164089 2012-07-26 16:54:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('a1d6951b27c868c738a36dbd21702b658f3d6245'
+sha1sums=('f5c358e3c7902b15328908a9966f98774827988e'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 25084c92c..0d3517f1c 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162798 2012-06-30 15:30:51Z andrea $
+# $Id: PKGBUILD 164627 2012-08-01 15:06:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.8.4
-pkgrel=4
+pkgver=4.9.0
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
@@ -18,18 +18,16 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'media-player-info')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 provides=("kdelibs=$pkgver")
-replaces=('kdelibs-experimental' 'kdelibs')
+replaces=('kdelibs')
 conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
-        'fix-application-crashes.patch'
         'khtml-fsdg.diff')
-sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
+sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
-          'c271c712bf202f517015b597d61cfe1aed0db82b'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -40,9 +38,7 @@ build() {
 
        # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
        patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
-
-       # KDEBUG 301453
-       patch -p1 -i "${srcdir}"/fix-application-crashes.patch
+       
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 66a48fea5..c1df1004f 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 160882 2012-06-06 16:17:23Z andrea $
+# $Id: PKGBUILD 164151 2012-07-26 16:58:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'libktorrent' 'libmms' 'mediastreamer')
-    source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458')
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d')
 
 build() {
     cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 5558e73f4..7d80e341e 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160887 2012-06-06 16:17:38Z andrea $
+# $Id: PKGBUILD 164156 2012-07-26 16:58:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -14,12 +14,12 @@ groups=('kde' 'kdeutils')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
 optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+install=${_pkgname}.install
 provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
-install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('1d0d311beb8beeee7f33a58baef7f95192eb69ac')
+sha1sums=('60c535370da1edf03481fdc1ef3f04f9269d54e2')
 
 build() {
   cd "${srcdir}"