Add patches for Jabber encryption and IPV6 from a few very helpful people...

bugs #31303 #30946

6 files changed, 146 insertions, 3 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index e64f00888f73..fb8f9fd5b340 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.82 2003/10/11 02:37:03 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.83 2003/10/22 04:25:06 lostlogic Exp $
+
+*gaim-0.71-r1 (21 Oct 2003)
+
+  21 Oct 2003; Brandon Low <lostlogic@gentoo.org> gaim-0.71-r1.ebuild,
+  files/gaim-0.71-ipv6.patch, files/gaim-0.71-jabber-strip.patch:
+  Add patches for Jabber encryption and IPV6 from a few very helpful people...
+  bugs #31303 #30946
 
 *gaim-0.71 (10 Oct 2003)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 0283f6610aac..e7d04e88abcb 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -8,8 +8,8 @@ MD5 836e337188a5f0b1fe7e0de396bec8b9 gaim-0.70.ebuild 2338
 MD5 a08cec351051cad09f7b16f12adf5a3a gaim-0.68-r2.ebuild 2395
 MD5 b2ac9eb41db9100a22760f81282f388b gaim-0.66-r3.ebuild 1968
 MD5 1b1f0e40e56bf6064faa118255be51bc gaim-0.70-r2.ebuild 2488
-MD5 d4d0ef783c6056ad06525651a85ba832 gaim-0.71-r1.ebuild 2535
-MD5 c0fdac26b736eded2adbf58ff32255f8 ChangeLog 13966
+MD5 7d3ee2452a2e73637d63b709a7de6e33 gaim-0.71-r1.ebuild 2588
+MD5 b447477ef913b83ea51813fa42df4cd0 ChangeLog 14233
 MD5 dc9ef26d3efea7cbe38cbe534cdeaa53 metadata.xml 510
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 dd643cd5d3960ea86bc0107cb9bdbb50 files/digest-gaim-0.69 135
@@ -25,4 +25,5 @@ MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
 MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r1 135
 MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
 MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
+MD5 9854f11fcca9236626b451eb183e6b00 files/gaim-0.71-ipv6.patch 1499
 MD5 8207ea359084982a599aa71679eac261 files/gaim-0.71-jabber-strip.patch 844
