svn commit: r558251 - in head: . net net/xrdp-devel net/xrdp-devel/files
Koichiro Iwao
meta at FreeBSD.org
Thu Dec 17 02:04:49 UTC 2020
Author: meta
Date: Thu Dec 17 02:04:47 2020
New Revision: 558251
URL: https://svnweb.freebsd.org/changeset/ports/558251
Log:
net/xrdp-devel: resurrect and update to 0.9.14
Added:
head/net/xrdp-devel/
- copied from r480948, head/net/xrdp-devel/
head/net/xrdp-devel/files/startwm.sh
- copied unchanged from r557408, head/net/xrdp/files/startwm.sh
Modified:
head/MOVED
head/net/Makefile
head/net/xrdp-devel/Makefile
head/net/xrdp-devel/distinfo
head/net/xrdp-devel/files/pkg-install.in
head/net/xrdp-devel/files/pkg-message.in
head/net/xrdp-devel/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Dec 17 00:16:21 2020 (r558250)
+++ head/MOVED Thu Dec 17 02:04:47 2020 (r558251)
@@ -10434,7 +10434,6 @@ graphics/OpenEXR|graphics/openexr|2018-09-22|Renamed t
math/mtl||2018-09-27|Has expired: fails to fetch: mastersite times out
dns/dnscrypt-proxy|dns/dnscrypt-proxy2|2018-09-27|Has expired: Deprecated by upstream, use dns/dnscrypt-proxy2 instead
www/waterfox||2018-09-29|Has expired: experiment ended: unsustainable
-net/xrdp-devel|net/xrdp|2018-09-30|Has expired: Use net/xrdp instead
net/tigervnc-devel|net/tigervnc|2018-09-30|Has expired: Use net/tigervnc instead
net/unison-devel|net/unison|2018-09-30|Has expired: Use net/unison instead
textproc/p5-IDNA-Punycode||2018-09-30|Has expired: Deprecated by upstream
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Thu Dec 17 00:16:21 2020 (r558250)
+++ head/net/Makefile Thu Dec 17 02:04:47 2020 (r558251)
@@ -1540,6 +1540,7 @@
SUBDIR += xprobe
SUBDIR += xrdesktop2
SUBDIR += xrdp
+ SUBDIR += xrdp-devel
SUBDIR += yami4
SUBDIR += yaph
SUBDIR += yate
Modified: head/net/xrdp-devel/Makefile
==============================================================================
--- head/net/xrdp-devel/Makefile Sun Sep 30 10:20:42 2018 (r480948)
+++ head/net/xrdp-devel/Makefile Thu Dec 17 02:04:47 2020 (r558251)
@@ -2,48 +2,49 @@
# $FreeBSD$
PORTNAME= xrdp
-PORTVERSION= 0.9.6
DISTVERSIONPREFIX= v
+DISTVERSION= 0.9.14
PORTEPOCH= 1
CATEGORIES= net
PKGNAMESUFFIX= -devel
DIST_SUBDIR?= ${PORTNAME}
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+
MAINTAINER= meta at FreeBSD.org
-COMMENT= Open source Remote Desktop Protocol (RDP) server
+COMMENT= Open source Remote Desktop Protocol (RDP) server (development version)
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
-IGNORE= no development version available right now, use net/xrdp instead
-DEPRECATED= Use net/xrdp instead
-EXPIRATION_DATE= 2018-09-29
+BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm
+RUN_DEPENDS= xterm:x11/xterm \
+ ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
+ ${LOCALBASE}/lib/pulse-13.0/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
-# pulseaudio's configured source is required for audio redirection
-BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \
- ${LOCALBASE}/bin/nasm:devel/nasm
-RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp
-
-USES= autoreconf:build jpeg localbase libtool pkgconfig ssl
+USES= autoreconf:build compiler:c11 jpeg localbase libtool pkgconfig \
+ ssl xorg
USE_XORG= ice pixman sm x11 xfixes xrandr
-GNU_CONFIGURE= yes
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
+GH_TAGNAME= v0.1.5:librfxcodec v0.1.1:libpainter
CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \
--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
+ --enable-pam-config=freebsd \
--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
LDFLAGS+= -lssl
-CONFLICTS= xrdp-[0-9]*
+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_DEFAULT= FDKAAC OPUS
OPTIONS_GROUP= AUDIO_CODEC
OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS
FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection
@@ -62,38 +63,26 @@ MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
OPUS_CONFIGURE_ENABLE= opus
OPUS_LIB_DEPENDS= libopus.so:audio/opus
-# don't forget to increase PORTREVISION after pulseaudio update
-PULSE_VERSION= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION
-PULSE_WRKSRC= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC
+.include <bsd.port.pre.mk>
+.if ${SSL_DEFAULT} == base
+# As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto
+# cannot be obtained automatically via pkgconfig. When compiled with base
+# OpenSSL, it needs to be specified explicitly.
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
+.endif
+
post-extract:
# librfxcodec is provided as git submodule
@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/
@${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/
-post-patch:
- @${REINPLACE_CMD} \
- -e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \
- -e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \
- ${WRKSRC}/sesman/chansrv/pulse/Makefile
-
pre-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
-post-build:
- # build pulseaudio module
- @${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR}
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C sesman/chansrv/pulse
-
post-install:
- # install pulseaudio module
- ${MKDIR} "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/"
-.for f in module-xrdp-sink.so module-xrdp-source.so
- ${INSTALL_LIB} -m 0755 ${WRKSRC}/sesman/chansrv/pulse/$f \
- "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/"
-.endfor
- # substitute pkg-plist not using PLIST_SUB
- ${REINPLACE_CMD} -e "s|%%PULSE_VERSION%%|`${PULSE_VERSION}`|g" ${TMPPLIST}
+ ${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR}
post-stage:
@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
@@ -103,4 +92,4 @@ post-stage:
@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/net/xrdp-devel/distinfo
==============================================================================
--- head/net/xrdp-devel/distinfo Sun Sep 30 10:20:42 2018 (r480948)
+++ head/net/xrdp-devel/distinfo Thu Dec 17 02:04:47 2020 (r558251)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1522053694
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049
-SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3
-SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379
+TIMESTAMP = 1598856500
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = f46d90f3272531b9dec032fcf16104ea73d33b17f9720cd3d541203182df2c88
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = 695062
+SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8
+SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 48387
SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
Modified: head/net/xrdp-devel/files/pkg-install.in
==============================================================================
--- head/net/xrdp-devel/files/pkg-install.in Sun Sep 30 10:20:42 2018 (r480948)
+++ head/net/xrdp-devel/files/pkg-install.in Thu Dec 17 02:04:47 2020 (r558251)
@@ -17,18 +17,23 @@ case $2 in
# 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
Modified: head/net/xrdp-devel/files/pkg-message.in
==============================================================================
--- head/net/xrdp-devel/files/pkg-message.in Sun Sep 30 10:20:42 2018 (r480948)
+++ head/net/xrdp-devel/files/pkg-message.in Thu Dec 17 02:04:47 2020 (r558251)
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+ message: <<EOM
xrdp has been installed.
There is an rc.d script, so the service can be enabled by adding this line
@@ -10,5 +11,6 @@ xrdp_sesman_enable="YES" # if you want to run xrdp-ses
Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
-
-==============================================================================
+EOM
+}
+]
Copied: head/net/xrdp-devel/files/startwm.sh (from r557408, head/net/xrdp/files/startwm.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/xrdp-devel/files/startwm.sh Thu Dec 17 02:04:47 2020 (r558251, copy of r557408, head/net/xrdp/files/startwm.sh)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# This script is an example. Edit this to suit your needs.
+# If ${HOME}/startwm.sh exists, xrdp-sesman will execute it instead of this.
+
+#### set environment variables here if you want
+# export LANG=en_US.UTF-8
+
+#### start desktop environment
+# exec gnome-session
+# exec mate-session
+# exec start-lumina-desktop
+# exec startkde
+# exec startxfce4
+exec xterm
Modified: head/net/xrdp-devel/pkg-plist
==============================================================================
--- head/net/xrdp-devel/pkg-plist Sun Sep 30 10:20:42 2018 (r480948)
+++ head/net/xrdp-devel/pkg-plist Thu Dec 17 02:04:47 2020 (r558251)
@@ -11,6 +11,14 @@ lib/librfxencode.so
lib/librfxencode.so.0.0.0
lib/librfxencode.a
lib/librfxencode.so.0
+include/ms-erref.h
+include/ms-fscc.h
+include/ms-rdpbcgr.h
+include/ms-rdpefs.h
+include/ms-rdpegdi.h
+include/ms-rdpele.h
+include/ms-rdperp.h
+include/ms-smb2.h
include/painter.h
include/rfxcodec_common.h
include/rfxcodec_decode.h
@@ -19,8 +27,6 @@ include/xrdp_client_info.h
include/xrdp_constants.h
include/xrdp_rail.h
include/xrdp_sockets.h
-lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so
libdata/pkgconfig/libpainter.pc
libdata/pkgconfig/rfxcodec.pc
libdata/pkgconfig/xrdp.pc
@@ -48,6 +54,8 @@ lib/xrdp/libxrdpapi.so.0
lib/xrdp/libxrdpapi.so.0.0.0
etc/pam.d/xrdp-sesman
etc/rc.d/xrdp
+etc/rc.d/xrdp-sesman
+%%ETCDIR%%/km-00000406.ini
%%ETCDIR%%/km-00000407.ini
%%ETCDIR%%/km-00000409.ini
%%ETCDIR%%/km-00010409.ini
@@ -64,10 +72,12 @@ etc/rc.d/xrdp
%%ETCDIR%%/km-0000041d.ini
%%ETCDIR%%/km-00000807.ini
%%ETCDIR%%/km-00000809.ini
+%%ETCDIR%%/km-0000080a.ini
%%ETCDIR%%/km-0000080c.ini
%%ETCDIR%%/km-00000813.ini
%%ETCDIR%%/km-00000816.ini
%%ETCDIR%%/km-0000100c.ini
+%%ETCDIR%%/km-19360409.ini
%%ETCDIR%%/pulse/default.pa
@postunexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
@postunexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
More information about the svn-ports-all
mailing list