9 files changed, 104 insertions, 10 deletions
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
new file mode 100644
index 000000000..7e53ce898
--- /dev/null
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=bitlbee
+pkgname=bitlbee-libre
+pkgver=3.2
+pkgrel=3
+pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without 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')
+provides=$_pkgname=$pkgver
+conflicts=$_pkgname
+replaces=("$_pkgname")
+source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
+        'xinetd'
+        'bitlbee.tmpfiles')
+sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '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 \
+    --sbindir=/usr/bin \
+    --pidfile=/run/bitlbee/bitlbee.pid \
+    --ipcsocket=/run/bitlbee/bitlbee.sock \
+    --systemdsystemunitdir=/usr/lib/systemd/system \
+    --ssl=gnutls \
+    --strip=0 \
+    --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}
+
+  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/nonprism/bitlbee-nonprism/bitlbee.install b/libre/bitlbee-libre/bitlbee.install
index aa5a81a70..aa5a81a70 100644
--- a/nonprism/bitlbee-nonprism/bitlbee.install
+++ b/libre/bitlbee-libre/bitlbee.install
diff --git a/libre/bitlbee-libre/bitlbee.tmpfiles b/libre/bitlbee-libre/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/libre/bitlbee-libre/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-nonprism/xinetd b/libre/bitlbee-libre/xinetd
index 169134d2b..68d5663b3 100644
--- a/nonprism/bitlbee-nonprism/xinetd
+++ b/libre/bitlbee-libre/xinetd
@@ -6,7 +6,7 @@ service bitlbee
         wait = no
         user = bitlbee
 	group = bitlbee
-        server = /usr/sbin/bitlbee
+        server = /usr/bin/bitlbee
         port = 6667
         disable = yes
-}
-\ No newline at end of file
+}
diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
index d181f3b9f..e48667d52 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186656 2013-05-30 12:19:35Z dreisner $
+# $Id$
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -6,28 +6,29 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=bitlbee
-pkgname=bitlbee-nonprism
+pkgname=bitlbee-libre-nonprism
 pkgver=3.2
 pkgrel=3
 pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
 url='http://www.bitlbee.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
-replaces=("$_pkgname" 'bitlbee-coherence')
-conflicts=$_pkgname
 provides=$_pkgname=$pkgver
+conflicts=$_pkgname
+replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
 source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
         'xinetd'
         'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
-          '81c1185b09bee9520b7b58e295a0ffe43a9b0093'
-          '64b05c7ba522fcdbd0fb57d89ea8320713cc18e9')
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt'
         'etc/xinetd.d/bitlbee')
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install
@@ -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
+}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
new file mode 100644
index 000000000..68d5663b3
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/bin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
deleted file mode 100644
index ebd909675..000000000
--- a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
-\ No newline at end of file