[arch-commits] Commit in bitlbee/trunk (PKGBUILD install msn.patch)

[Gaetan Bisson]

    Date: Monday, December 5, 2011 @ 03:14:19
  Author: bisson
Revision: 144361

upstream update

Modified:
  bitlbee/trunk/PKGBUILD
  bitlbee/trunk/install
Deleted:
  bitlbee/trunk/msn.patch

-----------+
 PKGBUILD  |   11 ++++-------
 install   |    1 -
 msn.patch |   27 ---------------------------
 3 files changed, 4 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-05 04:48:47 UTC (rev 144360)
+++ PKGBUILD	2011-12-05 08:14:19 UTC (rev 144361)
@@ -1,4 +1,5 @@
 # $Id$
+
 # Contributor: FUBAR <mrfubar at gmail.com>
 # Contributor: simo <simo at archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
@@ -6,8 +7,8 @@
 # Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=bitlbee
-pkgver=3.0.3
-pkgrel=6
+pkgver=3.0.4
+pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
@@ -15,11 +16,9 @@
 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'
+sha1sums=('2c2742948d1ed2c83ee5db2d2fbff5e8b656b8c4'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
@@ -29,8 +28,6 @@
 build() { 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../msn.patch
-	
 	./configure --prefix=/usr \
 		--etcdir=/etc/bitlbee \
 		--pidfile=/var/run/bitlbee/bitlbee.pid \

Modified: install
===================================================================
--- install	2011-12-05 04:48:47 UTC (rev 144360)
+++ install	2011-12-05 08:14:19 UTC (rev 144361)
@@ -1,5 +1,4 @@
 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
 }

Deleted: msn.patch
===================================================================
--- msn.patch	2011-12-05 04:48:47 UTC (rev 144360)
+++ msn.patch	2011-12-05 08:14:19 UTC (rev 144361)
@@ -1,27 +0,0 @@
-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" );