Update chat/bitlbee to 3.2

Version 3.2 (released 2013-01-06) hilights:
    Updated Twitter module. Support for Twitter API 1.1, streaming API, direct
    messages and some other improvements.
    Fixed potential connection issue to Google Talk, OpenFire, possibly other
    Jabber services.
    A bunch of other things.

Version 3.0.6 (released 2012-10-14) hilights:
    Updated MSN module, now speaking the MSNP18 protocol. This adds support for
    MPOP and also fixes sending off-line messages.
    Loads of bugfixes, etc. accumulated over the last half a year.

4 files changed, 6 insertions, 92 deletions

diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index ca555ab25c1..b008fba67ff 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2012/10/03 00:02:34 asau Exp $
+# $NetBSD: Makefile,v 1.63 2013/01/20 10:56:25 tonio Exp $
 #
 
-DISTNAME=		bitlbee-3.0.3
-PKGREVISION=		6
+DISTNAME=		bitlbee-3.2
 CATEGORIES=		chat
 MASTER_SITES=		http://get.bitlbee.org/src/
 
diff --git a/chat/bitlbee/distinfo b/chat/bitlbee/distinfo
index 9df36439708..6591b184478 100644
--- a/chat/bitlbee/distinfo
+++ b/chat/bitlbee/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.29 2012/07/18 09:56:02 marino Exp $
+$NetBSD: distinfo,v 1.30 2013/01/20 10:56:26 tonio Exp $
 
-SHA1 (bitlbee-3.0.3.tar.gz) = 4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff
-RMD160 (bitlbee-3.0.3.tar.gz) = 4b537871eef1bb5b6839105bc7bc9f2567e5b8e1
-Size (bitlbee-3.0.3.tar.gz) = 676417 bytes
-SHA1 (patch-lib_http__client.c) = 9659b12ee2ad796cab9ac4fa9b29067677df63fe
-SHA1 (patch-lib_ssl__gnutls.c) = 48c888182d162c72be03d19f653b67771ac1db88
+SHA1 (bitlbee-3.2.tar.gz) = 21e17f082c776566429603b1e8c966983a75ac9e
+RMD160 (bitlbee-3.2.tar.gz) = b28277d71f022a85f321b79aea5e91c9724c037d
+Size (bitlbee-3.2.tar.gz) = 666404 bytes
diff --git a/chat/bitlbee/patches/patch-lib_http__client.c b/chat/bitlbee/patches/patch-lib_http__client.c
deleted file mode 100644
index 96e0c8ef99d..00000000000
--- a/chat/bitlbee/patches/patch-lib_http__client.c
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-lib_http__client.c,v 1.1 2011/11/18 21:06:19 tonio Exp $
-
-Fix for MSN login troubles
-
---- lib/http_client.c	(revision devel,783)
-+++ lib/http_client.c	(revision devel,825)
-@@ -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;
-@@ -354,4 +354,5 @@
- 			url_t *url;
- 			char *s;
-+			const char *new_method;
- 			
- 			s = strstr( loc, "\r\n" );
-@@ -369,25 +370,34 @@
- 			}
- 			
--			/* Okay, this isn't fun! We have to rebuild the request... :-( */
--			new_request = g_malloc( req->request_length + strlen( url->file ) );
--			
--			/* So, now I just allocated enough memory, so I'm
--			   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 )
-+			/* Find all headers and, if necessary, the POST request contents.
-+			   Skip the old Host: header though. This crappy code here means
-+			   anything using this http_client MUST put the Host: header at
-+			   the top. */
-+			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" );
--				g_free( new_request );
- 				g_free( url );
- 				goto cleanup;
- 			}
- 			
--			strcat( new_request, s );
-+			/* More or less HTTP/1.0 compliant, from my reading of RFC 2616.
-+			   Always perform a GET request unless we received a 301. 303 was
-+			   meant for this but it's HTTP/1.1-only and we're specifically
-+			   speaking HTTP/1.0. */
-+			new_method = req->status_code != 301 || req->request[0] == 'G' ? "GET" : "POST";
-+			
-+			/* Okay, this isn't fun! We have to rebuild the request... :-( */
-+			new_request = g_strdup_printf( "%s %s HTTP/1.0\r\nHost: %s%s",
-+			                               new_method, url->file, url->host, s );
-+			
- 			new_host = g_strdup( url->host );
- 			new_port = url->port;
- 			new_proto = url->proto;
-+			
-+			/* If we went from POST to GET, truncate the request content. */
-+			if( new_request[0] != req->request[0] && new_request[0] == 'G' &&
-+			    ( s = strstr( new_request, "\r\n\r\n" ) ) )
-+				s[4] = '\0';
- 			
- 			g_free( url );
diff --git a/chat/bitlbee/patches/patch-lib_ssl__gnutls.c b/chat/bitlbee/patches/patch-lib_ssl__gnutls.c
deleted file mode 100644
index 7497bf957f3..00000000000
--- a/chat/bitlbee/patches/patch-lib_ssl__gnutls.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib_ssl__gnutls.c,v 1.1 2012/07/18 09:56:02 marino Exp $
-
-GnuTLS deprecated gnutls_transport_set_lowat in version 2.12.0 and removed it by version 3
-The lowat feature is always disabled now.
-
---- lib/ssl_gnutls.c.orig	2012-07-18 08:30:44.294219000 +0000
-+++ lib/ssl_gnutls.c
-@@ -134,7 +134,9 @@ static gboolean ssl_connected( gpointer
- 	
- 	gnutls_certificate_allocate_credentials( &conn->xcred );
- 	gnutls_init( &conn->session, GNUTLS_CLIENT );
-+#if GNUTLS_VERSION_NUMBER < 0x020c00
- 	gnutls_transport_set_lowat( conn->session, 1 ); 
-+#endif       
- 	gnutls_set_default_priority( conn->session );
- 	gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );
-