pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/rdesktop Update "rdesktop" package to version 1.6....
details: https://anonhg.NetBSD.org/pkgsrc/rev/1cbb8f4c396a
branches: trunk
changeset: 543200:1cbb8f4c396a
user: tron <tron%pkgsrc.org@localhost>
date: Sun Jun 08 16:29:28 2008 +0000
description:
Update "rdesktop" package to version 1.6.0. Changes since 1.5.0:
* Fix for potential vulnerability against compromised/malicious
servers (reported by iDefense)
* Fix for crash with recent versions of X.Org
* Fix for connection to Windows 2008 Server
* ALSA driver added
* Sound drivers can now be selected at runtime
* Smartcard support (Alexi Volkov <alexi@my...>)
* Send physical mouse buttons rather than logical ones
The security fixes had already been integrated into "pkgsrc" as patches.
diffstat:
net/rdesktop/Makefile | 12 ++-
net/rdesktop/distinfo | 16 +---
net/rdesktop/options.mk | 14 ++++
net/rdesktop/patches/patch-ab | 15 ----
net/rdesktop/patches/patch-ac | 16 -----
net/rdesktop/patches/patch-ad | 133 ------------------------------------------
net/rdesktop/patches/patch-ae | 13 ----
net/rdesktop/patches/patch-af | 22 ------
net/rdesktop/patches/patch-ag | 33 ----------
net/rdesktop/patches/patch-ah | 13 ----
net/rdesktop/patches/patch-ai | 19 ------
11 files changed, 26 insertions(+), 280 deletions(-)
diffs (truncated from 363 to 300 lines):
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/Makefile
--- a/net/rdesktop/Makefile Sun Jun 08 14:36:37 2008 +0000
+++ b/net/rdesktop/Makefile Sun Jun 08 16:29:28 2008 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2008/05/10 15:28:04 tonnerre Exp $
-#
+# $NetBSD: Makefile,v 1.35 2008/06/08 16:29:28 tron Exp $
-DISTNAME= rdesktop-1.5.0
-PKGREVISION= 4
+DISTNAME= rdesktop-1.6.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
@@ -24,6 +22,12 @@
SUBST_SED.audio= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_MESSAGE.audio= Fixing hardcoded audio device.
+.include "options.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+= --with-sound=oss
+.endif
+
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/distinfo
--- a/net/rdesktop/distinfo Sun Jun 08 14:36:37 2008 +0000
+++ b/net/rdesktop/distinfo Sun Jun 08 16:29:28 2008 +0000
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.18 2008/05/10 15:28:04 tonnerre Exp $
+$NetBSD: distinfo,v 1.19 2008/06/08 16:29:28 tron Exp $
-SHA1 (rdesktop-1.5.0.tar.gz) = e3086bf865191eed41631813125f482e279c7f3d
-RMD160 (rdesktop-1.5.0.tar.gz) = 350e08166d0b7620b4ed9c6594addae7ec53d15a
-Size (rdesktop-1.5.0.tar.gz) = 245137 bytes
+SHA1 (rdesktop-1.6.0.tar.gz) = b8bfd03d4640d285a0aee5b3fb199a47cb4225f2
+RMD160 (rdesktop-1.6.0.tar.gz) = cf604cd1bc0707b485deb653efa3e47e21fabc4c
+Size (rdesktop-1.6.0.tar.gz) = 284728 bytes
SHA1 (patch-aa) = dda84f70792828c97aa02567b97d2ae9647b6fcb
-SHA1 (patch-ab) = 396a37a4f6f0751e014bd548f9c44f6c462812e1
-SHA1 (patch-ac) = 075ac18148124e5aaa88ee7e5bbd03059d054703
-SHA1 (patch-ad) = 7d439f5dd9f297b6408c60da9d1838c47cc1a90f
-SHA1 (patch-ae) = 556ddf2c44f873c5af99d5e85c51d3097e46eb8b
-SHA1 (patch-af) = 666ca22f3429722cf277af07bbbef2aadfe08281
-SHA1 (patch-ag) = f36405b112a586b0558f52975d3a7c7e3a0ff933
-SHA1 (patch-ah) = 3ab85738b7e2b62e45e4b1e4f4de3714c00a9fe7
-SHA1 (patch-ai) = c167000000e7cea29fcf33be2c9ca60bc472f4da
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/rdesktop/options.mk Sun Jun 08 16:29:28 2008 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2008/06/08 16:29:28 tron Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.rdesktop
+PKG_SUPPORTED_OPTIONS+= inet6
+PKG_SUGGESTED_OPTIONS+= inet6
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Support both IPv6 and IPv4 connections.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGE+= --with-ipv6
+.endif
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-ab
--- a/net/rdesktop/patches/patch-ab Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/06/06 00:16:35 tnn Exp $
-
-http://rdesktop.cvs.sourceforge.net/rdesktop/rdesktop/xwin.c?r1=1.222&r2=1.223&view=patch
-
---- xwin.c 2007/01/17 07:39:31 1.222
-+++ xwin.c 2007/04/12 16:04:25 1.223
-@@ -3218,7 +3218,7 @@
- return;
-
- image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-- (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
-+ (char *) data, cx, cy, g_bpp, 0);
-
- if (g_ownbackstore)
- {
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-ac
--- a/net/rdesktop/patches/patch-ac Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2008/05/10 15:28:04 tonnerre Exp $
-
---- iso.c.orig 2006-08-07 13:45:43.000000000 +0200
-+++ iso.c
-@@ -98,6 +98,11 @@ iso_recv_msg(uint8 * code, uint8 * rdpve
- next_be(s, length);
- }
- }
-+ if (length < 4)
-+ {
-+ error("Bad packet header\n");
-+ return NULL;
-+ }
- s = tcp_recv(s, length - 4);
- if (s == NULL)
- return NULL;
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-ad
--- a/net/rdesktop/patches/patch-ad Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/05/10 15:28:04 tonnerre Exp $
-
---- rdp.c.orig 2006-08-07 13:45:43.000000000 +0200
-+++ rdp.c
-@@ -241,10 +241,10 @@ rdp_out_unistr(STREAM s, char *string, i
- * Returns str_len of string
- */
- int
--rdp_in_unistr(STREAM s, char *string, int uni_len)
-+rdp_in_unistr(STREAM s, char *string, int str_size, int in_len)
- {
- #ifdef HAVE_ICONV
-- size_t ibl = uni_len, obl = uni_len;
-+ size_t ibl = in_len, obl = str_size-1;
- char *pin = (char *) s->p, *pout = string;
- static iconv_t iconv_h = (iconv_t) - 1;
-
-@@ -258,37 +258,56 @@ rdp_in_unistr(STREAM s, char *string, in
- WINDOWS_CODEPAGE, g_codepage, (int) iconv_h);
-
- g_iconv_works = False;
-- return rdp_in_unistr(s, string, uni_len);
-+ return rdp_in_unistr(s, string, str_size, in_len);
- }
- }
-
- if (iconv(iconv_h, (ICONV_CONST char **) &pin, &ibl, &pout, &obl) == (size_t) - 1)
- {
-- iconv_close(iconv_h);
-- iconv_h = (iconv_t) - 1;
-- warning("rdp_in_unistr: iconv fail, errno %d\n", errno);
-+ if (errno == E2BIG)
-+ {
-+ warning("server sent an unexpectedly long string, truncating\n");
-+ }
-+ else
-+ {
-+ iconv_close(iconv_h);
-+ iconv_h = (iconv_t) - 1;
-+ warning("rdp_in_unistr: iconv fail, errno %d\n", errno);
-
-- g_iconv_works = False;
-- return rdp_in_unistr(s, string, uni_len);
-+ g_iconv_works = False;
-+ return rdp_in_unistr(s, string, str_size, in_len);
-+ }
- }
-
- /* we must update the location of the current STREAM for future reads of s->p */
-- s->p += uni_len;
-+ s->p += in_len;
-
-+ *pout = 0;
- return pout - string;
- }
- else
- #endif
- {
- int i = 0;
-+ int len = in_len / 2;
-+ int rem = 0;
-+
-+ if (len > str_size - 1)
-+ {
-+ warning("server sent an unexpectedly long string, truncating\n");
-+ len = str_size - 1;
-+ rem = in_len - 2 * len;
-+ }
-
-- while (i < uni_len / 2)
-+ while (i < len)
- {
- in_uint8a(s, &string[i++], 1);
- in_uint8s(s, 1);
- }
-
-- return i - 1;
-+ in_uint8s(s, rem);
-+ string[len] = 0;
-+ return len;
- }
- }
-
-@@ -1323,32 +1342,44 @@ process_redirect_pdu(STREAM s /*, uint32
- in_uint32_le(s, len);
-
- /* read ip string */
-- rdp_in_unistr(s, g_redirect_server, len);
-+ rdp_in_unistr(s, g_redirect_server, sizeof(g_redirect_server), len);
-
- /* read length of cookie string */
- in_uint32_le(s, len);
-
- /* read cookie string (plain ASCII) */
-- in_uint8a(s, g_redirect_cookie, len);
-+ if (len > sizeof(g_redirect_cookie)-1)
-+ {
-+ uint32 rem = len - (sizeof(g_redirect_cookie)-1);
-+ len = sizeof(g_redirect_cookie)-1;
-+
-+ warning("Unexpectedly large redirection cookie\n");
-+ in_uint8a(s, g_redirect_cookie, len);
-+ in_uint8s(s, rem);
-+ }
-+ else
-+ {
-+ in_uint8a(s, g_redirect_cookie, len);
-+ }
- g_redirect_cookie[len] = 0;
-
- /* read length of username string */
- in_uint32_le(s, len);
-
- /* read username string */
-- rdp_in_unistr(s, g_redirect_username, len);
-+ rdp_in_unistr(s, g_redirect_username, sizeof(g_redirect_username), len);
-
- /* read length of domain string */
- in_uint32_le(s, len);
-
- /* read domain string */
-- rdp_in_unistr(s, g_redirect_domain, len);
-+ rdp_in_unistr(s, g_redirect_domain, sizeof(g_redirect_domain), len);
-
- /* read length of password string */
- in_uint32_le(s, len);
-
- /* read password string */
-- rdp_in_unistr(s, g_redirect_password, len);
-+ rdp_in_unistr(s, g_redirect_password, sizeof(g_redirect_password), len);
-
- g_redirect = True;
-
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-ae
--- a/net/rdesktop/patches/patch-ae Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/05/10 15:28:04 tonnerre Exp $
-
---- proto.h.orig 2006-08-07 13:45:43.000000000 +0200
-+++ proto.h
-@@ -135,7 +135,7 @@ BOOL rd_lock_file(int fd, int start, int
- void rdp5_process(STREAM s);
- /* rdp.c */
- void rdp_out_unistr(STREAM s, char *string, int len);
--int rdp_in_unistr(STREAM s, char *string, int uni_len);
-+int rdp_in_unistr(STREAM s, char *string, int str_size, int in_len);
- void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1,
- uint16 param2);
- void rdp_send_client_window_status(int status);
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-af
--- a/net/rdesktop/patches/patch-af Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/05/10 15:28:04 tonnerre Exp $
-
---- rdpdr.c.orig 2006-08-07 13:45:43.000000000 +0200
-+++ rdpdr.c
-@@ -415,7 +415,7 @@ rdpdr_process_irp(STREAM s)
-
- if (length && (length / 2) < 256)
- {
-- rdp_in_unistr(s, filename, length);
-+ rdp_in_unistr(s, filename, sizeof(filename), length);
- convert_to_unix_filename(filename);
- }
- else
-@@ -608,7 +608,7 @@ rdpdr_process_irp(STREAM s)
- in_uint8s(s, 0x17);
- if (length && length < 2 * 255)
- {
-- rdp_in_unistr(s, filename, length);
-+ rdp_in_unistr(s, filename, sizeof(filename), length);
- convert_to_unix_filename(filename);
- }
- else
diff -r 451c5bdf60ba -r 1cbb8f4c396a net/rdesktop/patches/patch-ag
--- a/net/rdesktop/patches/patch-ag Sun Jun 08 14:36:37 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/05/10 15:28:04 tonnerre Exp $
-
---- printercache.c.orig 2006-08-07 13:45:43.000000000 +0200
-+++ printercache.c
-@@ -245,8 +245,8 @@ printercache_process(STREAM s)
-
- /* NOTE - 'driver' doesn't contain driver, it contains the new printer name */
-
-- rdp_in_unistr(s, printer, printer_length);
-- rdp_in_unistr(s, driver, driver_length);
Home |
Main Index |
Thread Index |
Old Index