Mon Jul 16 00:01:23 UTC 2012

10 files changed, 116 insertions, 69 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 7cb36e082..56a5b1627 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 155885 2012-04-08 22:21:02Z bisson $
+# $Id: PKGBUILD 163519 2012-07-14 13:10:00Z allan $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=bitlbee
 pkgver=3.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -21,42 +22,42 @@ optdepends=('skype4py: to use skyped'
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
         'sbindir.patch'
         'xinetd'
-        'rc.d')
+        'rc.d'
+        'bitlbee.tmpfiles')
 sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
           '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          'be09d29af3853825778331df451f16ca9e452d03')
-
-backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee')
-install=install
+          '02423c500ac64f673ba26a3395c7c7036c17343e'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+        'etc/bitlbee/motd.txt'
+        'etc/xinetd.d/bitlbee')
+install=bitlbee.install
 
 build() { 
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "$pkgname-$pkgver"
 
 	patch -p1 -i ../sbindir.patch
 
 	./configure \
 		--prefix=/usr \
 		--etcdir=/etc/bitlbee \
-		--pidfile=/var/run/bitlbee/bitlbee.pid \
-		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
+		--pidfile=/run/bitlbee/bitlbee.pid \
+		--ipcsocket=/run/bitlbee/bitlbee.sock \
 		--systemdsystemunitdir=/usr/lib/systemd/system \
 		--ssl=openssl \
 		--strip=0 \
 		--otr=plugin \
-		--skype=plugin \
+		--skype=plugin
 
 	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee
-	install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee
-	install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee
+	make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
 
-	make DESTDIR="${pkgdir}" install
-	make DESTDIR="${pkgdir}" install-etc
-	make DESTDIR="${pkgdir}" install-dev
+	install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
+	install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
+	install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
+	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/extra/bitlbee/bitlbee.install b/extra/bitlbee/bitlbee.install
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/extra/bitlbee/bitlbee.install
@@ -0,0 +1,15 @@
+post_install() {
+	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
+	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+	systemd-tmpfiles --create bitlbee.conf
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
+}
diff --git a/extra/bitlbee/bitlbee.tmpfiles b/extra/bitlbee/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/extra/bitlbee/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d
index bd9248173..ade85221a 100644
--- a/extra/bitlbee/rc.d
+++ b/extra/bitlbee/rc.d
@@ -3,38 +3,47 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-name=bitlbee
-PID=$(pidof -o %PPID /usr/sbin/bitlbee)
-install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee
+pidfile=/run/bitlbee/bitlbee.pid
+if [[ -r $pidfile ]]; then
+  read -r PID < "$pidfile"
+  if [[ ! -d /proc/$PID ]]; then
+    # stale pidfile
+    unset PID
+    rm -f "$pidfile"
+  fi
+fi
 
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && {
-		rm -f /var/run/bitlbee/bitlbee.pid
-		su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee
-	} && {
-		add_daemon $name
-		stat_done
-	} || { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && {
-		kill $PID &>/dev/null
-	} && {
-		rm -f /var/run/bitlbee/bitlbee.pid
-		rm_daemon $name
-		stat_done
-	} || { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
+case $1 in
+  start)
+    stat_busy "Starting bitlbee daemon"
+    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
+      stat_fail
+      exit 1
+    else
+      add_daemon bitlbee
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping bitlbee daemon"
+    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
+      stat_fail
+      exit 1
+    else
+      rm -f "$pidfile"
+      rm_daemon bitlbee
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+    exit 1
+    ;;
 esac
+
+# vim: set ft=sh et ts=2 sw=2:
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 22490edde..3de683b40 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155954 2012-04-09 22:55:13Z giovanni $
+# $Id: PKGBUILD 163532 2012-07-14 18:17:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.12.1
+pkgver=0.13.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('8e07e7d8cf3add3d1facc68993122cf0'
+md5sums=('6977d89ade1c81ccb8310dae0a0d3509'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index ae02c190b..1c08f0df9 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161113 2012-06-08 06:35:06Z andrea $
+# $Id: PKGBUILD 163530 2012-07-14 17:18:19Z dreisner $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.4
-pkgrel=1
+pkgrel=3
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -28,13 +28,14 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
         'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
           'b321b5e613b60231330e606fdf1e124646148388'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514')
@@ -65,13 +66,17 @@ package() {
 	cd "${srcdir}"/build
 	make DESTDIR="${pkgdir}" install
 
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
 	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
 	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
 	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+
 	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
+      "${pkgdir}"/usr/share/xsessions/
 	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
 
 	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
+	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+    install -Dm644 "${srcdir}"/kdm.service \
+      "${pkgdir}"/usr/lib/systemd/system/kdm.service
 }
diff --git a/extra/kdebase-workspace/kdm.service b/extra/kdebase-workspace/kdm.service
new file mode 100644
index 000000000..c57aba920
--- /dev/null
+++ b/extra/kdebase-workspace/kdm.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 539fcd30b..ad8015a92 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163171 2012-07-08 10:16:42Z giovanni $
+# $Id: PKGBUILD 163534 2012-07-14 19:08:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.07.06
+pkgver=2012.07.14
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('7b483136bf58203b4371178da1e530a7')
+md5sums=('9496fd1cf093be9a95f47ef0184bef03')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index c86f0503e..ec5ee7dfd 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150265 2012-02-16 07:51:52Z andrea $
+# $Id: PKGBUILD 163506 2012-07-14 10:11:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-gstreamer
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'phonon' 'mesa')
 provides=('phonon-backend')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('cc380c7612aaaa87294185ded702f88a')
+md5sums=('c0c8a1064e32c83dd6976187dcc491a3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index 4ca16b66e..240f47178 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $
+# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm
 pkgver=1.1.11
-pkgrel=2
+pkgrel=3
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -46,6 +46,10 @@ build() {
       --with-xdmscriptdir=/etc/X11/xdm \
       --with-pixmapdir=/usr/share/xdm/pixmaps
   make
+}
+
+package() {
+  cd "${srcdir}/xdm-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/var/lib/xdm"
   install -m755 -d "${pkgdir}/etc/pam.d"
@@ -54,4 +58,7 @@ build() {
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 
   sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
+
+  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
+    "$pkgdir/usr/lib/systemd/system/xdm.service"
 }