Version bumped to 1.3.0 and closing bug #32855.

11 files changed, 216 insertions, 104 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index ad074924d6a0..24a1755f48b0 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2003/09/25 13:25:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.20 2003/11/10 21:49:36 wolf31o2 Exp $
+
+*rdesktop-1.3.0 (10 Nov 2003)
+
+  10 Nov 2003; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml,
+  rdesktop-1.1.0-r1.ebuild, rdesktop-1.1.0.19.9.0.ebuild,
+  rdesktop-1.3.0.ebuild, files/rdesktop-1.3.0-builtin-license.patch,
+  files/rdesktop-1.3.0-geometry.patch:
+  Version bumped to 1.3.0 and closing bug #32855.
 
   25 Sep 2003; Luca Barbato <agriffis@gentoo.org> rdesktop-1.2.0-r1.ebuild:
   Marked ~ppc
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index cf2bbc3b89e7..4bbbbf5bbc0d 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,10 +1,11 @@
-MD5 14a37d801fdfe1de9de3fee7404317aa ChangeLog 2661
-MD5 553902eb11a87728054d6f221f06e7a4 rdesktop-1.1.0-r1.ebuild 997
-MD5 05792a4cc0690aba5830ab1eadf480b7 rdesktop-1.1.0.19.9.0.ebuild 1363
 MD5 a7a251ea23814836483058004b463fbd rdesktop-1.2.0-r1.ebuild 1588
 MD5 7c24e74ed6702aed29b4797fe2147fdf rdesktop-1.2.0.ebuild 1004
