Date: Thu, 13 Jun 2013 20:52:01 GMT From: Koichiro IWAO <meta+ports@vmeta.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179542: [maintainer update] net/xrdp: make pointyhat happy, etc Message-ID: <201306132052.r5DKq1fl067159@oldred.freebsd.org> Resent-Message-ID: <201306132100.r5DL00TZ088416@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179542
>Category: ports
>Synopsis: [maintainer update] net/xrdp: make pointyhat happy, etc
>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 Jun 13 21:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Koichiro IWAO
>Release: 9.1-STABLE
>Organization:
>Environment:
FreeBSD ports-dev.vmeta.jp 9.1-STABLE FreeBSD 9.1-STABLE #3: Thu Apr 4 02:45:29 JST 2013 root@icepick.vmeta.jp:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- Make pointyhat happy:
by changing RSA key pair generation behaviour
now key will be generated on first xrdp daemon start
- Add options to select VNC variants
- Build with freerdp since net/freerdp has been updated to 1.0.2
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile
--- /usr/ports/net/xrdp/Makefile 2013-03-23 20:44:46.068808385 +0000
+++ net/xrdp/Makefile 2013-05-15 09:50:12.318573514 +0000
@@ -3,7 +3,7 @@
PORTNAME= xrdp
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/xrdp/xrdp/${PORTVERSION}
@@ -24,20 +24,40 @@
GNU_CONFIGURE= yes
USE_RC_SUBR= xrdp
-CONFIGURE_ARGS= --localstatedir=/var
+CONFIGURE_ARGS= --localstatedir=/var --enable-freerdp1
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CONFLICTS= xrdp-devel-[0-9]*
+BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDIR}/net/freerdp
USE_LDCONFIG= ${PREFIX}/lib/xrdp
-OPTIONS_DEFINE= DEBUG GATEWAY JP106
-OPTIONS_DEFAULT= JP106
-GATEWAY_DESC= Install xrdp as RDP gateway (no VNC backend)
+OPTIONS_DEFINE= DEBUG JP106
+OPTIONS_DEFAULT= JP106 TIGERVNC
+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
JP106_DESC= Install Japanese JP106 keymap
.include <bsd.port.options.mk>
+# Which Xserver to use
+.if ${PORT_OPTIONS:MREALVNC}
+RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc
+.endif
+.if ${PORT_OPTIONS:MTIGERVNC}
+RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc
+.endif
+.if ${PORT_OPTIONS:MTIGHTVNC}
+RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc
+.endif
+.if ${PORT_OPTIONS:MTRIDIAVNC}
+RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc
+.endif
+
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-xrdpdebug
CFLAGS+= -DXRDP_DEBUG
@@ -54,10 +74,6 @@
PLIST_SUB+= JP106="@comment "
.endif
-.if !${PORT_OPTIONS:MGATEWAY}
-RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc
-.endif
-
MAN5= sesman.ini.5 xrdp.ini.5
MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
@@ -72,13 +88,11 @@
@cd ${WRKSRC} && ./bootstrap
post-install:
-.for f in rsakeys.ini sesman.ini startwm.sh xrdp.ini
+.for f in sesman.ini startwm.sh xrdp.ini
@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
fi
.endfor
- @if cmp -s ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini; then \
- ${PREFIX}/bin/xrdp-keygen xrdp ${PREFIX}/etc/xrdp/rsakeys.ini; fi
@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
.include <bsd.port.mk>
diff -ruN /usr/ports/net/xrdp/files/xrdp.in net/xrdp/files/xrdp.in
--- /usr/ports/net/xrdp/files/xrdp.in 2013-03-13 11:05:28.743796370 +0000
+++ net/xrdp/files/xrdp.in 2013-05-15 09:54:30.584572702 +0000
@@ -38,6 +38,11 @@
if [ "${rc_arg}" = "stop" ] ; then
xrdp_daemons=$(reverse_list ${xrdp_daemons})
fi
+ # Generate rsakeys.ini on start
+ if [ "${rc_arg}" = "start" -a ! -f %%PREFIX%%/etc/xrdp/rsakeys.ini ] ; then
+ %%PREFIX%%/bin/xrdp-keygen xrdp %%PREFIX%%/etc/xrdp/rsakeys.ini
+ fi
+
# Apply to all the daemons.
for name in ${xrdp_daemons}; do
rcvar=${name}_enable
diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist
--- /usr/ports/net/xrdp/pkg-plist 2013-03-23 20:44:46.069826837 +0000
+++ net/xrdp/pkg-plist 2013-05-15 09:50:12.318573514 +0000
@@ -33,6 +33,10 @@
lib/xrdp/libxup.la
lib/xrdp/libxup.so
lib/xrdp/libxup.so.0
+lib/xrdp/libxrdpfreerdp1.la
+lib/xrdp/libxrdpfreerdp1.a
+lib/xrdp/libxrdpfreerdp1.so
+lib/xrdp/libxrdpfreerdp1.so.0
etc/pam.d/xrdp-sesman
etc/xrdp/km-0407.ini
etc/xrdp/km-0409.ini
@@ -52,8 +56,6 @@
etc/xrdp/sesman.ini.sample
etc/xrdp/startwm.sh.sample
etc/xrdp/xrdp.ini.sample
-@comment backup pre-compile-time keypair and generate new one
-@exec if [ -f %D/etc/xrdp/rsakeys.ini ]; then cp -a %D/etc/xrdp/rsakeys.ini %D/etc/xrdp/rsakeys.ini.bak`date +%%Y%%m%%d`; %D/bin/xrdp-keygen xrdp %D/etc/xrdp/rsakeys.ini; fi
@exec [ -f %D/etc/xrdp/sesman.ini ] || cp -p %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini
@exec [ -f %D/etc/xrdp/startwm.sh ] || cp -p %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh
@exec [ -f %D/etc/xrdp/xrdp.ini ] || cp -p %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306132052.r5DKq1fl067159>