diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2004-10-11 23:27:40 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2004-10-11 23:27:40 +0000 |
commit | ac4ae4930f93667954afe970c05316d455905cfa (patch) | |
tree | 3005141ab8afc9a50dd4c7d9ef43df6ccde83d0c /net-misc/rdesktop | |
parent | stable on x86 (diff) | |
download | historical-ac4ae4930f93667954afe970c05316d455905cfa.tar.gz historical-ac4ae4930f93667954afe970c05316d455905cfa.tar.bz2 historical-ac4ae4930f93667954afe970c05316d455905cfa.zip |
Removing old versions and patches. Stabilizing on all arches (zero bugs in 43 days) and closing bug #67174.
Diffstat (limited to 'net-misc/rdesktop')
-rw-r--r-- | net-misc/rdesktop/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/rdesktop/Manifest | 23 | ||||
-rw-r--r-- | net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1 | 1 | ||||
-rw-r--r-- | net-misc/rdesktop/files/digest-rdesktop-1.3.1 | 1 | ||||
-rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.3.0-builtin-license.patch | 71 | ||||
-rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.3.0-geometry.patch | 55 | ||||
-rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch | 42 | ||||
-rw-r--r-- | net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild | 66 | ||||
-rw-r--r-- | net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild | 4 | ||||
-rw-r--r-- | net-misc/rdesktop/rdesktop-1.3.1.ebuild | 42 |
10 files changed, 14 insertions, 301 deletions
diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog index c3cec3aef5e3..4d5d452cba77 100644 --- a/net-misc/rdesktop/ChangeLog +++ b/net-misc/rdesktop/ChangeLog @@ -1,10 +1,18 @@ # ChangeLog for net-misc/rdesktop # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.41 2004/10/03 21:10:58 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.42 2004/10/11 23:27:40 wolf31o2 Exp $ 03 Oct 2004; Sven Wegener <swegener@gentoo.org> metadata.xml: Fixed herd in metadata.xml. + 11 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml, + -files/rdesktop-1.3.0-builtin-license.patch, + -files/rdesktop-1.3.0-geometry.patch, + -files/rdesktop-1.3.0-last-two-certs.patch, -rdesktop-1.3.0-r1.ebuild, + rdesktop-1.3.1-r1.ebuild, -rdesktop-1.3.1.ebuild: + Removing old versions and patches. Stabilizing on all arches (zero bugs in + 43 days) and closing bug #67174. + 15 Sep 2004; <blubb@gentoo.org> rdesktop-1.3.1-r1.ebuild: added ~amd64 diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index b98cb02dff62..d408bd1ce5eb 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -1,22 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 0a8d0f870c7c88b5a82f7f4d814049b8 ChangeLog 5342 +MD5 cf603f45c8bdb935b03b33ca46afbc0d rdesktop-1.3.1-r1.ebuild 1181 +MD5 c5fb1eb00de738549584b605c39b5314 ChangeLog 5735 MD5 e6f419cdae06716e25ca3f9af98bad25 metadata.xml 555 -MD5 beec453a865a647e9eb3e4078b6d7ede rdesktop-1.3.0-r1.ebuild 1824 -MD5 a73f5816dfd204a7d46a8222ba730abd rdesktop-1.3.1-r1.ebuild 1185 -MD5 37d16d26fe9d7d4b4f39f0520e56ed73 rdesktop-1.3.1.ebuild 978 -MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0-r1 66 -MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1 66 -MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1-r1 66 -MD5 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395 -MD5 575e5d9fe8a75cb24dcf3c4d1f4348b4 files/rdesktop-1.3.0-geometry.patch 1868 -MD5 4120908a83d84e4150a2cce191f2bbc0 files/rdesktop-1.3.0-last-two-certs.patch 1146 MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBYGrrI1lqEGTUzyQRAnFpAKDJiWfHfsH/NUws8LokIxRSnQgS1ACg3EYy -6Tv3sRTWl/QmfBF5YAmVY4Y= -=1ZV0 ------END PGP SIGNATURE----- +MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1-r1 66 diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1 deleted file mode 100644 index 10a010eeceb8..000000000000 --- a/net-misc/rdesktop/files/digest-rdesktop-1.3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d8108781d227221a823c34b861486a5d rdesktop-1.3.0.tar.gz 136704 diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.1 deleted file mode 100644 index 928168058f7c..000000000000 --- a/net-misc/rdesktop/files/digest-rdesktop-1.3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz 139686 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 deleted file mode 100644 index 44d841efb27e..000000000000 --- a/net-misc/rdesktop/files/rdesktop-1.3.0-builtin-license.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 7d375cb68853..000000000000 --- a/net-misc/rdesktop/files/rdesktop-1.3.0-geometry.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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/files/rdesktop-1.3.0-last-two-certs.patch b/net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch deleted file mode 100644 index 0d40ebe62212..000000000000 --- a/net-misc/rdesktop/files/rdesktop-1.3.0-last-two-certs.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 deleted file mode 100644 index 7586e507e321..000000000000 --- a/net-misc/rdesktop/rdesktop-1.3.0-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# 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.6 2004/06/25 00:08:05 agriffis Exp $ - -inherit eutils - -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="virtual/x11 - 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 -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure - - ./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.1-r1.ebuild b/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild index ca844e4c2d8d..9e66595e9618 100644 --- a/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild +++ b/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild,v 1.2 2004/09/15 18:33:22 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild,v 1.3 2004/10/11 23:27:40 wolf31o2 Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~ppc64 ~amd64" +KEYWORDS="x86 ppc sparc alpha ia64 ppc64 amd64" IUSE="kde ssl debug" DEPEND="virtual/x11 diff --git a/net-misc/rdesktop/rdesktop-1.3.1.ebuild b/net-misc/rdesktop/rdesktop-1.3.1.ebuild deleted file mode 100644 index 53b5130862ba..000000000000 --- a/net-misc/rdesktop/rdesktop-1.3.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1.ebuild,v 1.10 2004/07/19 02:31:32 tgall 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 alpha ia64 ppc64" -IUSE="ssl debug" - -DEPEND="virtual/x11 - ssl? ( >=dev-libs/openssl-0.9.6b )" - -src_unpack() { - unpack ${A} -} - -src_compile() { - local myconf - use ssl \ - && myconf="--with-openssl=/usr/include/openssl" \ - || myconf="--without-openssl" - - sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure - - ./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 -} |