diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-19 01:05:57 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-19 01:05:57 -0700 |
| commit | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (patch) | |
| tree | 513a073013b058d237750fe3214cd466cbeaf1b6 /extra/bitlbee | |
| parent | 55c3b92ede6a3b9eb17f254b338931f01a3ea5c6 (diff) | |
Fri Apr 19 01:05:57 PDT 2013
Diffstat (limited to 'extra/bitlbee')
| -rw-r--r-- | extra/bitlbee/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/bitlbee/rc.d | 49 |
2 files changed, 4 insertions, 56 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index ef8176d1f..e293ebcdf 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $ +# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,23 +9,21 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=1 +pkgrel=2 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') +depends=('gnutls' 'glib2') makedepends=('asciidoc' 'libotr3') optdepends=('skype4py: to use skyped' 'libotr3: 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=('21e17f082c776566429603b1e8c966983a75ac9e' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' @@ -41,7 +39,7 @@ build() { --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=openssl \ + --ssl=gnutls \ --strip=0 \ --otr=plugin \ --skype=plugin @@ -58,6 +56,5 @@ package() { 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/rc.d b/extra/bitlbee/rc.d deleted file mode 100644 index ade85221a..000000000 --- a/extra/bitlbee/rc.d +++ /dev/null @@ -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: |