Wed May 22 00:46:35 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-05-22 00:46:35 -0700
committer: root <root@rshg054.dnsready.net> 2013-05-22 00:46:35 -0700
commit: bdf2189826c1931878cedc2262f67f6fd3c0ef15 (patch)
tree: 36ebbf884af31c36516746e43961ddf1f88fd452 /extra
parent: 4a7d2439a50adfa30bed83cc92ee80ec62476a20 (diff)
31 files changed, 106 insertions, 178 deletions
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 73cb62ff0..18a040887 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185456 2013-05-14 10:24:22Z heftig $
+# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=(i686 x86_64)
@@ -14,19 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v
              python)
 url="http://www.anjuta.org/"
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        fix-compile-error.patch)
-sha256sums=('096203a294e0a7d8d7048fa74810495d590d32f96b7a7f014f34e532faa1c76e'
-            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95')
 
 build() {
   cd "$pkgbase-$pkgver"
 
-  patch -Np1 -i ../fix-compile-error.patch
-
-  # Bump vala version
-  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
-
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
   make
diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch
deleted file mode 100644
index bc8fa7c41..000000000
--- a/extra/anjuta/fix-compile-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c
---- anjuta-3.8.0/libanjuta/anjuta-token.c	2013-01-14 22:45:09.000000000 +0100
-+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c	2013-03-31 13:56:11.722332230 +0200
-@@ -329,7 +329,7 @@
- 	if (string == NULL)
- 	{
- 		/* Value doesn't contain a newline */
--		fprintf (stderr, "(%lu)", length);
-+		fprintf (stderr, "(%lu)", (long unsigned)length);
- 	}
- 	else
- 	{
-diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c
---- anjuta-3.8.0/plugins/dir-project/dir-project.c	2012-11-19 00:34:57.000000000 +0100
-+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c	2013-03-31 13:55:35.922610895 +0200
-@@ -268,7 +268,7 @@
- 			{
- 				ptr++;
- 			} while  (*ptr == '?');
--			g_string_append_printf (regex, "(.{%d})", ptr - next);
-+			g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next));
- 		}
- 		else if (*ptr == '\\')
- 		{
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 1caedc0b9..7210764cd 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $
+# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -45,8 +45,8 @@ package () {
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
+         'b0b8d19a10c2145476d9fbb18c0478fe'
          '5f3a89fbfb10c47755d3ca19183b8a59'
-         '832c8e8098e2dfa56040c975b554590c'
+         'a10aa2ef613551a88d750f6602b5f2f7'
          '38a00db6d9d765d130b2d8d3a98e5c24'
          'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service
index 0760a5b85..7ab8de318 100644
--- a/extra/hylafax/faxq.service
+++ b/extra/hylafax/faxq.service
@@ -3,7 +3,7 @@ Description=Hyla FAX queue manager
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/faxq
+ExecStart=/usr/bin/faxq
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily
index 2d1a77e5c..567dd8ed3 100644
--- a/extra/hylafax/hylafax.cron.daily
+++ b/extra/hylafax/hylafax.cron.daily
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/sbin/faxqclean
-/usr/sbin/faxcron -rcv 30
+/usr/bin/faxqclean
+/usr/bin/faxcron -rcv 30
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 29534340d..733c62366 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -15,7 +15,7 @@ pkgver=4.0.5
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=4.0.5
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
  cd ${srcdir}/samba-${_realver}
   ./configure --enable-fhs \
               --prefix=/usr \
+              --sbindir=/usr/bin \
               --libdir=/usr/lib \
               --localstatedir=/var \
               --with-configdir=/etc/samba \
@@ -196,12 +197,12 @@ install=samba.install
 
     find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \
          xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-    find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \
+    find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \
          xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
 
     # Make admin scripts look in the right place for the samba python module
-    for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
-                  sbin/samba_upgradedns bin/samba-tool
+    for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \
+                  bin/samba_upgradedns bin/samba-tool
     do
         sed -i "/^sys\.path\.insert/ a\
 sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
@@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-
 md5sums=('58ec2fec08872b72f8fd526f2da20a9e'
          '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         'ee8507839745cf17d2fb5401be7da6a8'
          '96f82c38f3f540b53f3e5144900acf17'
-         '5602ba59bc60502c99e6d5a5ae16aecf'
+         'ee4763a656cf00d92bfda31b6bb2c5cb'
          '6c447748a064d631435dbef0a3dcf32f'
-         'd0b18dd7f5fafc8d25cb3a7c37c6d920'
+         'c0c561c47de24d33dd48aae79823810b'
          'a78b9aa93eb14b0ac445897395693225'
-         '90845b89f2321cb19c0b13f385f1782a'
-         '70186fa43510bf99e3afd5951e814fbf'
+         'e8ebc966b5684a557284dd435daaab7f'
+         '70afd2db60a2e8eff7615dbdecd887ac'
          '6db11f3dd2112a4b7a73007b189bef3f'
-         'b0de262f9c62acd162e873658f33d063'
-         '64a52bc798033aeabfae3410bd559aa4'
+         'fd6be0cf1e5b3f0c3599fdb95455d19f'
+         '081c20b9d994d69ce5c37dcf96f10572'
          '49abd7b719e3713a3f75a8a50958e381')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
index 4f86c4db9..34c66d5d6 100644
--- a/extra/samba/nmbd.service
+++ b/extra/samba/nmbd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D 
+ExecStart=/usr/bin/nmbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/samba b/extra/samba/samba
deleted file mode 100755
index 6098ee0cb..000000000
--- a/extra/samba/samba
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
-	start)
-		rc=0
-		stat_busy "Starting Samba Server"
-                if [ ! -x /var/log/samba ] ; then
-                        install -m755 -d /var/log/samba
-                fi
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] && /usr/sbin/$d -D
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba
-			stat_done
-		fi
-	;;
-	stop)
-		rc=0
-		stat_busy "Stopping Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] || kill $PID &> /dev/null
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			rm /run/samba/smbd.pid &>/dev/null
-			rm /run/samba/nmbd.pid &>/dev/null
-			rm /run/samba/winbindd.pid &>/dev/null
-			rm_daemon samba
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/samba/samba.service b/extra/samba/samba.service
index e423a7d2d..562d42562 100644
--- a/extra/samba/samba.service
+++ b/extra/samba/samba.service
@@ -7,7 +7,7 @@ Type=forking
 PIDFile=/var/run/samba.pid
 LimitNOFILE=16384
 EnvironmentFile=-/etc/conf.d/samba
-ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ExecStart=/usr/bin/samba $SAMBAOPTIONS
 ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
index 12c08474a..de34c2a5f 100644
--- a/extra/samba/smbd.service
+++ b/extra/samba/smbd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service
 [Service]
 Type=forking
 PIDFile=/var/run/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
+ExecStart=/usr/bin/smbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service
index e1f71be3f..071eb5788 100644
--- a/extra/samba/smbd@.service
+++ b/extra/samba/smbd@.service
@@ -2,6 +2,6 @@
 Description=Samba SMB/CIFS server instance
 
 [Service]
-ExecStart=/usr/sbin/smbd -F
+ExecStart=/usr/bin/smbd -F
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd
index 2e62a82b2..b083ad860 100644
--- a/extra/samba/swat.xinetd
+++ b/extra/samba/swat.xinetd
@@ -3,7 +3,7 @@ service swat
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/swat
+        server                  = /usr/bin/swat
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service
index a036b2c03..ebbc31c47 100644
--- a/extra/samba/swat@.service
+++ b/extra/samba/swat@.service
@@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool
 After=local-fs.target
 
 [Service]
-ExecStart=/usr/sbin/swat
+ExecStart=/usr/bin/swat
 StandardInput=socket
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
index 02e3014b1..20bac9a83 100644
--- a/extra/samba/winbindd.service
+++ b/extra/samba/winbindd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service
 [Service]
 Type=forking
 PIDFile=/var/run/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D 
+ExecStart=/usr/bin/winbindd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 6ec245c68..df0b53381 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $
+# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc')
+sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 294b9af44..2d219ed16 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $
+# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e')
+sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index b4bbdfc43..8ffa77001 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $
+# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a')
+sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 381f9c610..6f11d8c1a 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $
+# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
 makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709')
+sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index d698242bd..4ac21e494 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $
+# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de')
+sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 2adaa1652..26f91b71f 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $
+# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821')
+sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index cd38cc095..d41e628bb 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $
+# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-desktop-applets
 _pkgname=ktp-desktop-applets
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07')
+sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 62eb1109f..7e80d9e95 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $
+# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214')
+sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 397e4b620..a39601fe7 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $
+# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930')
+sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 99a821e8d..220cd0417 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $
+# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00')
+sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 74cddc43f..65b5ecf6f 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $
+# $Id: PKGBUILD 186194 2013-05-21 22:02:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.6.1
+pkgver=0.6.2.1
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b')
+sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15')
 
 build() {
   mkdir build
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index d058ce54a..35ca53f0c 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185610 2013-05-15 22:57:00Z tomegun $
+# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -21,6 +21,9 @@ build() {
   patch -p1 < ../drop-pci-db.patch
 
   make
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
 }
 
 package() {
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 93c024e79..9ae7f37fd 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $
+# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -22,6 +22,9 @@ build() {
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --localstatedir=/var --disable-static
   make
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules
 }
 
 package() {
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index c6f12a215..2b17d70c5 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185995 2013-05-20 07:12:08Z tpowa $
+# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
@@ -41,3 +41,8 @@ md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
          'a920123fc620bcedbccb703a8d1bdc55'
          'cb8ace28e8efd4dad128be4be71b3b07'
          '63033c33565e2030541c5e05e9d9b063')
+md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
+         '7d9bc56d2e561d849e915000d1c0f269'
+         'a920123fc620bcedbccb703a8d1bdc55'
+         'f47d3372382dc9d67c1174d2796729fe'
+         '63033c33565e2030541c5e05e9d9b063')
diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample
index c5a5b7d88..f7e0660a4 100644
--- a/extra/vde2/vde-config.sample
+++ b/extra/vde2/vde-config.sample
@@ -6,7 +6,7 @@ VDE_NUMPORTS="32"  # Number of ports (default 32)
 VDE_HUB="no"       # [yes|no] Make the switch act as a hub
 VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
 VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
+VDE_PRIORITY=""    # Set the priority for FST (MAC extension)
 VDE_HASHSIZE=""    # Hash table size
 
 # Options from datasock module
@@ -32,4 +32,4 @@ SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
 SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
 SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
 # other options to parse to slirpvde
-SLIRP_OPTIONS=""
-\ No newline at end of file
+SLIRP_OPTIONS=""
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index 89cdd0d67..02518029a 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -1,41 +1,41 @@
-# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $
+# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-dict
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="A dictionary plugin for the Xfce panel"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-dict"
+license=('GPL2')
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg')
+depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme')
 makedepends=('intltool')
 provides=('xfce4-dict-plugin')
 conflicts=('xfce4-dict-plugin')
 replaces=('xfce4-dict-plugin')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2)
-md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
+sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58')
 
 build() {
-  cd ${srcdir}/xfce4-dict-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Work around DSO linking issue
-  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
-
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/xfce4-dict-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-dict/xfce4-dict.install
+++ b/extra/xfce4-dict/xfce4-dict.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
author	root <root@rshg054.dnsready.net>	2013-05-22 00:46:35 -0700
committer	root <root@rshg054.dnsready.net>	2013-05-22 00:46:35 -0700
commit	bdf2189826c1931878cedc2262f67f6fd3c0ef15 (patch)
tree	36ebbf884af31c36516746e43961ddf1f88fd452 /extra
parent	4a7d2439a50adfa30bed83cc92ee80ec62476a20 (diff)