Added certificate patch from rdesktop-cvs. Bumped version.

6 files changed, 131 insertions, 7 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 5ff1ee7897d0..d40abbf29826 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.26 2003/11/19 19:18:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.27 2003/12/10 14:18:59 wolf31o2 Exp $
+
+*rdesktop-1.3.0-r1 (10 Dec 2003)
+
+  10 Dec 2003; Chris Gianelloni <wolf31o2@gentoo.org>
+  rdesktop-1.3.0-r1.ebuild, rdesktop-1.3.0.ebuild,
+  files/rdesktop-1.3.0-last-two-certs.patch:
+  Added certificate patch from rdesktop-cvs.  Bumped version.
 
   19 Nov 2003; Jason Wever <weeve@gentoo.org> rdesktop-1.3.0.ebuild:
   Marked stable on sparc.
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 98decb364d2b..f04ddf4d1baa 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,11 +1,14 @@
-MD5 60699e35a2873a2503f9fc9c86526bf0 ChangeLog 3472
-MD5 7fe0966310bd38ff4dfea928d792e8bc rdesktop-1.3.0.ebuild 1674
 MD5 a7a251ea23814836483058004b463fbd rdesktop-1.2.0-r1.ebuild 1588
+MD5 9e864866223caa100bc605ade0535733 rdesktop-1.3.0-r1.ebuild 1878
 MD5 7c24e74ed6702aed29b4797fe2147fdf rdesktop-1.2.0.ebuild 1004
+MD5 14772f3d2a9f73d7f84169468befa67b rdesktop-1.3.0.ebuild 1875
+MD5 834009fb792c3839596fedf693270e9a ChangeLog 3722
 MD5 ba5cbd501be829c4dd810293a86e28c2 metadata.xml 554
-MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0 66
+MD5 4120908a83d84e4150a2cce191f2bbc0 files/rdesktop-1.3.0-last-two-certs.patch 1146
+MD5 9781aae48c8d45e8762d2c21670fab9e files/rdesktop-paste.patch 5766
 MD5 a79de715834dc26c2336e60271ea10d2 files/digest-rdesktop-1.2.0 66
+MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0 66
+MD5 575e5d9fe8a75cb24dcf3c4d1f4348b4 files/rdesktop-1.3.0-geometry.patch 1868
 MD5 a79de715834dc26c2336e60271ea10d2 files/digest-rdesktop-1.2.0-r1 66
-MD5 9781aae48c8d45e8762d2c21670fab9e files/rdesktop-paste.patch 5766
+MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0-r1 66
 MD5 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395
-MD5 575e5d9fe8a75cb24dcf3c4d1f4348b4 files/rdesktop-1.3.0-geometry.patch 1868
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1
new file mode 100644
index 000000000000..10a010eeceb8
--- /dev/null
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1
@@ -0,0 +1 @@
+MD5 d8108781d227221a823c34b861486a5d rdesktop-1.3.0.tar.gz 136704
diff --git a/net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch b/net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch
new file mode 100644
index 000000000000..0d40ebe62212
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch
@@ -0,0 +1,42 @@
+--- secure.c.orig	2003-12-09 22:34:25.000000000 -0500
++++ secure.c	2003-12-09 22:39:45.000000000 -0500
+@@ -625,8 +625,38 @@
+ 	}
+ 	else
+ 	{
++		uint32 certcount;
++
+ 		DEBUG_RDP5(("We're going for the RDP5-style encryption\n"));
+-		in_uint8s(s, 4);	/* Number of certificates */
++		in_uint32_le(s, certcount); /* Number of certificates */
++
++		if(certcount < 2) 
++		{
++			error("Server didn't send enough X509 certificates\n");
++			return False;
++		}
++
++		for(; certcount > 2; certcount--)
++		{ /* ignore all the certificates between the root and the signing CA */
++			uint32 ignorelen;
++			X509 *ignorecert;
++
++			DEBUG_RDP5(("Ignored certs left: %d\n", certcount));
++
++			in_uint32_le(s, ignorelen);
++			DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen));
++			ignorecert = d2i_X509(NULL, &(s->p), ignorelen);
++
++			if(ignorecert == NULL)
++			{ /* XXX: error out? */
++				DEBUG_RDP5(("got a bad cert: this will probably screw up the rest of the communication\n"));
++			}
++
++#ifdef WITH_DEBUG_RDP5
++			DEBUG_RDP5(("cert #%d (ignored):\n",certcount));
++			X509_print_fp(stdout, ignorecert);
++#endif
++		}
+ 
+ 		/* Do da funky X.509 stuffy 
+ 
diff --git a/net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ae793514206a
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild,v 1.1 2003/12/10 14:18:59 wolf31o2 Exp $
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc alpha sparc amd64 ia64"
+IUSE="ssl debug"
+
+DEPEND="x11-base/xfree
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Adds extra functionality to the geometry settings, allowing for example:
+	# -g1024x768+10+10
+	# Patch is from Martin Gallwey and ported from rdesktop 1.2.0 and submitted
+	# by Daniele Foci (sunscan@sunscan.org)
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=664800&group_id=24366&atid=381349
+
+	epatch ${FILESDIR}/rdesktop-1.3.0-geometry.patch
+
+	# This second patch gives rdesktop the ability to emulate Windows 2000's
+	# built-in license.  This is especially useful for testing deployments.  I
+	# am including it for PXES.
+
+	epatch ${FILESDIR}/rdesktop-1.3.0-builtin-license.patch
+
+	# This third patch has been applied to the rdesktop CVS and fixes some
+	# problems with certificates on Windows 2000 and 2003, using RDP5.
+
+	epatch ${FILESDIR}/rdesktop-1.3.0-last-two-certs.patch
+}
+
+src_compile() {
+	local myconf
+	use ssl \
+		&& myconf="--with-openssl=/usr/include/openssl" \
+		|| myconf="--without-openssl"
+
+	sed -e "s:-O2:${CFLAGS}:g" Makefile > Makefile.tmp
+	mv Makefile.tmp Makefile
+	echo "CFLAGS += ${CXXFLAGS}" >> Makeconf
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sharedir=/usr/share/${PN} \
+		`use_with debug` \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/net-misc/rdesktop/rdesktop-1.3.0.ebuild b/net-misc/rdesktop/rdesktop-1.3.0.ebuild
index 75761bcfde96..424f3bf79403 100644
--- a/net-misc/rdesktop/rdesktop-1.3.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.0.ebuild,v 1.7 2003/11/19 19:18:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.0.ebuild,v 1.8 2003/12/10 14:18:59 wolf31o2 Exp $
 
 DESCRIPTION="A Remote Desktop Protocol Client"
 HOMEPAGE="http://rdesktop.sourceforge.net/"
@@ -33,6 +33,11 @@ src_unpack() {
 	# am including it for PXES.
 
 	epatch ${FILESDIR}/rdesktop-1.3.0-builtin-license.patch
+
+	# This third patch has been applied to the rdesktop CVS and fixes some
+	# problems with certificates on Windows 2000 and 2003, using RDP5.
+
+	epatch ${FILESDIR}/rdesktop-1.3.0-last-two-certs.patch
 }
 
 src_compile() {