Date: Thursday, November 10, 2011 @ 09:19:09 Author: bisson Revision: 142478
db-move: moved bitlbee from [testing] to [extra] (x86_64) Added: bitlbee/repos/extra-x86_64/PKGBUILD (from rev 142476, bitlbee/repos/testing-x86_64/PKGBUILD) bitlbee/repos/extra-x86_64/install (from rev 142476, bitlbee/repos/testing-x86_64/install) bitlbee/repos/extra-x86_64/msn.patch (from rev 142476, bitlbee/repos/testing-x86_64/msn.patch) bitlbee/repos/extra-x86_64/rc.d (from rev 142476, bitlbee/repos/testing-x86_64/rc.d) bitlbee/repos/extra-x86_64/xinetd (from rev 142476, bitlbee/repos/testing-x86_64/xinetd) Deleted: bitlbee/repos/extra-x86_64/PKGBUILD bitlbee/repos/extra-x86_64/install bitlbee/repos/extra-x86_64/rc.d bitlbee/repos/extra-x86_64/xinetd bitlbee/repos/testing-x86_64/ -----------+ PKGBUILD | 108 +++++++++++++++++++++++++++++++----------------------------- install | 28 +++++++-------- msn.patch | 29 ++++++++++++++++ rc.d | 80 ++++++++++++++++++++++---------------------- xinetd | 24 ++++++------- 5 files changed, 151 insertions(+), 118 deletions(-) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-11-10 14:19:08 UTC (rev 142477) +++ extra-x86_64/PKGBUILD 2011-11-10 14:19:09 UTC (rev 142478) @@ -1,52 +0,0 @@ -# $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=4 -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" - 'xinetd' - 'rc.d') -sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' - '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - 'be09d29af3853825778331df451f16ca9e452d03') - -backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./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/extra-x86_64/PKGBUILD (from rev 142476, bitlbee/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-11-10 14:19:09 UTC (rev 142478) @@ -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=5 +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' + 'e5880344ff96e6f061d850e7207f5f0bb31fb82b' + '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 +} Deleted: extra-x86_64/install =================================================================== --- extra-x86_64/install 2011-11-10 14:19:08 UTC (rev 142477) +++ extra-x86_64/install 2011-11-10 14:19:09 UTC (rev 142478) @@ -1,14 +0,0 @@ -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/extra-x86_64/install (from rev 142476, bitlbee/repos/testing-x86_64/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2011-11-10 14:19:09 UTC (rev 142478) @@ -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/extra-x86_64/msn.patch (from rev 142476, bitlbee/repos/testing-x86_64/msn.patch) =================================================================== --- extra-x86_64/msn.patch (rev 0) +++ extra-x86_64/msn.patch 2011-11-10 14:19:09 UTC (rev 142478) @@ -0,0 +1,29 @@ +--- bitlbee-3.0.3.old/protocols/msn/soap.h 2011-06-12 08:53:51.000000000 -0300 ++++ bitlbee-3.0.3/protocols/msn/soap.h 2011-11-09 21:35:56.000000000 -0200 +@@ -115,7 +115,7 @@ int msn_soapq_flush( struct im_connectio + "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \ + "<wsp:AppliesTo>" \ + "<wsa:EndpointReference>" \ +- "<wsa:Address>contacts.msn.com</wsa:Address>" \ ++ "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \ + "</wsa:EndpointReference>" \ + "</wsp:AppliesTo>" \ + "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \ +@@ -198,7 +198,7 @@ int msn_soap_oim_send_queue( struct im_c + "</soap:Body>" \ + "</soap:Envelope>" + +-#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx" ++#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx" + #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership" + + #define SOAP_MEMLIST_PAYLOAD \ +@@ -233,7 +233,7 @@ int msn_soap_memlist_request( struct im_ + int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list ); + + +-#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx" ++#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx" + #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll" + + #define SOAP_ADDRESSBOOK_PAYLOAD \ Deleted: extra-x86_64/rc.d =================================================================== --- extra-x86_64/rc.d 2011-11-10 14:19:08 UTC (rev 142477) +++ extra-x86_64/rc.d 2011-11-10 14:19:09 UTC (rev 142478) @@ -1,40 +0,0 @@ -#!/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/extra-x86_64/rc.d (from rev 142476, bitlbee/repos/testing-x86_64/rc.d) =================================================================== --- extra-x86_64/rc.d (rev 0) +++ extra-x86_64/rc.d 2011-11-10 14:19:09 UTC (rev 142478) @@ -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 Deleted: extra-x86_64/xinetd =================================================================== --- extra-x86_64/xinetd 2011-11-10 14:19:08 UTC (rev 142477) +++ extra-x86_64/xinetd 2011-11-10 14:19:09 UTC (rev 142478) @@ -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 -} Copied: bitlbee/repos/extra-x86_64/xinetd (from rev 142476, bitlbee/repos/testing-x86_64/xinetd) =================================================================== --- extra-x86_64/xinetd (rev 0) +++ extra-x86_64/xinetd 2011-11-10 14:19:09 UTC (rev 142478) @@ -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 +}