Mon Jul 16 00:01:23 UTC 2012

4 files changed, 79 insertions, 53 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: