Date: Sunday, February 13, 2011 @ 12:50:38
Author: bisson
Revision: 109907
cleanup PKGBUILD and install script, add otr supprt (FS#21661)
Added:
bitlbee/trunk/install
(from rev 109842, bitlbee/trunk/bitlbee.install)
Modified:
bitlbee/trunk/PKGBUILD
Deleted:
bitlbee/trunk/bitlbee.install
-----------------+
PKGBUILD | 53 +++++++++++++++++++++++++++--------------------------
bitlbee.install | 18 ------------------
install | 14 ++++++++++++++
3 files changed, 41 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-13 17:38:01 UTC (rev 109906)
+++ PKGBUILD 2011-02-13 17:50:38 UTC (rev 109907)
@@ -6,45 +6,46 @@
pkgname=bitlbee
pkgver=3.0.1
-pkgrel=1
-pkgdesc="An IRC to IM gateway. Supports MSN, ICQ, Jabber, Yahoo!, and AIM"
+pkgrel=2
+pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to
IRC'
arch=('i686' 'x86_64')
-url="http://www.bitlbee.org/";
+url='http://www.bitlbee.org/'
license=('GPL')
-depends=('gnutls' 'glib2')
+depends=('gnutls' 'glib2' 'libotr')
optdepends=('xinetd: to run bitlbee through xinetd')
-install=${pkgname}.install
-backup=(etc/bitlbee/bitlbee.conf etc/bitlbee/motd.txt etc/xinetd.d/bitlbee)
-source=(http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz
+source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz";
'bitlbee.xinetd'
'bitlbee.rcd')
-md5sums=('4d00c6e09859b653f955b16b988db0ac'
- '81e576369e31377f5217e636b00874b1'
- '8cf7500982838f5273ee025eeabfa7fb')
+sha1sums=('f3a0651d723b71b08f0dad3b5cb2843608d5c265'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+ '299776783902cc2e20be49e2fe729572ca656383')
+backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt'
'etc/xinetd.d/bitlbee')
+install=install
+
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
- --ssl=gnutls \
--etcdir=/etc/bitlbee \
--pidfile=/var/run/bitlbee/bitlbee.pid \
- --ipcsocket=/var/run/bitlbee/bitlbee.sock || return 1
- make || return 1
+ --ipcsocket=/var/run/bitlbee/bitlbee.sock \
+ --strip=0 \
+ --otr=1 \
+ --ssl=gnutls
+ make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
- install -dm755 ${pkgdir}/var/lib
- install -o65 -g65 -dm0770 ${pkgdir}/var/lib/bitlbee
- install -dm755 ${pkgdir}/var/run
- install -o65 -g65 -dm755 ${pkgdir}/var/run/bitlbee
- install -Dm644 ${srcdir}/bitlbee.xinetd \
- ${pkgdir}/etc/xinetd.d/bitlbee
- install -Dm755 ${srcdir}/bitlbee.rcd \
- ${pkgdir}/etc/rc.d/bitlbee || return 1
- make DESTDIR=${pkgdir} install || return 1
- make DESTDIR=${pkgdir} install-etc || return 1
- make DESTDIR=${pkgdir} install-dev || return 1
+ install -dm755 "${pkgdir}"/var/{lib,run}
+ install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee
+ install -o65 -g65 -dm755 "${pkgdir}"/var/run/bitlbee
+ install -Dm644 "${srcdir}"/bitlbee.xinetd
"${pkgdir}"/etc/xinetd.d/bitlbee
+ install -Dm755 "${srcdir}"/bitlbee.rcd "${pkgdir}"/etc/rc.d/bitlbee
+
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install-etc
+ make DESTDIR="${pkgdir}" install-dev
}
Deleted: bitlbee.install
===================================================================
--- bitlbee.install 2011-02-13 17:38:01 UTC (rev 109906)
+++ bitlbee.install 2011-02-13 17:50:38 UTC (rev 109907)
@@ -1,18 +0,0 @@
-post_install() {
- echo "-> Bitlbee can run through xinetd or as a daemon for now."
- if [ ! `grep bitlbee /etc/group` ]; then
- groupadd -g 65 bitlbee &>/dev/null;
- fi
-
- id bitlbee &>/dev/null || \
- useradd -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false bitlbee
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- getent passwd bitlbee >/dev/null 2>&1 && userdel bitlbee
- getent group bitlbee >/dev/null 2>&1 && groupdel bitlbee
-}
Copied: bitlbee/trunk/install (from rev 109842, bitlbee/trunk/bitlbee.install)
===================================================================
--- install (rev 0)
+++ install 2011-02-13 17:50:38 UTC (rev 109907)
@@ -0,0 +1,14 @@
+post_install() {
+ echo '==> Bitlbee can run through xinetd or as a daemon for now.'
+ 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
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+ getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+}