diff --git a/net-im/gaim/files/digest-gaim-0.71-r1 b/net-im/gaim/files/digest-gaim-0.71-r1
new file mode 100644
index 000000000000..084a1f578eaa
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.71-r1
@@ -0,0 +1,2 @@
+MD5 89d1aeabdfcb16df479031b08ad5fb99 gaim-0.71.tar.bz2 3109536
+MD5 6a8f3e2b0d86cdd6e82af415949acff1 gaim-encryption-2.15.tar.gz 316444
diff --git a/net-im/gaim/files/gaim-0.71-ipv6.patch b/net-im/gaim/files/gaim-0.71-ipv6.patch
new file mode 100644
index 000000000000..5b2fe42e0ab7
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.71-ipv6.patch
@@ -0,0 +1,31 @@
+diff -ur gaim-0.70/AUTHORS gaim-0.70.new/AUTHORS
+--- gaim-0.70/AUTHORS	2003-09-23 21:33:40.000000000 -0700
++++ gaim-0.70.new/AUTHORS	2003-10-17 09:37:57.000000000 -0700
+@@ -34,6 +34,7 @@
+ Etan 'deryni' Reisner
+ Ethan 'Paco-Paco' Blanton
+ Robert 'Robot101' McQueen
++Ryan 'red0x' Du Bois
+ 
+ Just Because:
+ ------------
+Only in gaim-0.70: gaim.spec
+diff -ur gaim-0.70/src/protocols/oscar/ft.c gaim-0.70.new/src/protocols/oscar/ft.c
+--- gaim-0.70/src/protocols/oscar/ft.c	2003-06-19 21:16:22.000000000 -0700
++++ gaim-0.70.new/src/protocols/oscar/ft.c	2003-10-17 12:47:30.000000000 -0700
+@@ -258,7 +258,14 @@
+ 	if ((acceptfd = accept(cur->fd, &addr, &addrlen)) == -1)
+ 		return 0; /* not an error */
+ 
+-	if (addr.sa_family != AF_INET) { /* just in case IPv6 really is happening */
++	/* red0x: ipv6 is handled transparently in glibc, just support ipv6 and ipv4 will follow... */
++	/* leaving AF_INET only down here is what was breaking file transfers for me
++	   as I have ipv6 support in kernel.  Anyone with ipv6 support in kernel
++	   has most incoming ipv4 connections wrapped into ipv6 for the transparent
++	   ipv6/ipv4 interroperability stuff in glibc.  If we deny ipv6 connections
++	   then no one with that patch can send and receive files.  All I did was allow
++	   ipv6 incoming, and unwrap the ipv4 inside it automagically */
++	if (addr.sa_family != AF_INET && addr.sa_family != AF_INET6) { /* just in case IPv6 really is happening */
+ 		close(acceptfd);
+ 		aim_conn_close(cur);
+ 		return -1;
diff --git a/net-im/gaim/files/gaim-0.71-jabber-strip.patch b/net-im/gaim/files/gaim-0.71-jabber-strip.patch
new file mode 100644
index 000000000000..808ebb0024cb
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.71-jabber-strip.patch
@@ -0,0 +1,18 @@
+diff -ruN gaim-0.71/src/protocols/jabber/message.c gaim-0.71-r1/src/protocols/jabber/message.c
+--- gaim-0.71/src/protocols/jabber/message.c	2003-10-09 16:01:01.000000000 -0500
++++ gaim-0.71-r1/src/protocols/jabber/message.c	2003-10-16 14:46:14.000000000 -0500
+@@ -228,13 +228,8 @@
+ 		} else if(!strcmp(child->name, "body")) {
+ 			if(!jm->body)
+ 				jm->body = xmlnode_get_data(child);
+-		} else if(!strcmp(child->name, "html") && child->child) {
+-			/* check to see if the <html> actually contains anything,
+-			 * otherwise we'll ignore it */
+-			char *txt = xmlnode_get_data(child);
+-			if(!jm->xhtml && txt)
++		} else if(!strcmp(child->name, "html")) {
+ 				jm->xhtml = xmlnode_to_str(child);
+-			g_free(txt);
+ 		} else if(!strcmp(child->name, "error")) {
+ 			const char *code = xmlnode_get_attrib(child, "code");
+ 			char *code_txt = NULL;
diff --git a/net-im/gaim/gaim-0.71-r1.ebuild b/net-im/gaim/gaim-0.71-r1.ebuild
new file mode 100644
index 000000000000..e62b166a5dd6
--- /dev/null
+++ b/net-im/gaim/gaim-0.71-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.71-r1.ebuild,v 1.1 2003/10/22 04:25:06 lostlogic Exp $
+
+IUSE="nls perl spell nas ssl"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.15
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
+	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="=sys-libs/db-1*
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.6.1
+		>=sys-apps/sed-4.0.0 )
+	dev-libs/nss
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+	epatch ${FILESDIR}/gaim-0.71-jabber-strip.patch
+	epatch ${FILESDIR}/gaim-0.71-ipv6.patch
+	use ssl && {
+		cd ${S}/plugins
+		unpack gaim-encryption-${EV}.tar.gz
+	}
+}
+
+src_compile() {
+
+	local myconf
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+	myconf="${myconf} --with-nss-includes=/usr/include/nss"
+
+	econf ${myconf} || die "Configuration failed"
+	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+
+	use ssl && {
+		local myencconf
+		cd ${S}/plugins/gaim-encryption-${EV}
+
+		myencconf="${myencconf} --with-nspr-includes=/usr/include/nspr"
+		myencconf="${myencconf} --with-nss-includes=/usr/include/nss"
+		econf ${myencconf} || die "Configuration failed for encryption"
+		emake || die "Make failed for encryption"
+	}
+}
+
+src_install() {
+	einstall || die "Install failed"
+	use ssl && {
+		cd ${S}/plugins/gaim-encryption-${EV}
+		einstall || die "Install failed for encryption"
+		cd ${S}
+	}
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	if [ `use ssl` ]; then
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=ssl') to install"
+		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
+		ewarn "this plugin is NOT supported by the Gaim project, and if you"
+		ewarn "expierence problems related to it, contact the Gentoo project"
+		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
+	fi
+}