Date: Monday, November 14, 2011 @ 16:37:49 Author: bisson Revision: 142768
archrelease: copy trunk to testing-i686, testing-x86_64 Added: bitlbee/repos/testing-i686/ bitlbee/repos/testing-i686/PKGBUILD (from rev 142767, bitlbee/trunk/PKGBUILD) bitlbee/repos/testing-i686/install (from rev 142767, bitlbee/trunk/install) bitlbee/repos/testing-i686/msn.patch (from rev 142767, bitlbee/trunk/msn.patch) bitlbee/repos/testing-i686/rc.d (from rev 142767, bitlbee/trunk/rc.d) bitlbee/repos/testing-i686/xinetd (from rev 142767, bitlbee/trunk/xinetd) bitlbee/repos/testing-x86_64/ bitlbee/repos/testing-x86_64/PKGBUILD (from rev 142767, bitlbee/trunk/PKGBUILD) bitlbee/repos/testing-x86_64/install (from rev 142767, bitlbee/trunk/install) bitlbee/repos/testing-x86_64/msn.patch (from rev 142767, bitlbee/trunk/msn.patch) bitlbee/repos/testing-x86_64/rc.d (from rev 142767, bitlbee/trunk/rc.d) bitlbee/repos/testing-x86_64/xinetd (from rev 142767, bitlbee/trunk/xinetd) --------------------------+ testing-i686/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++++++++++++ testing-i686/install | 14 +++++++++++ testing-i686/msn.patch | 27 +++++++++++++++++++++ testing-i686/rc.d | 40 ++++++++++++++++++++++++++++++++ testing-i686/xinetd | 12 +++++++++ testing-x86_64/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++++++++++++ testing-x86_64/install | 14 +++++++++++ testing-x86_64/msn.patch | 27 +++++++++++++++++++++ testing-x86_64/rc.d | 40 ++++++++++++++++++++++++++++++++ testing-x86_64/xinetd | 12 +++++++++ 10 files changed, 298 insertions(+) Copied: bitlbee/repos/testing-i686/PKGBUILD (from rev 142767, bitlbee/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,56 @@ +# $Id$ +# Contributor: FUBAR <mrfu...@gmail.com> +# Contributor: simo <s...@archlinux.org> +# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=bitlbee +pkgver=3.0.3 +pkgrel=6 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' +arch=('i686' 'x86_64') +url='http://www.bitlbee.org/' +license=('GPL') +depends=('openssl' 'glib2' 'libotr') +optdepends=('xinetd: to run bitlbee through xinetd') +source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'msn.patch' + 'xinetd' + 'rc.d') +sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + 'fee9dcd59ad0231ffbcae822f17b68d9a8684376' + '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' + 'be09d29af3853825778331df451f16ca9e452d03') + +backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch + + ./configure --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --pidfile=/var/run/bitlbee/bitlbee.pid \ + --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/lib/systemd/system \ + --ssl=openssl \ + --strip=0 \ + --otr=1 \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + 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 + + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install-etc + make DESTDIR="${pkgdir}" install-dev +} Copied: bitlbee/repos/testing-i686/install (from rev 142767, bitlbee/trunk/install) =================================================================== --- testing-i686/install (rev 0) +++ testing-i686/install 2011-11-14 21:37:49 UTC (rev 142768) @@ -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 +} Copied: bitlbee/repos/testing-i686/msn.patch (from rev 142767, bitlbee/trunk/msn.patch) =================================================================== --- testing-i686/msn.patch (rev 0) +++ testing-i686/msn.patch 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,27 @@ +Index: devel/lib/http_client.c +=================================================================== +--- devel/lib/http_client.c (revision devel,783) ++++ devel/lib/http_client.c (revision devel,824) +@@ -314,5 +314,5 @@ + } + +- if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 ) ++ if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 ) + { + char *loc, *new_request, *new_host; +@@ -375,8 +375,11 @@ + going to use strcat(), whether you like it or not. :-) */ + +- sprintf( new_request, "GET %s HTTP/1.0", url->file ); +- +- s = strstr( req->request, "\r\n" ); +- if( s == NULL ) ++ *s = 0; ++ sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s", ++ req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host ); ++ *s = ' '; ++ ++ if( !( ( s = strstr( req->request, "\r\nHost: " ) ) && ++ ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) ) + { + req->status_string = g_strdup( "Error while rebuilding request string" ); Copied: bitlbee/repos/testing-i686/rc.d (from rev 142767, bitlbee/trunk/rc.d) =================================================================== --- testing-i686/rc.d (rev 0) +++ testing-i686/rc.d 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=bitlbee +PID=$(pidof -o %PPID /usr/sbin/bitlbee) +install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && { + rm -f /var/run/bitlbee/bitlbee.pid + su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee + } && { + add_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && { + kill $PID &>/dev/null + } && { + rm -f /var/run/bitlbee/bitlbee.pid + rm_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 3 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; +esac Copied: bitlbee/repos/testing-i686/xinetd (from rev 142767, bitlbee/trunk/xinetd) =================================================================== --- testing-i686/xinetd (rev 0) +++ testing-i686/xinetd 2011-11-14 21:37:49 UTC (rev 142768) @@ -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 142767, bitlbee/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,56 @@ +# $Id$ +# Contributor: FUBAR <mrfu...@gmail.com> +# Contributor: simo <s...@archlinux.org> +# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=bitlbee +pkgver=3.0.3 +pkgrel=6 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' +arch=('i686' 'x86_64') +url='http://www.bitlbee.org/' +license=('GPL') +depends=('openssl' 'glib2' 'libotr') +optdepends=('xinetd: to run bitlbee through xinetd') +source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'msn.patch' + 'xinetd' + 'rc.d') +sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + 'fee9dcd59ad0231ffbcae822f17b68d9a8684376' + '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' + 'be09d29af3853825778331df451f16ca9e452d03') + +backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch + + ./configure --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --pidfile=/var/run/bitlbee/bitlbee.pid \ + --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/lib/systemd/system \ + --ssl=openssl \ + --strip=0 \ + --otr=1 \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + 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 + + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install-etc + make DESTDIR="${pkgdir}" install-dev +} Copied: bitlbee/repos/testing-x86_64/install (from rev 142767, bitlbee/trunk/install) =================================================================== --- testing-x86_64/install (rev 0) +++ testing-x86_64/install 2011-11-14 21:37:49 UTC (rev 142768) @@ -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 +} Copied: bitlbee/repos/testing-x86_64/msn.patch (from rev 142767, bitlbee/trunk/msn.patch) =================================================================== --- testing-x86_64/msn.patch (rev 0) +++ testing-x86_64/msn.patch 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,27 @@ +Index: devel/lib/http_client.c +=================================================================== +--- devel/lib/http_client.c (revision devel,783) ++++ devel/lib/http_client.c (revision devel,824) +@@ -314,5 +314,5 @@ + } + +- if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 ) ++ if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 ) + { + char *loc, *new_request, *new_host; +@@ -375,8 +375,11 @@ + going to use strcat(), whether you like it or not. :-) */ + +- sprintf( new_request, "GET %s HTTP/1.0", url->file ); +- +- s = strstr( req->request, "\r\n" ); +- if( s == NULL ) ++ *s = 0; ++ sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s", ++ req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host ); ++ *s = ' '; ++ ++ if( !( ( s = strstr( req->request, "\r\nHost: " ) ) && ++ ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) ) + { + req->status_string = g_strdup( "Error while rebuilding request string" ); Copied: bitlbee/repos/testing-x86_64/rc.d (from rev 142767, bitlbee/trunk/rc.d) =================================================================== --- testing-x86_64/rc.d (rev 0) +++ testing-x86_64/rc.d 2011-11-14 21:37:49 UTC (rev 142768) @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=bitlbee +PID=$(pidof -o %PPID /usr/sbin/bitlbee) +install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && { + rm -f /var/run/bitlbee/bitlbee.pid + su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee + } && { + add_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && { + kill $PID &>/dev/null + } && { + rm -f /var/run/bitlbee/bitlbee.pid + rm_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 3 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; +esac Copied: bitlbee/repos/testing-x86_64/xinetd (from rev 142767, bitlbee/trunk/xinetd) =================================================================== --- testing-x86_64/xinetd (rev 0) +++ testing-x86_64/xinetd 2011-11-14 21:37:49 UTC (rev 142768) @@ -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 +}