[arch-commits] Commit in bitlbee/repos (14 files)

Dave Reisner dreisner at archlinux.org
Thu Jul 5 23:25:55 UTC 2012


    Date: Thursday, July 5, 2012 @ 19:25:55
  Author: dreisner
Revision: 163025

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  bitlbee/repos/testing-i686/
  bitlbee/repos/testing-i686/PKGBUILD
    (from rev 163024, bitlbee/trunk/PKGBUILD)
  bitlbee/repos/testing-i686/bitlbee.install
    (from rev 163024, bitlbee/trunk/bitlbee.install)
  bitlbee/repos/testing-i686/bitlbee.tmpfiles
    (from rev 163024, bitlbee/trunk/bitlbee.tmpfiles)
  bitlbee/repos/testing-i686/rc.d
    (from rev 163024, bitlbee/trunk/rc.d)
  bitlbee/repos/testing-i686/sbindir.patch
    (from rev 163024, bitlbee/trunk/sbindir.patch)
  bitlbee/repos/testing-i686/xinetd
    (from rev 163024, bitlbee/trunk/xinetd)
  bitlbee/repos/testing-x86_64/
  bitlbee/repos/testing-x86_64/PKGBUILD
    (from rev 163024, bitlbee/trunk/PKGBUILD)
  bitlbee/repos/testing-x86_64/bitlbee.install
    (from rev 163024, bitlbee/trunk/bitlbee.install)
  bitlbee/repos/testing-x86_64/bitlbee.tmpfiles
    (from rev 163024, bitlbee/trunk/bitlbee.tmpfiles)
  bitlbee/repos/testing-x86_64/rc.d
    (from rev 163024, bitlbee/trunk/rc.d)
  bitlbee/repos/testing-x86_64/sbindir.patch
    (from rev 163024, bitlbee/trunk/sbindir.patch)
  bitlbee/repos/testing-x86_64/xinetd
    (from rev 163024, bitlbee/trunk/xinetd)

---------------------------------+
 testing-i686/PKGBUILD           |   63 ++++++++++++++++++++++++++++++++++++++
 testing-i686/bitlbee.install    |   15 +++++++++
 testing-i686/bitlbee.tmpfiles   |    1 
 testing-i686/rc.d               |   49 +++++++++++++++++++++++++++++
 testing-i686/sbindir.patch      |   14 ++++++++
 testing-i686/xinetd             |   12 +++++++
 testing-x86_64/PKGBUILD         |   63 ++++++++++++++++++++++++++++++++++++++
 testing-x86_64/bitlbee.install  |   15 +++++++++
 testing-x86_64/bitlbee.tmpfiles |    1 
 testing-x86_64/rc.d             |   49 +++++++++++++++++++++++++++++
 testing-x86_64/sbindir.patch    |   14 ++++++++
 testing-x86_64/xinetd           |   12 +++++++
 12 files changed, 308 insertions(+)

Copied: bitlbee/repos/testing-i686/PKGBUILD (from rev 163024, bitlbee/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,63 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar at gmail.com>
+# Contributor: simo <simo at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=bitlbee
+pkgver=3.0.5
+pkgrel=4
+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')
+makedepends=('asciidoc' 'libotr')
+optdepends=('skype4py: to use skyped'
+            'libotr: for OTR encryption support'
+            'xinetd: to run bitlbee through xinetd')
+source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
+        'sbindir.patch'
+        'xinetd'
+        'rc.d'
+        'bitlbee.tmpfiles')
+sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
+          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
+          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+          '02423c500ac64f673ba26a3395c7c7036c17343e'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+        'etc/bitlbee/motd.txt'
+        'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() { 
+	cd "$pkgname-$pkgver"
+
+	patch -p1 -i ../sbindir.patch
+
+	./configure \
+		--prefix=/usr \
+		--etcdir=/etc/bitlbee \
+		--pidfile=/run/bitlbee/bitlbee.pid \
+		--ipcsocket=/run/bitlbee/bitlbee.sock \
+		--systemdsystemunitdir=/usr/lib/systemd/system \
+		--ssl=openssl \
+		--strip=0 \
+		--otr=plugin \
+		--skype=plugin
+
+	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 -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
+	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+}

Copied: bitlbee/repos/testing-i686/bitlbee.install (from rev 163024, bitlbee/trunk/bitlbee.install)
===================================================================
--- testing-i686/bitlbee.install	                        (rev 0)
+++ testing-i686/bitlbee.install	2012-07-05 23:25:55 UTC (rev 163025)
@@ -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
+}

