Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/blackbox/PKGBUILD
	community/blobby2/PKGBUILD
	community/chmsee/PKGBUILD
	community/extrema/PKGBUILD
	community/floyd/PKGBUILD
	community/gnash/PKGBUILD
	community/gq/PKGBUILD
	community/gsql/PKGBUILD
	community/haddock/PKGBUILD
	community/hashcash/PKGBUILD
	community/kvpnc/PKGBUILD
	community/uptimed/PKGBUILD
	community/wol/PKGBUILD
	core/jfsutils/PKGBUILD
	core/reiserfsprogs/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libffado/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/lua/PKGBUILD
	extra/mesa/PKGBUILD
	extra/valgrind/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD

2 files changed, 30 insertions, 32 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index ed99212ff..d4e1c3b34 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $
+# $Id: PKGBUILD 142776 2011-11-15 02:49:37Z 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=5
+pkgrel=6
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.bitlbee.org/'
@@ -19,7 +19,7 @@ source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
 	'rc.d')
 sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
-          'e5880344ff96e6f061d850e7207f5f0bb31fb82b'
+          'fee9dcd59ad0231ffbcae822f17b68d9a8684376'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch
index e126784bf..55e2f9b92 100644
--- a/extra/bitlbee/msn.patch
+++ b/extra/bitlbee/msn.patch
@@ -1,29 +1,27 @@
---- 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 \
+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" );