summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/bitlbee-libre/PKGBUILD12
-rw-r--r--libre/bitlbee-libre/bitlbee.install21
-rw-r--r--libre/bitlbee-libre/xinetd2
3 files changed, 21 insertions, 14 deletions
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
index 7e53ce898..74e81a52c 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $
# Contributor: FUBAR <mrfubar@gmail.com>
# Contributor: simo <simo@archlinux.org>
@@ -10,8 +10,8 @@
_pkgname=bitlbee
pkgname=bitlbee-libre
-pkgver=3.2
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support'
url='http://www.bitlbee.org/'
license=('GPL')
@@ -22,12 +22,12 @@ optdepends=('libotr3: for OTR encryption support'
'xinetd: to run bitlbee through xinetd')
provides=$_pkgname=$pkgver
conflicts=$_pkgname
-replaces=("$_pkgname")
+replaces=$_pkgname
source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
'xinetd'
'bitlbee.tmpfiles')
-sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
- 'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
'3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
backup=('etc/bitlbee/bitlbee.conf'
'etc/bitlbee/motd.txt'
diff --git a/libre/bitlbee-libre/bitlbee.install b/libre/bitlbee-libre/bitlbee.install
index aa5a81a70..c8a8f93a1 100644
--- a/libre/bitlbee-libre/bitlbee.install
+++ b/libre/bitlbee-libre/bitlbee.install
@@ -1,15 +1,22 @@
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
+ if ! getent group bitlbee &>/dev/null; then
+ groupadd -r -g 65 bitlbee >/dev/null
+ fi
+ if ! getent passwd bitlbee &>/dev/null; then
+ useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+ fi
+ systemd-tmpfiles --create bitlbee.conf
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
- getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
- true
+ if getent passwd bitlbee &>/dev/null; then
+ userdel bitlbee >/dev/null
+ fi
+ if getent group bitlbee &>/dev/null; then
+ groupdel bitlbee >/dev/null
+ fi
}
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
index 68d5663b3..d671a8cfc 100644
--- a/libre/bitlbee-libre/xinetd
+++ b/libre/bitlbee-libre/xinetd
@@ -6,7 +6,7 @@ service bitlbee
wait = no
user = bitlbee
group = bitlbee
- server = /usr/bin/bitlbee
+ server = /usr/sbin/bitlbee
port = 6667
disable = yes
}