Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 486080) +++ head/net/xrdp/Makefile (revision 486081) @@ -1,76 +1,80 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp DISTVERSIONPREFIX= v DISTVERSION= 0.9.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR?= ${PORTNAME} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 88f0d31.patch:-p1 + MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ ${LOCALBASE}/lib/pulse-12.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp USES= autoreconf:build jpeg localbase libtool pkgconfig ssl USE_XORG= ice pixman sm x11 xfixes xrandr USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GNU_CONFIGURE= yes GH_ACCOUNT= neutrinolabs GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter GH_TAGNAME= v0.1.4:librfxcodec v0.1.1:libpainter CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter LDFLAGS+= -lssl CONFLICTS= xrdp-devel[0-9]* INSTALL_TARGET= install-strip -SUB_FILES= pkg-install pkg-message +SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC MP3LAME OPUS OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection FUSE_DESC= Enable drive redirection via FUSE (experimental) MP3LAME_DESC= Enable MP3 Lame for audio redirection OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= xrdpdebug FDKAAC_CONFIGURE_ENABLE= fdkaac FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FUSE_CONFIGURE_ENABLE= fuse FUSE_USES= fuse IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus post-extract: # librfxcodec is provided as git submodule @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-stage: @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini @${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample .endfor .include Index: head/net/xrdp/distinfo =================================================================== --- head/net/xrdp/distinfo (revision 486080) +++ head/net/xrdp/distinfo (revision 486081) @@ -1,7 +1,9 @@ -TIMESTAMP = 1537858074 +TIMESTAMP = 1543368323 SHA256 (xrdp/neutrinolabs-xrdp-v0.9.8_GH0.tar.gz) = 5764a3bb5ecdc8b566d03ea6c1526b3dc67802ac7f029485d3e93ffaf09fd4fc SIZE (xrdp/neutrinolabs-xrdp-v0.9.8_GH0.tar.gz) = 658830 SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3 SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 +SHA256 (xrdp/88f0d31.patch) = 84e0b3796edac2cae19363d958c7b0f96a9eebb63ba7a046487a743a7f2cb4d4 +SIZE (xrdp/88f0d31.patch) = 1583 Index: head/net/xrdp/files/pkg-deinstall.in =================================================================== --- head/net/xrdp/files/pkg-deinstall.in (nonexistent) +++ head/net/xrdp/files/pkg-deinstall.in (revision 486081) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:ts=4:sw=4:et + +if [ $# -ne 2 ]; then + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 +fi + +case $2 in + DEINSTALL) + : nothing to do here + ;; + POST-DEINSTALL) + RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini + PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem + CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + + # if keys are generated during post-install script, remove it + # but do not remove user's keys + for f in $RSAKEYS $PRIVATEKEY $CERTIFICATE; + do + if cmp -s "${f}.sample" "${f}"; then + rm -f "${f}" + fi + rm -f "${f}.sample" + done + ;; + *) + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 + ;; +esac + +exit 0 Property changes on: head/net/xrdp/files/pkg-deinstall.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/xrdp/files/pkg-install.in =================================================================== --- head/net/xrdp/files/pkg-install.in (revision 486080) +++ head/net/xrdp/files/pkg-install.in (revision 486081) @@ -1,39 +1,44 @@ #!/bin/sh # vim:ts=4:sw=4:et if [ $# -ne 2 ]; then echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 exit 1 fi case $2 in PRE-INSTALL) : nothing to do here ;; POST-INSTALL) RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem # make sure rsakeys and certificates are private umask 077 # generate rsakeys.ini - [ -e "$RSAKEYS" ] || %%PREFIX%%/bin/xrdp-keygen xrdp "$RSAKEYS" + [ -e "$RSAKEYS" ] || %%PREFIX%%/bin/xrdp-keygen xrdp "$RSAKEYS".sample && \ # generate self-signed certificate [ -e "$PRIVATEKEY" -a -e "$CERTIFICATE" ] || \ %%OPENSSLBASE%%/bin/openssl req \ -x509 \ -newkey rsa:4096 \ - -keyout "$PRIVATEKEY" \ + -keyout "$PRIVATEKEY".sample \ -sha256 \ -nodes \ - -out "$CERTIFICATE" \ + -out "$CERTIFICATE".sample \ -days 365 \ -subj "/CN=$(hostname)" + + for f in "$RSAKEYS" "$PRIVATEKEY" "$CERTIFICATE" + do + [ -e "${f}" ] || cp -n "${f}.sample" "${f}" + done ;; *) echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 exit 1 ;; esac exit 0