Copied: bitlbee/repos/testing-i686/bitlbee.tmpfiles (from rev 163024, bitlbee/trunk/bitlbee.tmpfiles)
===================================================================
--- testing-i686/bitlbee.tmpfiles	                        (rev 0)
+++ testing-i686/bitlbee.tmpfiles	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -

Copied: bitlbee/repos/testing-i686/rc.d (from rev 163024, bitlbee/trunk/rc.d)
===================================================================
--- testing-i686/rc.d	                        (rev 0)
+++ testing-i686/rc.d	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,49 @@
+#!/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:

Copied: bitlbee/repos/testing-i686/sbindir.patch (from rev 163024, bitlbee/trunk/sbindir.patch)
===================================================================
--- testing-i686/sbindir.patch	                        (rev 0)
+++ testing-i686/sbindir.patch	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,14 @@
+diff -aur old/Makefile new/Makefile
+--- old/Makefile	2012-02-18 21:55:09.000000000 +1100
++++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
+@@ -135,8 +135,8 @@
+ 
+ systemd:
+ ifdef SYSTEMDSYSTEMUNITDIR
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
+ endif
+ 
+ install-systemd:

Copied: bitlbee/repos/testing-i686/xinetd (from rev 163024, bitlbee/trunk/xinetd)
===================================================================
--- testing-i686/xinetd	                        (rev 0)
+++ testing-i686/xinetd	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/sbin/bitlbee
+        port = 6667
+        disable = yes
+}

Copied: bitlbee/repos/testing-x86_64/PKGBUILD (from rev 163024, bitlbee/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,63 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar at gmail.com>
+# Contributor: simo <simo at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=bitlbee
+pkgver=3.0.5
+pkgrel=4
+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')
+makedepends=('asciidoc' 'libotr')
+optdepends=('skype4py: to use skyped'
+            'libotr: for OTR encryption support'
+            'xinetd: to run bitlbee through xinetd')
+source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
+        'sbindir.patch'
+        'xinetd'
+        'rc.d'
+        'bitlbee.tmpfiles')
+sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
+          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
+          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+          '02423c500ac64f673ba26a3395c7c7036c17343e'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+        'etc/bitlbee/motd.txt'
+        'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() { 
+	cd "$pkgname-$pkgver"
+
+	patch -p1 -i ../sbindir.patch
+
+	./configure \
+		--prefix=/usr \
+		--etcdir=/etc/bitlbee \
+		--pidfile=/run/bitlbee/bitlbee.pid \
+		--ipcsocket=/run/bitlbee/bitlbee.sock \
+		--systemdsystemunitdir=/usr/lib/systemd/system \
+		--ssl=openssl \
+		--strip=0 \
+		--otr=plugin \
+		--skype=plugin
+
+	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 -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
+	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+}

Copied: bitlbee/repos/testing-x86_64/bitlbee.install (from rev 163024, bitlbee/trunk/bitlbee.install)
===================================================================
--- testing-x86_64/bitlbee.install	                        (rev 0)
+++ testing-x86_64/bitlbee.install	2012-07-05 23:25:55 UTC (rev 163025)
@@ -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
+}

Copied: bitlbee/repos/testing-x86_64/bitlbee.tmpfiles (from rev 163024, bitlbee/trunk/bitlbee.tmpfiles)
===================================================================
--- testing-x86_64/bitlbee.tmpfiles	                        (rev 0)
+++ testing-x86_64/bitlbee.tmpfiles	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -

Copied: bitlbee/repos/testing-x86_64/rc.d (from rev 163024, bitlbee/trunk/rc.d)
===================================================================
--- testing-x86_64/rc.d	                        (rev 0)
+++ testing-x86_64/rc.d	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,49 @@
+#!/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:

Copied: bitlbee/repos/testing-x86_64/sbindir.patch (from rev 163024, bitlbee/trunk/sbindir.patch)
===================================================================
--- testing-x86_64/sbindir.patch	                        (rev 0)
+++ testing-x86_64/sbindir.patch	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,14 @@
+diff -aur old/Makefile new/Makefile
+--- old/Makefile	2012-02-18 21:55:09.000000000 +1100
++++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
+@@ -135,8 +135,8 @@
+ 
+ systemd:
+ ifdef SYSTEMDSYSTEMUNITDIR
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
+ endif
+ 
+ install-systemd:

Copied: bitlbee/repos/testing-x86_64/xinetd (from rev 163024, bitlbee/trunk/xinetd)
===================================================================
--- testing-x86_64/xinetd	                        (rev 0)
+++ testing-x86_64/xinetd	2012-07-05 23:25:55 UTC (rev 163025)
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/sbin/bitlbee
+        port = 6667
+        disable = yes
+}




More information about the arch-commits mailing list