diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/bitlbee | |
parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/bitlbee')
-rw-r--r-- | extra/bitlbee/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/bitlbee/msn.patch | 29 |
2 files changed, 35 insertions, 2 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 4f63eeece..ed99212ff 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $ +# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=4 +pkgrel=5 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' @@ -15,9 +15,11 @@ 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') @@ -26,6 +28,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch ./configure --prefix=/usr \ --etcdir=/etc/bitlbee \ diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch new file mode 100644 index 000000000..e126784bf --- /dev/null +++ b/extra/bitlbee/msn.patch @@ -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 \ |