patch for msn servers for bitlbee

5 files changed, 80 insertions, 3 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 78673ab93125..ac1fd39d32cb 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.12 2003/10/21 02:28:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.13 2003/11/22 15:07:27 liquidx Exp $
+
+*libsoup-1.99.26-r1 (22 Nov 2003)
+
+  22 Nov 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26-r1.ebuild,
+  files/libsoup-1.99.26-msn.patch:
+  add timeout patch to libsoup so it works with msn servers (#32833)
+  (http://get.bitlbee.org/libsoup/)
 
   20 Oct 2003; Aron Griffis <agriffis@gentoo.org> libsoup-1.99.26.ebuild:
   Stable on alpha
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 045c12b06919..e8d748aade63 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,7 +1,7 @@
-MD5 c3d5038ea88c3bafd284ab77a43c9df9 ChangeLog 1740
+MD5 74d4169aec8049b819c4d033d2efc8b2 ChangeLog 1991
 MD5 f512ef86c6c90d0192f989c609ab7f91 libsoup-1.99.22.ebuild 840
 MD5 1185b3561a784c1655c1f79b6cc3f4f0 libsoup-1.99.23.ebuild 845
-MD5 8790f563954620678185381fa7800f83 libsoup-1.99.26-r1.ebuild 1209
+MD5 36c819954436d94b5a8ad2a349afd107 libsoup-1.99.26-r1.ebuild 1211
 MD5 d1ab56a4861940dcf266db8105546b8a libsoup-1.99.26.ebuild 1172
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4ed2ee4ad5a6e2b7041129cabbcb78d2 files/digest-libsoup-1.99.22 68
diff --git a/net-libs/libsoup/files/digest-libsoup-1.99.26-r1 b/net-libs/libsoup/files/digest-libsoup-1.99.26-r1
new file mode 100644
index 000000000000..757cf56086b8
--- /dev/null
+++ b/net-libs/libsoup/files/digest-libsoup-1.99.26-r1
@@ -0,0 +1 @@
+MD5 acb6658fd0dcebd2c5fc8347e0183515 libsoup-1.99.26.tar.bz2 233237
diff --git a/net-libs/libsoup/files/libsoup-1.99.26-msn.patch b/net-libs/libsoup/files/libsoup-1.99.26-msn.patch
new file mode 100644
index 000000000000..976036432b5f
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-1.99.26-msn.patch
@@ -0,0 +1,21 @@
+diff -uNr usr/src/libsoup-1.99.26/libsoup/soup-transfer.c tmp/libsoup-1.99.26/libsoup/soup-transfer.c
+--- usr/src/libsoup-1.99.26/libsoup/soup-transfer.c	2003-06-23 17:52:34.000000000 +0200
++++ tmp/libsoup-1.99.26/libsoup/soup-transfer.c	2003-10-19 01:51:03.000000000 +0200
+@@ -198,7 +198,7 @@
+ 			     GIOCondition condition,
+ 			     SoupReader *r)
+ {
+-	gboolean body_started = r->recv_buf->len > r->header_len;
++	gboolean body_started = r->header_len > 0;
+ 
+ 	soup_transfer_read_stop (r);
+ 
+@@ -380,7 +381,7 @@
+ 		}
+ 	}
+ 
+-	return r->content_length == arr->len;
++	return arr->len >= r->content_length;
+ }
+ 
+ static gboolean
diff --git a/net-libs/libsoup/libsoup-1.99.26-r1.ebuild b/net-libs/libsoup/libsoup-1.99.26-r1.ebuild
new file mode 100644
index 000000000000..9d0784b62856
--- /dev/null
+++ b/net-libs/libsoup/libsoup-1.99.26-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.26-r1.ebuild,v 1.1 2003/11/22 15:07:27 liquidx Exp $
+
+inherit gnome.org libtool
+
+DESCRIPTION="Soup is a SOAP implementation"
+HOMEPAGE="http://www.gnome.org/"
+
+IUSE="gnutls"
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~sparc  ~ppc ~alpha ~hppa"
+
+RDEPEND=">=dev-libs/glib-2.0
+	!gnutls? ( dev-libs/openssl )
+	gnutls?  ( net-libs/gnutls )"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	dev-libs/popt
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-msn.patch	
+	# added --with-ssl=openssl|gnutls to choose between the two.
+	epatch ${FILESDIR}/${P}-with_ssl.patch
+	cd ${S}; aclocal; automake; autoconf
+}
+
+src_compile() {
+	local myconf
+	elibtoolize
+
+	# current build system deems ssl as NOT AN OPTION.
+	# use ssl && myconf="--enable-ssl --enable-openssl"
+	use gnutls \
+		&& myconf="${myconf} --with-ssl=gnutls" \
+		|| myconf="${myconf} --with-ssl=openssl"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+	dodoc AUTHORS COPYING* ChangeLog README* TODO
+}