ports/155509: Update port: net/xrdp update to current cvs version and JP106 keyboard support improvement

Iwao at rose.club.kyutech.ac.jp Iwao at rose.club.kyutech.ac.jp
Sun Mar 13 04:10:14 UTC 2011 

>Number:         155509
>Category:       ports
>Synopsis:       Update port: net/xrdp update to current cvs version and JP106 keyboard support improvement
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 13 04:10:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Iwao, Koichiro
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
Kyushu Institute of Technology
>Environment:
System: FreeBSD rose.club.kyutech.ac.jp 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Tue Mar 1 21:18:22 JST 2011 root at rose.club.kyutech.ac.jp:/usr/obj/usr/src/sys/MASAKIKERNEL amd64

>Description:
Update to current cvs version of xrdp.  This update includes patches of ports/154174 and ports/155347, and I improved it for Japanese JP106 keyboard users.  It works fine on my environment but needs some testers especially Japanese.

Of cource English or other language testers are needed, thanks in advance.

>How-To-Repeat:
Input with JP106 keyboards, everything we type is ignored.

>Fix:

--- xrdp-0.6.0.20110117cvs.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/xrdp/Makefile /tmp/xrdp/Makefile
--- /usr/ports/net/xrdp/Makefile	2011-01-27 21:33:54.000000000 +0900
+++ /tmp/xrdp/Makefile	2011-03-13 12:12:50.000000000 +0900
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.6.0.20101009cvs
-PORTREVISION=	1
+PORTVERSION=	0.6.0.20110117cvs
+#PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR?= ${PORTNAME}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	An open source Remote Desktop Protocol (RDP) server
@@ -22,14 +24,26 @@
 CONFIGURE_ARGS=	--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+RUN_DEPENDS+=   Xvnc:${PORTSDIR}/net/vnc
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 INSTALL_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/xrdp
 
+OPTIONS=        DEBUG "Build with debugging symbols" off \
+		JP106 "Install Japanese JP106 Keymap" on
+
+.include <bsd.port.options.mk>
+
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DXRDP_DEBUG
 .endif
 
+.if defined(WITH_JP106)
+DISTFILES+=	xrdp-jp106km.tar.gz
+.endif
+
 MAN5=		sesman.ini.5 xrdp.ini.5
 MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
 
