Thu Jun 14 00:01:48 UTC 2012

10 files changed, 46 insertions, 30 deletions

diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 531b66b53..7d8596688 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160605 2012-06-02 20:59:03Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 161614 2012-06-12 13:49:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Color daemon"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/software/colord"
@@ -30,7 +30,8 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install \
+    bashcompletiondir=/usr/share/bash-completion/completions
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 62cddc3ea..8b4743dc0 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158084 2012-05-02 16:51:02Z ibiru $
+# $Id: PKGBUILD 161615 2012-06-12 13:50:01Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
@@ -25,7 +25,7 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 5958f8989..bf9c650c0 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158713 2012-05-08 07:40:05Z andrea $
+# $Id: PKGBUILD 161633 2012-06-12 18:06:14Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.24
+pkgver=5.5.25
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('dc84f8a0305e054c859533944e79f803'
+md5sums=('9e2a3d5b41eac7fae41b93e5b71ea49c'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 19314794c..062789e17 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 159464 2012-05-24 16:48:31Z andyrtr $
+# $Id: PKGBUILD 161621 2012-06-12 15:12:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
-_amalgamationver=3071201
+_amalgamationver=3071300
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
 #pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.12.1
+pkgver=3.7.13
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
@@ -21,8 +21,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('eb7bbd258913518ad30971ea7ecb0ca9'
-         '3d2b368a64a08766ea37b5162e019091'
+md5sums=('c97df403e8a3d5b67bb408fcd6aabd8e'
+         '16a003d5a619a6c725e3d81cf5aaba2a'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 5b2177e49..c08d468bc 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156994 2012-04-23 09:10:49Z ibiru $
+# $Id: PKGBUILD 161616 2012-06-12 13:51:10Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
 pkgver=1.94.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -26,5 +26,6 @@ build() {
 
 package() {
   cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install \
+    bash_completiondir=/usr/share/bash-completion/completions
 }
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 9900010da..58583a274 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158878 2012-05-12 16:51:09Z andyrtr $
+# $Id: PKGBUILD 161623 2012-06-12 15:20:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('963276a5dd240e84efff28d516f8d23cfeedaa13'
-          '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
+sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
+            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index 1edcddd16..4ca16b66e 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,38 +1,42 @@
-# $Id: PKGBUILD 140275 2011-10-11 21:28:00Z jgc $
+# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm
 pkgver=1.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit')
-makedepends=('pkgconfig' 'xorg-util-macros')
+makedepends=('pkgconfig' 'xorg-util-macros' 'systemd' 'xtrans')
 backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
 options=('!libtool')
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
         Xsession-loginshell.patch
         Xsession-xsm.patch
         xdm-consolekit.patch
+        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
         xdm.pam)
 md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19'
          '234ae568e7b22cbc09433bb396ff3d80'
          '2c30078c50bc653d72eb5114506eb313'
-         '46b11173b58e2241577d5ffd48ab8f8d'
-         '419d6289ba6f851135f5c70c0e3cbec4')
+         '25c6d8adeed0796d432b2bbf1d83a7e9'
+         '13032add23a0a8d48a638418094bfc00'
+         '6de9362b1bf0835026270b20d8029909')
 sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
             'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
             '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a'
-            '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b')
+            '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76'
+            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
+            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418')
 
 build() {
   cd "${srcdir}/xdm-${pkgver}"
   patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
   patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
   patch -Np1 -i "${srcdir}/xdm-consolekit.patch"
+  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
 
   autoreconf -fi
   ./configure --prefix=/usr \
diff --git a/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
new file mode 100644
index 000000000..195858883
--- /dev/null
+++ b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
@@ -0,0 +1,8 @@
+--- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
++++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
+@@ -8,3 +8,5 @@
+ # causing serious grief.
+ #
+ chown $USER /dev/console
++exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
++        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch
index 7d85b97e0..c52a26138 100644
--- a/extra/xorg-xdm/xdm-consolekit.patch
+++ b/extra/xorg-xdm/xdm-consolekit.patch
@@ -97,7 +97,7 @@
 +	LogError("console-kit-daemon not running?\n");
 +	ck_connector_unref(connector);
 +	connector = NULL;
-+	return 0;
++	return 1;
 +    }
 +
 +    verify->userEnviron = setEnv(verify->userEnviron,
diff --git a/extra/xorg-xdm/xdm.pam b/extra/xorg-xdm/xdm.pam
index 862b83fa2..a0b601db6 100644
--- a/extra/xorg-xdm/xdm.pam
+++ b/extra/xorg-xdm/xdm.pam
@@ -6,3 +6,5 @@ account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
 session		required	pam_limits.so
+session		required	pam_loginuid.so
+-session	optional	pam_systemd.so