-MD5 b725fe39705164e5a09322c86b51404e files/digest-rdesktop-1.1.0-r1 65
-MD5 aeb3de64582b54e5628b30a70a493f09 files/digest-rdesktop-1.1.0.19.9.0 142
+MD5 5fedfd21bf0221cd7bc998ae3d3ce99d rdesktop-1.3.0.ebuild 1668
+MD5 fe5d8539c9c1cb81c1b656ae79bf44df ChangeLog 2978
+MD5 ba5cbd501be829c4dd810293a86e28c2 metadata.xml 554
+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 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.1.0-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.1.0-r1
deleted file mode 100644
index 30baa35df265..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50cfa4cacd15c52eaa7a57470607acea rdesktop-1.1.0.tar.gz 80584
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.1.0.19.9.0 b/net-misc/rdesktop/files/digest-rdesktop-1.1.0.19.9.0
deleted file mode 100644
index 844bb1f3b3bc..000000000000
--- a/net-misc/rdesktop/files/digest-rdesktop-1.1.0.19.9.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50cfa4cacd15c52eaa7a57470607acea rdesktop-1.1.0.tar.gz 80584
-MD5 1f46a1b137142474f8e5aef10b5d8d60 rdesktop-unified-patch19-9-0.bz2 140148
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.0 b/net-misc/rdesktop/files/digest-rdesktop-1.3.0
new file mode 100644
index 000000000000..10a010eeceb8
--- /dev/null
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.3.0
@@ -0,0 +1 @@
+MD5 d8108781d227221a823c34b861486a5d rdesktop-1.3.0.tar.gz 136704
diff --git a/net-misc/rdesktop/files/rdesktop-1.3.0-builtin-license.patch b/net-misc/rdesktop/files/rdesktop-1.3.0-builtin-license.patch
new file mode 100644
index 000000000000..44d841efb27e
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.3.0-builtin-license.patch
@@ -0,0 +1,71 @@
+diff -urN rdesktop-1.3.0-orig/Makeconf rdesktop-1.3.0/Makeconf
+--- rdesktop-1.3.0-orig/Makeconf	1969-12-31 19:00:00.000000000 -0500
++++ rdesktop-1.3.0/Makeconf	2003-10-30 01:37:39.000000000 -0500
+@@ -0,0 +1,8 @@
++# Generated by ./configure 
++CC          = gcc
++INSTALL     = install
++CRYPTOBJ    =
++SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o
++CFLAGS      = -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -Wall -O2 -I/usr/X11R6/include -DWITH_OPENSSL -DWITH_RDPSND
++LDFLAGS     =  -L/usr/X11R6/lib -lcrypto
++TARGETS     =  rdesktop
+diff -urN rdesktop-1.3.0-orig/licence.c rdesktop-1.3.0/licence.c
+--- rdesktop-1.3.0-orig/licence.c	2003-10-29 09:13:59.000000000 -0500
++++ rdesktop-1.3.0/licence.c	2003-10-30 08:05:45.000000000 -0500
+@@ -28,6 +28,7 @@
+ 
+ extern char g_username[16];
+ extern char hostname[16];
++extern BOOL built_in_licence;
+ 
+ static uint8 g_licence_key[16];
+ static uint8 g_licence_sign_key[16];
+@@ -118,7 +119,7 @@
+ 
+ 	out_uint32_le(s, 1);
+ 	out_uint16(s, 0);
+-	out_uint16_le(s, 0xff01);
++	out_uint16_le(s, (built_in_licence ? 0x0301 : 0x0ff01) );
+ 
+ 	out_uint8p(s, client_random, SEC_RANDOM_SIZE);
+ 	out_uint16(s, 0);
+diff -urN rdesktop-1.3.0-orig/rdesktop.c rdesktop-1.3.0/rdesktop.c
+--- rdesktop-1.3.0-orig/rdesktop.c	2003-10-29 09:13:59.000000000 -0500
++++ rdesktop-1.3.0/rdesktop.c	2003-10-30 01:39:19.000000000 -0500
+@@ -67,6 +67,7 @@
+ BOOL g_use_rdp5 = True;
+ BOOL g_console_session = False;
+ extern BOOL g_owncolmap;
++BOOL built_in_licence = False;
+ 
+ #ifdef WITH_RDPSND
+ BOOL g_rdpsnd = False;
+@@ -111,6 +112,7 @@
+ 	fprintf(stderr, "   -S: caption button size (single application mode)\n");
+ 	fprintf(stderr, "   -T: window title\n");
+ 	fprintf(stderr, "   -a: connection colour depth\n");
++    fprintf(stderr, "   -l: use built-in licence\n");
+ 	fprintf(stderr, "   -r: enable specified device redirection (currently: sound)\n");
+ 	fprintf(stderr, "   -0: attach to console\n");
+ 	fprintf(stderr, "   -4: use RDP version 4\n");
+@@ -229,7 +231,7 @@
+ #define VNCOPT
+ #endif
+ 
+-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:a:r:045h?")) != -1)
++	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:a:r:045lh?")) != -1)
+ 	{
+ 		switch (c)
+ 		{
+@@ -342,6 +344,10 @@
+ 				g_hide_decorations = True;
+ 				break;
+ 
++            case 'l':
++                built_in_licence = True;
++                break;
++
+ 			case 'K':
+ 				g_grab_keyboard = False;
+ 				break;
diff --git a/net-misc/rdesktop/files/rdesktop-1.3.0-geometry.patch b/net-misc/rdesktop/files/rdesktop-1.3.0-geometry.patch
new file mode 100644
index 000000000000..7d375cb68853
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.3.0-geometry.patch
@@ -0,0 +1,55 @@
+--- rdesktop/xwin.c	2003-10-29 15:13:59.000000000 +0100
++++ rdesktop.mine/xwin.c	2003-11-06 09:03:31.000000000 +0100
+@@ -27,6 +27,7 @@
+ 
+ extern int g_width;
+ extern int g_height;
++extern int g_nXPos, g_nYPos;
+ extern BOOL g_sendmotion;
+ extern BOOL g_fullscreen;
+ extern BOOL g_grab_keyboard;
+@@ -839,7 +840,7 @@
+ 	attribs.backing_store = g_ownbackstore ? NotUseful : Always;
+ 	attribs.override_redirect = g_fullscreen;
+ 
+-	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), 0, 0, wndwidth, wndheight,
++	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_nXPos, g_nYPos, wndwidth, wndheight,
+ 			      0, CopyFromParent, InputOutput, CopyFromParent,
+ 			      CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs);
+ 
+@@ -859,7 +860,9 @@
+ 	sizehints = XAllocSizeHints();
+ 	if (sizehints)
+ 	{
+-		sizehints->flags = PMinSize | PMaxSize;
++		sizehints->flags = PPosition | PSize | PMinSize | PMaxSize;
++		sizehints->x = g_nXPos;
++		sizehints->y = g_nYPos;
+ 		sizehints->min_width = sizehints->max_width = g_width;
+ 		sizehints->min_height = sizehints->max_height = g_height;
+ 		XSetWMNormalHints(g_display, g_wnd, sizehints);
+--- rdesktop/rdesktop.c	2003-10-29 15:13:59.000000000 +0100
++++ rdesktop.mine/rdesktop.c	2003-11-06 08:58:39.000000000 +0100
+@@ -52,6 +52,7 @@
+ 				   absolute value specifies the
+ 				   percent of the whole screen. */
+ int g_height = 600;
++int g_nXPos = 0, g_nYPos = 0;
+ int tcp_port_rdp = TCP_PORT_RDP;
+ int g_server_bpp = 8;
+ int g_win_button_size = 0;	/* If zero, disable single app mode */
+@@ -303,7 +304,13 @@
+ 				}
+ 
+ 				if (*p == 'x')
+-					g_height = strtol(p + 1, NULL, 10);
++					g_height = strtol(p + 1, &p, 10);
++
++				if ( *p == '+' || *p == '-' )
++					g_nXPos = strtol ( p, &p, 10 );
++
++				if ( *p == '+' || *p == '-' )
++					g_nYPos = strtol ( p, NULL, 10 );
+ 
+ 				if (g_height <= 0)
+ 				{
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
new file mode 100644
index 000000000000..045c43e7aa2e
--- /dev/null
+++ b/net-misc/rdesktop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>noherd</herd>
+<maintainer>
+  <email>wolf31o2@gentoo.org</email>
+  <name>Chris Gianelloni</name>
+</maintainer>
+<longdescription>
+rdesktop is an open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild
deleted file mode 100644
index 1b67992b012a..000000000000
--- a/net-misc/rdesktop/rdesktop-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.1.0-r1.ebuild,v 1.11 2003/08/03 04:01:58 vapier 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 sparc"
-IUSE="ssl debug"
-
-DEPEND="virtual/x11
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		`use_with ssl openssl` \
-		`use_with debug` \
-		|| die
-
-	use ssl && echo "CFLAGS += -I/usr/include/openssl" >> Makeconf
-
-	# Hold on tight folks, this ain't purdy
-	if [ ! -z "${CXXFLAGS}" ]; then
-		sed -e 's:-O2::g' Makefile > Makefile.tmp
-		mv Makefile.tmp Makefile
-		echo "CFLAGS += ${CXXFLAGS}" >> Makeconf
-	fi
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dobin rdesktop
-	doman rdesktop.1
-	dodoc COPYING
-}
diff --git a/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild b/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild
deleted file mode 100644
index 5f76534596ed..000000000000
--- a/net-misc/rdesktop/rdesktop-1.1.0.19.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.1.0.19.9.0.ebuild,v 1.6 2003/09/05 22:13:37 msterret Exp $
-
-PATCH_PV="19-9-0"
-PATCH_PV_SED=".${PATCH_PV//-/.}"
-MY_P=${P/$PATCH_PV_SED}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rdesktop/${MY_P}.tar.gz
-	http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch${PATCH_PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="ssl debug"
-
-DEPEND="virtual/x11
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	epatch ${DISTDIR}/rdesktop-unified-patch${PATCH_PV}.bz2
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		`use_with ssl openssl` \
-	        `use_with debug` \
-		|| die
-
-	use ssl && echo "CFLAGS += -I/usr/include/openssl" >> Makeconf
-
-	# Hold on tight folks, this ain't purdy
-	if [ ! -z "${CXXFLAGS}" ]; then
-		sed -e 's:-O2::g' Makefile > Makefile.tmp
-		mv Makefile.tmp Makefile
-		echo "CFLAGS += ${CXXFLAGS}" >> Makeconf
-	fi
-
-	make localendian.h || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	dobin rdesktop
-	doman rdesktop.1
-	dodoc COPYING CHANGES readme.txt rdp-srvr-readme.txt
-}
diff --git a/net-misc/rdesktop/rdesktop-1.3.0.ebuild b/net-misc/rdesktop/rdesktop-1.3.0.ebuild
new file mode 100644
index 000000000000..152340a39598
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.3.0.ebuild
@@ -0,0 +1,61 @@
+# 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.1 2003/11/10 21:49:36 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"
+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
+}
+
+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
+}