@@ -49,6 +63,18 @@
 		${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
 	fi
 .endfor
+.if defined(WITH_JP106)
+.for f in km-0411.ini
+	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
+		${CP} -p ${WRKSRC}/../xrdp-jp106km/$f ${PREFIX}/etc/xrdp/$f ; \
+	fi
+.endfor
+.for f in km-e0010411.ini km-e0200411.ini km-e0210411.ini
+	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
+		${LN} -s ${PREFIX}/etc/xrdp/km-0411.ini ${PREFIX}/etc/xrdp/$f ; \
+	fi
+.endfor
+.endif
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/xrdp/distinfo /tmp/xrdp/distinfo
--- /usr/ports/net/xrdp/distinfo	2010-11-11 01:29:35.000000000 +0900
+++ /tmp/xrdp/distinfo	2011-03-13 12:11:05.000000000 +0900
@@ -1,2 +1,4 @@
-SHA256 (xrdp-0.6.0.20101009cvs.tar.gz) = b4379fc04e36b434116669b35ac0662ddc1451363e78b91f67017603913c9946
-SIZE (xrdp-0.6.0.20101009cvs.tar.gz) = 297394
+SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
+SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
+SHA256 (xrdp/xrdp-jp106km.tar.gz) = 0de5c5bbdc04e883f59d3c8fec48f5453ac6c9b0bca9f923add267d5638f7bce
+SIZE (xrdp/xrdp-jp106km.tar.gz) = 1510
diff -ruN --exclude=CVS /usr/ports/net/xrdp/files/patch-common__os_calls.c /tmp/xrdp/files/patch-common__os_calls.c
--- /usr/ports/net/xrdp/files/patch-common__os_calls.c	2007-06-05 09:21:46.000000000 +0900
+++ /tmp/xrdp/files/patch-common__os_calls.c	2011-03-12 16:35:12.000000000 +0900
@@ -1,6 +1,6 @@
---- ./common/os_calls.c.orig	Sun Jul 30 01:41:31 2006
-+++ ./common/os_calls.c	Mon Jun  4 17:37:42 2007
-@@ -1002,6 +1002,8 @@
+--- common/os_calls.c.orig	2011-03-12 16:10:35.000000000 +0900
++++ common/os_calls.c	2011-03-12 16:34:05.000000000 +0900
+@@ -1987,6 +1987,8 @@
  g_clearenv(void)
  {
  #if defined(_WIN32)
diff -ruN --exclude=CVS /usr/ports/net/xrdp/files/patch-common__trans.c /tmp/xrdp/files/patch-common__trans.c
--- /usr/ports/net/xrdp/files/patch-common__trans.c	2011-01-27 21:33:55.000000000 +0900
+++ /tmp/xrdp/files/patch-common__trans.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,34 +0,0 @@
---- ./common/trans.c-orig	2010-05-04 09:37:22.000000000 +0200
-+++ ./common/trans.c		2010-06-15 09:13:05.000000000 +0200
-@@ -214,6 +214,7 @@
-         /* error */
-         self->status = TRANS_STATUS_DOWN;
-         rv = 1;
-+        break;
-       }
-     }
-     else if (rcvd == 0)
-@@ -221,6 +222,7 @@
-       /* error */
-       self->status = TRANS_STATUS_DOWN;
-       rv = 1;
-+      break;
-     }
-     else
-     {
-@@ -271,6 +273,7 @@
-         /* error */
-         self->status = TRANS_STATUS_DOWN;
-         rv = 1;
-+        break;
-       }
-     }
-     else if (sent == 0)
-@@ -278,6 +281,7 @@
-       /* error */
-       self->status = TRANS_STATUS_DOWN;
-       rv = 1;
-+      break;
-     }
-     else
-     {
diff -ruN --exclude=CVS /usr/ports/net/xrdp/files/pkg-message.in /tmp/xrdp/files/pkg-message.in
--- /usr/ports/net/xrdp/files/pkg-message.in	2010-11-11 01:29:36.000000000 +0900
+++ /tmp/xrdp/files/pkg-message.in	2011-03-12 16:28:58.000000000 +0900
@@ -9,6 +9,6 @@
 xrdpsesman_enable="YES"
 
 Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
-and the "%%PREFIX%%/lib/startwm.sh" script.
+and the "%%PREFIX%%/etc//xrdp/startwm.sh" script.
 
 ==============================================================================
diff -ruN --exclude=CVS /usr/ports/net/xrdp/files/pkg-message.in~ /tmp/xrdp/files/pkg-message.in~
--- /usr/ports/net/xrdp/files/pkg-message.in~	1970-01-01 09:00:00.000000000 +0900
+++ /tmp/xrdp/files/pkg-message.in~	2011-03-12 16:28:53.000000000 +0900
@@ -0,0 +1,14 @@
+==============================================================================
+
+XRDP has been installed.
+
+There is an rc.d script, so the service can be enabled by adding this line
+in /etc/rc.conf:
+
+xrdp_enable="YES"
+xrdpsesman_enable="YES"
+
+Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
+and the "%%PREFIX%%/etc/startwm.sh" script.
+
+==============================================================================
diff -ruN --exclude=CVS /usr/ports/net/xrdp/pkg-plist /tmp/xrdp/pkg-plist
--- /usr/ports/net/xrdp/pkg-plist	2010-11-11 01:29:35.000000000 +0900
+++ /tmp/xrdp/pkg-plist	2011-03-13 12:03:08.000000000 +0900
@@ -10,13 +10,9 @@
 etc/xrdp/km-0410.ini
 etc/xrdp/km-0419.ini
 etc/xrdp/km-041d.ini
-etc/xrdp/rsakeys.ini
 etc/xrdp/rsakeys.ini.sample
-etc/xrdp/sesman.ini
 etc/xrdp/sesman.ini.sample
-etc/xrdp/startwm.sh
 etc/xrdp/startwm.sh.sample
-etc/xrdp/xrdp.ini
 etc/xrdp/xrdp.ini.sample
 etc/xrdp/xrdp.sh
 lib/xrdp/libcommon.a
--- xrdp-0.6.0.20110117cvs.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list