Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 423563) +++ head/net/xrdp/Makefile (revision 423564) @@ -1,81 +1,79 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.6.1 +PORTVERSION= 0.6.2 DISTVERSIONPREFIX= v -PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR= ${PORTNAME} MAINTAINER= meta+ports@vmeta.jp COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= autoreconf:build libtool pkgconfig +USES= autoreconf:build libtool pkgconfig ssl USE_LDCONFIG= ${PREFIX}/lib/xrdp -USE_OPENSSL= yes USE_RC_SUBR= xrdp USE_XORG= x11 xfixes USE_GITHUB= yes GH_ACCOUNT= neutrinolabs CONFIGURE_ARGS= --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message OPTIONS_DEFINE= DEBUG 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 # Debug DEBUG_CONFIGURE_ENABLE= xrdpdebug # Xvnc REALVNC_RUN_DEPENDS= Xvnc:net/vnc TIGERVNC_RUN_DEPENDS= Xvnc:net/tigervnc TIGHTVNC_RUN_DEPENDS= Xvnc:net/tightvnc TRIDIAVNC_RUN_DEPENDS= Xvnc:net/tridiavnc # X11rdp X11RDP_RUN_DEPENDS= X11rdp:x11-servers/x11rdp X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini # JP106 keymap JP106_PLIST_SUB= JP106="" JP106_PLIST_SUB_OFF= JP106="@comment " .include .if ${PORT_OPTIONS:MJP106} KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ km-e0200411.ini km-e0210411.ini .endif post-patch: .for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample .endfor pre-configure: @cd ${WRKSRC} && ./bootstrap post-install: .for f in ${KEYMAP_FILES} ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp .endfor .include Index: head/net/xrdp/distinfo =================================================================== --- head/net/xrdp/distinfo (revision 423563) +++ head/net/xrdp/distinfo (revision 423564) @@ -1,2 +1,3 @@ -SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b -SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359 +TIMESTAMP = 1475561595 +SHA256 (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1e12e41537b3cac15f5c216663fc18a15df5a16e9eb2bc1768bea16190815438 +SIZE (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1559505 Index: head/net/xrdp/files/patch-sesman__verify_user_pam.c =================================================================== --- head/net/xrdp/files/patch-sesman__verify_user_pam.c (revision 423563) +++ head/net/xrdp/files/patch-sesman__verify_user_pam.c (nonexistent) @@ -1,19 +0,0 @@ -diff --git sesman/verify_user_pam.c sesman/verify_user_pam.c -index e3d8596..281e297 100644 ---- sesman/verify_user_pam.c -+++ sesman/verify_user_pam.c -@@ -117,6 +117,14 @@ auth_userpass(char* user, char* pass) - g_free(auth_info); - return 0; - } -+ -+ error = pam_set_item(auth_info->ph, PAM_TTY, service_name); -+ if (error != PAM_SUCCESS) -+ { -+ g_printf("pam_set_item failed: %s\r\n", -+ pam_strerror(auth_info->ph, error)); -+ } -+ - error = pam_authenticate(auth_info->ph, 0); - if (error != PAM_SUCCESS) - { Property changes on: head/net/xrdp/files/patch-sesman__verify_user_pam.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/xrdp/files/patch-common__os_calls.c =================================================================== --- head/net/xrdp/files/patch-common__os_calls.c (revision 423563) +++ head/net/xrdp/files/patch-common__os_calls.c (nonexistent) @@ -1,17 +0,0 @@ -diff --git common/os_calls.c common/os_calls.c -index 692dc01..7075ee3 100644 ---- common/os_calls.c -+++ common/os_calls.c -@@ -2115,8 +2115,12 @@ g_clearenv(void) - { - #if defined(_WIN32) - #else -+#if defined(BSD) -+ environ[0] = 0; -+#else - environ = 0; - #endif -+#endif - } - - /*****************************************************************************/ Property changes on: head/net/xrdp/files/patch-common__os_calls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property