[arch-commits] Commit in bitlbee/repos (22 files)
Dave Reisner
dreisner at archlinux.org
Sat Oct 20 20:58:46 UTC 2012
Date: Saturday, October 20, 2012 @ 16:58:46
Author: dreisner
Revision: 169422
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
bitlbee/repos/extra-i686/PKGBUILD
(from rev 169421, bitlbee/trunk/PKGBUILD)
bitlbee/repos/extra-i686/bitlbee.install
(from rev 169421, bitlbee/trunk/bitlbee.install)
bitlbee/repos/extra-i686/bitlbee.tmpfiles
(from rev 169421, bitlbee/trunk/bitlbee.tmpfiles)
bitlbee/repos/extra-i686/rc.d
(from rev 169421, bitlbee/trunk/rc.d)
bitlbee/repos/extra-i686/xinetd
(from rev 169421, bitlbee/trunk/xinetd)
bitlbee/repos/extra-x86_64/PKGBUILD
(from rev 169421, bitlbee/trunk/PKGBUILD)
bitlbee/repos/extra-x86_64/bitlbee.install
(from rev 169421, bitlbee/trunk/bitlbee.install)
bitlbee/repos/extra-x86_64/bitlbee.tmpfiles
(from rev 169421, bitlbee/trunk/bitlbee.tmpfiles)
bitlbee/repos/extra-x86_64/rc.d
(from rev 169421, bitlbee/trunk/rc.d)
bitlbee/repos/extra-x86_64/xinetd
(from rev 169421, bitlbee/trunk/xinetd)
Deleted:
bitlbee/repos/extra-i686/PKGBUILD
bitlbee/repos/extra-i686/bitlbee.install
bitlbee/repos/extra-i686/bitlbee.tmpfiles
bitlbee/repos/extra-i686/rc.d
bitlbee/repos/extra-i686/sbindir.patch
bitlbee/repos/extra-i686/xinetd
bitlbee/repos/extra-x86_64/PKGBUILD
bitlbee/repos/extra-x86_64/bitlbee.install
bitlbee/repos/extra-x86_64/bitlbee.tmpfiles
bitlbee/repos/extra-x86_64/rc.d
bitlbee/repos/extra-x86_64/sbindir.patch
bitlbee/repos/extra-x86_64/xinetd
-------------------------------+
extra-i686/PKGBUILD | 122 +++++++++++++++++++---------------------
extra-i686/bitlbee.install | 30 ++++-----
extra-i686/bitlbee.tmpfiles | 2
extra-i686/rc.d | 98 ++++++++++++++++----------------
extra-i686/sbindir.patch | 14 ----
extra-i686/xinetd | 24 +++----
extra-x86_64/PKGBUILD | 122 +++++++++++++++++++---------------------
extra-x86_64/bitlbee.install | 30 ++++-----
extra-x86_64/bitlbee.tmpfiles | 2
extra-x86_64/rc.d | 98 ++++++++++++++++----------------
extra-x86_64/sbindir.patch | 14 ----
extra-x86_64/xinetd | 24 +++----
12 files changed, 272 insertions(+), 308 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/PKGBUILD 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,63 +0,0 @@
-# $Id$
-
-# Contributor: FUBAR <mrfubar at gmail.com>
-# Contributor: simo <simo at archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=4
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
- 'libotr: for OTR encryption support'
- 'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
- 'sbindir.patch'
- 'xinetd'
- 'rc.d'
- 'bitlbee.tmpfiles')
-sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
- '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
- '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
- '02423c500ac64f673ba26a3395c7c7036c17343e'
- '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
- 'etc/bitlbee/motd.txt'
- 'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() {
- cd "$pkgname-$pkgver"
-
- patch -p1 -i ../sbindir.patch
-
- ./configure \
- --prefix=/usr \
- --etcdir=/etc/bitlbee \
- --pidfile=/run/bitlbee/bitlbee.pid \
- --ipcsocket=/run/bitlbee/bitlbee.sock \
- --systemdsystemunitdir=/usr/lib/systemd/system \
- --ssl=openssl \
- --strip=0 \
- --otr=plugin \
- --skype=plugin
-
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-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"
-}
Copied: bitlbee/repos/extra-i686/PKGBUILD (from rev 169421, bitlbee/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,59 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar at gmail.com>
+# Contributor: simo <simo at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=bitlbee
+pkgver=3.0.6
+pkgrel=1
+pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
+url='http://www.bitlbee.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('openssl' 'glib2')
+makedepends=('asciidoc' 'libotr')
+optdepends=('skype4py: to use skyped'
+ 'libotr: for OTR encryption support'
+ 'xinetd: to run bitlbee through xinetd')
+source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
+ 'xinetd'
+ 'rc.d'
+ 'bitlbee.tmpfiles')
+sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+ '02423c500ac64f673ba26a3395c7c7036c17343e'
+ '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+ 'etc/bitlbee/motd.txt'
+ 'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --etcdir=/etc/bitlbee \
+ --pidfile=/run/bitlbee/bitlbee.pid \
+ --ipcsocket=/run/bitlbee/bitlbee.sock \
+ --systemdsystemunitdir=/usr/lib/systemd/system \
+ --ssl=openssl \
+ --strip=0 \
+ --otr=plugin \
+ --skype=plugin
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-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"
+}
Deleted: extra-i686/bitlbee.install
===================================================================
--- extra-i686/bitlbee.install 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/bitlbee.install 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,15 +0,0 @@
-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
-}
Copied: bitlbee/repos/extra-i686/bitlbee.install (from rev 169421, bitlbee/trunk/bitlbee.install)
===================================================================
--- extra-i686/bitlbee.install (rev 0)
+++ extra-i686/bitlbee.install 2012-10-20 20:58:46 UTC (rev 169422)
@@ -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
+}
Deleted: extra-i686/bitlbee.tmpfiles
===================================================================
--- extra-i686/bitlbee.tmpfiles 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/bitlbee.tmpfiles 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
Copied: bitlbee/repos/extra-i686/bitlbee.tmpfiles (from rev 169421, bitlbee/trunk/bitlbee.tmpfiles)
===================================================================
--- extra-i686/bitlbee.tmpfiles (rev 0)
+++ extra-i686/bitlbee.tmpfiles 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
Deleted: extra-i686/rc.d
===================================================================
--- extra-i686/rc.d 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/rc.d 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-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 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:
Copied: bitlbee/repos/extra-i686/rc.d (from rev 169421, bitlbee/trunk/rc.d)
===================================================================
--- extra-i686/rc.d (rev 0)
+++ extra-i686/rc.d 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+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 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:
Deleted: extra-i686/sbindir.patch
===================================================================
--- extra-i686/sbindir.patch 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/sbindir.patch 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,14 +0,0 @@
-diff -aur old/Makefile new/Makefile
---- old/Makefile 2012-02-18 21:55:09.000000000 +1100
-+++ new/Makefile 2012-02-20 18:28:08.716130584 +1100
-@@ -135,8 +135,8 @@
-
- systemd:
- ifdef SYSTEMDSYSTEMUNITDIR
-- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
-+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
- endif
-
- install-systemd:
Deleted: extra-i686/xinetd
===================================================================
--- extra-i686/xinetd 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-i686/xinetd 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,12 +0,0 @@
-service bitlbee
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = bitlbee
- group = bitlbee
- server = /usr/sbin/bitlbee
- port = 6667
- disable = yes
-}
Copied: bitlbee/repos/extra-i686/xinetd (from rev 169421, bitlbee/trunk/xinetd)
===================================================================
--- extra-i686/xinetd (rev 0)
+++ extra-i686/xinetd 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,12 @@
+service bitlbee
+{
+ type = UNLISTED
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = bitlbee
+ group = bitlbee
+ server = /usr/sbin/bitlbee
+ port = 6667
+ disable = yes
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/PKGBUILD 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,63 +0,0 @@
-# $Id$
-
-# Contributor: FUBAR <mrfubar at gmail.com>
-# Contributor: simo <simo at archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=4
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
- 'libotr: for OTR encryption support'
- 'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
- 'sbindir.patch'
- 'xinetd'
- 'rc.d'
- 'bitlbee.tmpfiles')
-sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
- '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
- '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
- '02423c500ac64f673ba26a3395c7c7036c17343e'
- '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
- 'etc/bitlbee/motd.txt'
- 'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() {
- cd "$pkgname-$pkgver"
-
- patch -p1 -i ../sbindir.patch
-
- ./configure \
- --prefix=/usr \
- --etcdir=/etc/bitlbee \
- --pidfile=/run/bitlbee/bitlbee.pid \
- --ipcsocket=/run/bitlbee/bitlbee.sock \
- --systemdsystemunitdir=/usr/lib/systemd/system \
- --ssl=openssl \
- --strip=0 \
- --otr=plugin \
- --skype=plugin
-
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-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"
-}
Copied: bitlbee/repos/extra-x86_64/PKGBUILD (from rev 169421, bitlbee/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,59 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar at gmail.com>
+# Contributor: simo <simo at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=bitlbee
+pkgver=3.0.6
+pkgrel=1
+pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
+url='http://www.bitlbee.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('openssl' 'glib2')
+makedepends=('asciidoc' 'libotr')
+optdepends=('skype4py: to use skyped'
+ 'libotr: for OTR encryption support'
+ 'xinetd: to run bitlbee through xinetd')
+source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
+ 'xinetd'
+ 'rc.d'
+ 'bitlbee.tmpfiles')
+sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+ '02423c500ac64f673ba26a3395c7c7036c17343e'
+ '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+ 'etc/bitlbee/motd.txt'
+ 'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --etcdir=/etc/bitlbee \
+ --pidfile=/run/bitlbee/bitlbee.pid \
+ --ipcsocket=/run/bitlbee/bitlbee.sock \
+ --systemdsystemunitdir=/usr/lib/systemd/system \
+ --ssl=openssl \
+ --strip=0 \
+ --otr=plugin \
+ --skype=plugin
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-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"
+}
Deleted: extra-x86_64/bitlbee.install
===================================================================
--- extra-x86_64/bitlbee.install 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/bitlbee.install 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,15 +0,0 @@
-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
-}
Copied: bitlbee/repos/extra-x86_64/bitlbee.install (from rev 169421, bitlbee/trunk/bitlbee.install)
===================================================================
--- extra-x86_64/bitlbee.install (rev 0)
+++ extra-x86_64/bitlbee.install 2012-10-20 20:58:46 UTC (rev 169422)
@@ -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
+}
Deleted: extra-x86_64/bitlbee.tmpfiles
===================================================================
--- extra-x86_64/bitlbee.tmpfiles 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/bitlbee.tmpfiles 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
Copied: bitlbee/repos/extra-x86_64/bitlbee.tmpfiles (from rev 169421, bitlbee/trunk/bitlbee.tmpfiles)
===================================================================
--- extra-x86_64/bitlbee.tmpfiles (rev 0)
+++ extra-x86_64/bitlbee.tmpfiles 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
Deleted: extra-x86_64/rc.d
===================================================================
--- extra-x86_64/rc.d 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/rc.d 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-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 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:
Copied: bitlbee/repos/extra-x86_64/rc.d (from rev 169421, bitlbee/trunk/rc.d)
===================================================================
--- extra-x86_64/rc.d (rev 0)
+++ extra-x86_64/rc.d 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+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 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:
Deleted: extra-x86_64/sbindir.patch
===================================================================
--- extra-x86_64/sbindir.patch 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/sbindir.patch 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,14 +0,0 @@
-diff -aur old/Makefile new/Makefile
---- old/Makefile 2012-02-18 21:55:09.000000000 +1100
-+++ new/Makefile 2012-02-20 18:28:08.716130584 +1100
-@@ -135,8 +135,8 @@
-
- systemd:
- ifdef SYSTEMDSYSTEMUNITDIR
-- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
-+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
- endif
-
- install-systemd:
Deleted: extra-x86_64/xinetd
===================================================================
--- extra-x86_64/xinetd 2012-10-20 20:58:22 UTC (rev 169421)
+++ extra-x86_64/xinetd 2012-10-20 20:58:46 UTC (rev 169422)
@@ -1,12 +0,0 @@
-service bitlbee
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = bitlbee
- group = bitlbee
- server = /usr/sbin/bitlbee
- port = 6667
- disable = yes
-}
Copied: bitlbee/repos/extra-x86_64/xinetd (from rev 169421, bitlbee/trunk/xinetd)
===================================================================
--- extra-x86_64/xinetd (rev 0)
+++ extra-x86_64/xinetd 2012-10-20 20:58:46 UTC (rev 169422)
@@ -0,0 +1,12 @@
+service bitlbee
+{
+ type = UNLISTED
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = bitlbee
+ group = bitlbee
+ server = /usr/sbin/bitlbee
+ port = 6667
+ disable = yes
+}
More information about the arch-commits
mailing list