23245493 Move rdesktop 1.6.0 to Userland
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Wed, 16 Nov 2016 18:51:09 -0800
changeset 7330 e40cd9caccc7
parent 7329 64b0ecdb0e74
child 7331 a36c61e047b0
23245493 Move rdesktop 1.6.0 to Userland
components/desktop/rdesktop/Makefile
components/desktop/rdesktop/patches/rdesktop-01-sun-keymap.patch
components/desktop/rdesktop/patches/rdesktop-02-g11n-i18n-title.patch
components/desktop/rdesktop/patches/rdesktop-04-remote-file-access.patch
components/desktop/rdesktop/rdesktop.p5m
components/meta-packages/incorporation-cache
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/rdesktop/Makefile	Wed Nov 16 18:51:09 2016 -0800
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		64
+COMPILER=		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		rdesktop
+COMPONENT_VERSION=	1.6.0
+COMPONENT_PROJECT_URL=	http://www.rdesktop.org/
+COMPONENT_ARCHIVE_HASH= \
+	sha256:8430390d50be29f257d575a70abe38805916dc1897b18e5a244adb72c978d4e0
+COMPONENT_ARCHIVE_URL=	https://github.com/rdesktop/$(COMPONENT_NAME)/archive/v$(COMPONENT_VERSION).tar.gz
+COMPONENT_BUGDB=	gnome/remote-desktop
+
+TPNO=			26597
+
+TEST_TARGET = $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/common.mk
+
+# rdesktop-1.6.0 tarball includes configure.ac but not configure, so we make it
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
+COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+
+CONFIGURE_OPTIONS += --with-ipv6
+CONFIGURE_OPTIONS += --with-openssl=/usr
+
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += x11/library/libx11
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/rdesktop/patches/rdesktop-01-sun-keymap.patch	Wed Nov 16 18:51:09 2016 -0800
@@ -0,0 +1,76 @@
+Existing set of patches from the desktop gate.  Not suitable for upstream
+
+
+--- rdesktop-1.5.0/keymaps/common.orig	2008-02-18 17:53:38.985920000 +0900
++++ rdesktop-1.5.0/keymaps/common	2008-02-18 19:17:09.696254000 +0900
[email protected]@ -183,8 +183,11 @@ Right 0xcd localstate
+ #
+ Num_Lock 0x45
+ KP_Divide 0xb5 localstate
++F25 0xb5 localstate
+ KP_Multiply 0x37 localstate
++F26 0x37 localstate
+ KP_Subtract 0x4a localstate
++F24 0x4a localstate
+ KP_Add 0x4e localstate
+ KP_Enter 0x9c localstate
+ 
[email protected]@ -197,30 +200,39 @@ KP_Insert 0x52 localstate
+ 
+ KP_1 0x4f numlock
+ KP_End 0x4f localstate
++F33 0x4f localstate
+ 
+ KP_2 0x50 numlock
+ KP_Down 0x50 localstate
++Down 0x50 localstate
+ 
+ KP_3 0x51 numlock
+ KP_Next 0x51 localstate
++F35 0x51 localstate
+ 
+ KP_4 0x4b numlock
+ KP_Left 0x4b localstate
++Left 0x4b localstate
+ 
+ KP_5 0x4c numlock
+ KP_Begin 0x4c localstate
++F31 0x4c localstate
+ 
+ KP_6 0x4d numlock
+ KP_Right 0x4d localstate
++Right 0x4d localstate
+ 
+ KP_7 0x47 numlock
+ KP_Home 0x47 localstate
++F27 0x47 localstate
+ 
+ KP_8 0x48 numlock
+ KP_Up 0x48 localstate
++Up 0x48 localstate
+ 
+ KP_9 0x49 numlock
+ KP_Prior 0x49 localstate
++F29 0x49 localstate
+ 
+ #
+ # Inhibited keys
+--- rdesktop-1.5.0/keymaps/ja-orig	2006-04-10 03:27:53.000000000 +0900
++++ rdesktop-1.5.0/keymaps/ja	2008-02-18 20:45:47.664571000 +0900
[email protected]@ -97,11 +97,13 @@ question 0x35 shift
+ kana_ME 0x35 altgr
+ kana_conjunctive 0x35 shift altgr
+ Eisu_toggle 0x3a shift
+-Execute 0x54 shift
+-Kanji 0x70
++Execute 0x7b
++Kanji 0x79
+ backslash 0x73
+ bar 0x7d shift
+ underscore 0x73 shift
+-Henkan_Mode 0x79
++Henkan_Mode 0x29
+ Katakana 0x70
+ Muhenkan 0x7b
++Multi_key 0xdd
++Mode_switch 0x70
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/rdesktop/patches/rdesktop-02-g11n-i18n-title.patch	Wed Nov 16 18:51:09 2016 -0800
@@ -0,0 +1,26 @@
+Existing set of patches from the desktop gate.  Potentially send upstream
+
+--- rdesktop-1.6.0/ewmhints.c.orig	2008-09-11 13:50:48.793730000 +0900
++++ rdesktop-1.6.0/ewmhints.c	2008-09-11 15:16:52.075814000 +0900
[email protected]@ -402,11 +402,17 @@ ewmh_move_to_desktop(Window wnd, unsigne
+ void
+ ewmh_set_wm_name(Window wnd, const char *title)
+ {
+-	int len;
++	int len, res;
++	XTextProperty property;
+ 
+-	len = strlen(title);
+-	XChangeProperty(g_display, wnd, g_net_wm_name_atom, g_utf8_string_atom,
+-			8, PropModeReplace, (unsigned char *) title, len);
++	res = XmbTextListToTextProperty(g_display, (char**)&title, 1, XCompoundTextStyle, &property);
++	if (res == Success) {
++		XSetWMName(g_display, wnd, &property);
++	} else {
++		len = strlen(title);
++		XChangeProperty(g_display, wnd, g_net_wm_name_atom, g_utf8_string_atom,
++		                8, PropModeReplace, (unsigned char *) title, len);
++	}
+ }
+ 
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/rdesktop/patches/rdesktop-04-remote-file-access.patch	Wed Nov 16 18:51:09 2016 -0800
@@ -0,0 +1,24 @@
+Existing set of patches from the desktop gate.  Potentially send upstream
+
+--- rdesktop-1.6.0.orig/disk.c	2008-02-16 01:13:25.000000000 +0100
++++ rdesktop-1.6.0/disk.c	2011-06-13 18:29:54.232977906 +0200
[email protected]@ -356,6 +356,19 @@
+ 		filename[strlen(filename) - 1] = 0;
+ 	sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename);
+ 
++	/* Protect against mailicous servers:
++	   somelongpath/..     # not allowed
++	               /../b   # not allowed
++                      /..b    # currently not allowed
++                      /b..    # allowed
++                      /b..b   # allowed
++                      /b../c  # allowed
++        */
++        if (strstr(path, "/.."))
++        {
++            return RD_STATUS_ACCESS_DENIED;
++        }
++
+ 	switch (create_disposition)
+ 	{
+ 		case CREATE_ALWAYS:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/rdesktop/rdesktop.p5m	Wed Nov 16 18:51:09 2016 -0800
@@ -0,0 +1,80 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/desktop/remote-desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="RDP, Microsoft Terminal Services client"
+set name=com.oracle.info.description value=rdesktop
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/083
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/rdesktop
+file path=usr/share/man/man1/rdesktop.1
+file path=usr/share/rdesktop/keymaps/ar
+file path=usr/share/rdesktop/keymaps/common
+file path=usr/share/rdesktop/keymaps/cs
+file path=usr/share/rdesktop/keymaps/da
+file path=usr/share/rdesktop/keymaps/de
+file path=usr/share/rdesktop/keymaps/de-ch
+file path=usr/share/rdesktop/keymaps/en-dv
+file path=usr/share/rdesktop/keymaps/en-gb
+file path=usr/share/rdesktop/keymaps/en-us
+file path=usr/share/rdesktop/keymaps/es
+file path=usr/share/rdesktop/keymaps/et
+file path=usr/share/rdesktop/keymaps/fi
+file path=usr/share/rdesktop/keymaps/fo
+file path=usr/share/rdesktop/keymaps/fr
+file path=usr/share/rdesktop/keymaps/fr-be
+file path=usr/share/rdesktop/keymaps/fr-ca
+file path=usr/share/rdesktop/keymaps/fr-ch
+file path=usr/share/rdesktop/keymaps/he
+file path=usr/share/rdesktop/keymaps/hr
+file path=usr/share/rdesktop/keymaps/hu
+file path=usr/share/rdesktop/keymaps/is
+file path=usr/share/rdesktop/keymaps/it
+file path=usr/share/rdesktop/keymaps/ja
+file path=usr/share/rdesktop/keymaps/ko
+file path=usr/share/rdesktop/keymaps/lt
+file path=usr/share/rdesktop/keymaps/lv
+file path=usr/share/rdesktop/keymaps/mk
+file path=usr/share/rdesktop/keymaps/modifiers
+file path=usr/share/rdesktop/keymaps/nl
+file path=usr/share/rdesktop/keymaps/nl-be
+file path=usr/share/rdesktop/keymaps/no
+file path=usr/share/rdesktop/keymaps/pl
+file path=usr/share/rdesktop/keymaps/pt
+file path=usr/share/rdesktop/keymaps/pt-br
+file path=usr/share/rdesktop/keymaps/ru
+file path=usr/share/rdesktop/keymaps/sl
+file path=usr/share/rdesktop/keymaps/sv
+file path=usr/share/rdesktop/keymaps/th
+file path=usr/share/rdesktop/keymaps/tr
+license COPYING license=GPLv2
--- a/components/meta-packages/incorporation-cache	Wed Nov 16 18:50:51 2016 -0800
+++ b/components/meta-packages/incorporation-cache	Wed Nov 16 18:51:09 2016 -0800
@@ -58,7 +58,6 @@
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:desktop/cd-burning/[email protected]
 consolidation/userland/userland-incorporation:desktop/[email protected]
-consolidation/userland/userland-incorporation:desktop/remote-desktop/[email protected]
 consolidation/userland/userland-incorporation:gnome/security/seahorse/[email protected]
 consolidation/userland/userland-incorporation:gnome/speech/gnome-speech/driver/[email protected]
 consolidation/userland/userland-incorporation:gnome/window-manager/[email protected]