summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/bitlbee-libre/PKGBUILD27
-rw-r--r--libre/bitlbee-libre/xinetd12
2 files changed, 9 insertions, 30 deletions
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
index 0a5e6d5f8..77793b795 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $
+# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $
# Contributor (Arch): FUBAR <mrfubar@gmail.com>
# Contributor (Arch): simo <simo@archlinux.org>
@@ -10,28 +10,24 @@
_pkgname=bitlbee
pkgname=bitlbee-libre
-pkgver=3.2.1
-pkgrel=2.2
+pkgver=3.2.2
+pkgrel=1
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support'
url='http://www.bitlbee.org/'
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('gnutls' 'glib2')
-makedepends=('asciidoc' 'libotr3')
-optdepends=('libotr3: for OTR encryption support'
- 'xinetd: to run bitlbee through xinetd')
+makedepends=('asciidoc' 'libotr')
+optdepends=('libotr: for OTR encryption support')
provides=($_pkgname=$pkgver)
conflicts=($_pkgname)
replaces=($_pkgname)
-source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
- 'xinetd'
+source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
'bitlbee.tmpfiles')
-sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
- '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
'3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
backup=('etc/bitlbee/bitlbee.conf'
- 'etc/bitlbee/motd.txt'
- 'etc/xinetd.d/bitlbee')
+ 'etc/bitlbee/motd.txt')
install=bitlbee.install
build() {
@@ -49,17 +45,12 @@ build() {
--otr=plugin \
--skype=0
- # hacky: build against libotr3
- sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
- sed -i 's,#include.*libotr,&3,' otr.h
-
make
}
package() {
- make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+ make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
- install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
}
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/libre/bitlbee-libre/xinetd
+++ /dev/null
@@ -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
-}