FreeBSD Bugzilla – Attachment 134815 Details for
Bug 179542
[maintainer update] net/xrdp: make pointyhat happy, etc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.94 KB, created by
Koichiro Iwao
on 2013-06-13 22:00:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Koichiro Iwao
Created:
2013-06-13 22:00:00 UTC
Size:
3.94 KB
patch
obsolete
>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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 179542
: 134815