From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 13 16:20:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F35278B for ; Thu, 13 Feb 2014 16:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5959E15D5 for ; Thu, 13 Feb 2014 16:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1DGK0ek062588 for ; Thu, 13 Feb 2014 16:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1DGK0KH062587; Thu, 13 Feb 2014 16:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 13 Feb 2014 16:20:00 GMT Resent-Message-Id: <201402131620.s1DGK0KH062587@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Koichiro IWAO Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6FA56F8 for ; Thu, 13 Feb 2014 16:17:01 +0000 (UTC) Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B16DE15B4 for ; Thu, 13 Feb 2014 16:17:01 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1DGH19q076657 for ; Thu, 13 Feb 2014 16:17:01 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1DGH1sQ076653; Thu, 13 Feb 2014 16:17:01 GMT (envelope-from nobody) Message-Id: <201402131617.s1DGH1sQ076653@cgiserv.freebsd.org> Date: Thu, 13 Feb 2014 16:17:01 GMT From: Koichiro IWAO To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/186729: [maintainer update] net/xrdp: add x11rdp support and enable by default X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 16:20:00 -0000 >Number: 186729 >Category: ports >Synopsis: [maintainer update] net/xrdp: add x11rdp support and enable by default >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Feb 13 16:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Koichiro IWAO >Release: >Organization: >Environment: >Description: Since x11-servers/x11rdp has been added, - Add x11rdp support and enable by default - Enhance default encryption level (backport from upstream [1]) - Bump PORTREVISION for package change [1] https://github.com/neutrinolabs/xrdp/pull/100 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile --- /usr/ports/net/xrdp/Makefile 2014-01-27 09:23:14.559779212 +0900 +++ net/xrdp/Makefile 2014-02-14 00:57:24.105275034 +0900 @@ -3,7 +3,7 @@ PORTNAME= xrdp PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= GH @@ -29,18 +29,20 @@ CONFIGURE_ARGS= --localstatedir=/var LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -CONFLICTS= xrdp-devel-[0-9]* +CONFLICTS_INSTALL= xrdp-devel-[0-9]* x11rdp-devel-[0-9]* OPTIONS_DEFINE= DEBUG -OPTIONS_DEFAULT= JP106 TIGERVNC -OPTIONS_GROUP= KEYMAP +OPTIONS_DEFAULT= JP106 X11RDP +OPTIONS_GROUP= KEYMAP XSERVER OPTIONS_GROUP_KEYMAP= JP106 +OPTIONS_GROUP_XSERVER= X11RDP OPTIONS_RADIO= XVNC OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC REALVNC_DESC= Use RealVNC TIGERVNC_DESC= Use TigerVNC (recommended) TIGHTVNC_DESC= Use TightVNC TRIDIAVNC_DESC= Use TridiaVNC +X11RDP_DESC= Use X11rdp (most recommended) JP106_DESC= Install Japanese JP106 keymap .include @@ -58,6 +60,11 @@ .if ${PORT_OPTIONS:MTRIDIAVNC} RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc .endif +# X11rdp +.if ${PORT_OPTIONS:MX11RDP} || exists(${LOCALBASE}/bin/X11rdp) +RUN_DEPENDS+= X11rdp:${PORTSDIR}/x11-servers/x11rdp +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini +.endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-xrdpdebug diff -ruN /usr/ports/net/xrdp/files/extra-patch-x11rdp_xrdp.ini net/xrdp/files/extra-patch-x11rdp_xrdp.ini --- /usr/ports/net/xrdp/files/extra-patch-x11rdp_xrdp.ini 1970-01-01 09:00:00.000000000 +0900 +++ net/xrdp/files/extra-patch-x11rdp_xrdp.ini 2013-12-19 15:05:11.128270698 +0900 @@ -0,0 +1,74 @@ +--- xrdp/xrdp.ini.orig 2013-02-01 14:36:13.909344583 +0000 ++++ xrdp/xrdp.ini 2013-02-01 14:41:12.679342721 +0000 +@@ -17,6 +17,15 @@ + #background=626c72 + + [xrdp1] ++name=sesman-X11rdp ++lib=libxup.so ++username=ask ++password=ask ++ip=127.0.0.1 ++port=-1 ++xserverbpp=24 ++ ++[xrdp2] + name=sesman-Xvnc + lib=libvnc.so + username=ask +@@ -24,7 +33,7 @@ + ip=127.0.0.1 + port=-1 + +-[xrdp2] ++[xrdp3] + name=console + lib=libvnc.so + ip=127.0.0.1 +@@ -32,7 +41,7 @@ + username=na + password=ask + +-[xrdp3] ++[xrdp4] + name=vnc-any + lib=libvnc.so + ip=ask +@@ -40,7 +49,7 @@ + username=na + password=ask + +-[xrdp4] ++[xrdp5] + name=sesman-any + lib=libvnc.so + ip=ask +@@ -48,13 +57,13 @@ + username=ask + password=ask + +-[xrdp5] ++[xrdp6] + name=rdp-any + lib=librdp.so + ip=ask + port=ask3389 + +-[xrdp6] ++[xrdp7] + name=freerdp-any + lib=libxrdpfreerdp1.so + ip=ask +@@ -62,11 +71,4 @@ + username=ask + password=ask + +-[xrdp7] +-name=sesman-X11rdp +-lib=libxup.so +-username=ask +-password=ask +-ip=127.0.0.1 +-port=-1 +-xserverbpp=24 ++ diff -ruN /usr/ports/net/xrdp/files/patch-xrdp_xrdp.ini net/xrdp/files/patch-xrdp_xrdp.ini --- /usr/ports/net/xrdp/files/patch-xrdp_xrdp.ini 1970-01-01 09:00:00.000000000 +0900 +++ net/xrdp/files/patch-xrdp_xrdp.ini 2013-12-19 16:07:36.937268569 +0900 @@ -0,0 +1,11 @@ +--- xrdp/xrdp.ini.orig 2013-09-12 21:36:02.000000000 +0000 ++++ xrdp/xrdp.ini 2013-12-19 07:05:11.089270612 +0000 +@@ -3,7 +3,7 @@ + bitmap_cache=yes + bitmap_compression=yes + port=3389 +-crypt_level=low ++crypt_level=high + channel_code=1 + max_bpp=24 + #black=000000 >Release-Note: >Audit-Trail: >Unformatted: