View | Details | Raw Unified | Return to bug 223512 | Differences between
and this patch

Collapse All | Expand All

(-)net/xrdp-devel/distinfo (-7 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1500361123
2
SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b
3
SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654
4
SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = f4aa7f4247a42f6f5e49fc56eb70589a1d26cae7c8d5d4e32f75200d5c473a42
5
SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = 46139
6
SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
7
SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
(-)net/xrdp-devel/files/patch-configure.ac (-40 lines)
Lines 1-40 Link Here
1
--- configure.ac.orig	2017-07-14 12:22:02 UTC
2
+++ configure.ac
3
@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
4
 AC_SUBST(DLOPEN_LIBS)
5
 
6
 # checking for openssl
7
-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
8
+if test "x$freebsd" = "xyes"; then
9
+  # FreeBSD may have two OpenSSL, base and port however
10
+  # base OpenSSL doesn.t have openssl.pc file.
11
+  PKG_CHECK_MODULES(
12
+                    [OPENSSL],
13
+                    [openssl >= 0],
14
+                    [freebsd_openssl=port],
15
+                    [
16
+		     AC_CHECK_HEADER(
17
+		       [openssl/rc4.h],
18
+		       [freebsd_openssl=base],
19
+		       [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
20
+		       [#include <stdlib.h>])
21
+		    ]
22
+                   )
23
+
24
+  if test "x$freebsd_openssl" = "xport"; then
25
+    OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
26
+  elif test "x$freebsd_openssl" = "xbase"; then
27
+    OPENSSL_BIN=/usr/bin
28
+  fi
29
+else
30
+  # OpenSSL detection for other OS
31
+  PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
32
   [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
33
+  OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
34
+fi
35
 
36
 # look for openssl binary
37
-OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
38
 AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
39
 
40
 # checking for pam variation
(-)net/xrdp-devel/files/patch-sesman_sesman.ini (-13 lines)
Lines 1-13 Link Here
1
--- sesman/sesman.ini.orig	2017-07-14 12:22:02 UTC
2
+++ sesman/sesman.ini
3
@@ -77,8 +77,8 @@ param=xrdp/xorg.conf
4
 param=-noreset
5
 param=-nolisten
6
 param=tcp
7
-param=-logfile
8
-param=.xorgxrdp.%s.log
9
+#param=-logfile
10
+#param=.xorgxrdp.%s.log
11
 
12
 [Chansrv]
13
 ; drive redirection, defaults to xrdp_client if not set
(-)net/xrdp-devel/files/pkg-install.in (-39 lines)
Lines 1-39 Link Here
1
#!/bin/sh
2
# vim:ts=4:sw=4:et
3
4
if [ $# -ne 2 ]; then
5
    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
6
    exit 1
7
fi
8
9
case $2 in
10
    PRE-INSTALL)
11
        : nothing to do here
12
        ;;
13
    POST-INSTALL)
14
        RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini
15
        PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem
16
        CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem
17
        # make sure rsakeys and certificates are private
18
        umask 077
19
        # generate rsakeys.ini
20
        [ -e "$RSAKEYS" ] || %%PREFIX%%/bin/xrdp-keygen xrdp "$RSAKEYS"
21
        # generate self-signed certificate
22
        [ -e "$PRIVATEKEY" -a -e "$CERTIFICATE" ] || \
23
            %%OPENSSLBASE%%/bin/openssl req \
24
                 -x509 \
25
                 -newkey rsa:4096 \
26
                 -keyout "$PRIVATEKEY" \
27
                 -sha256 \
28
                 -nodes \
29
                 -out "$CERTIFICATE" \
30
                 -days 365 \
31
                 -subj "/CN=$(hostname)"
32
        ;;
33
    *)
34
        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
35
        exit 1
36
        ;;
37
esac
38
39
exit 0
(-)net/xrdp-devel/files/pkg-message.in (-14 lines)
Lines 1-14 Link Here
1
==============================================================================
2
3
XRDP has been installed.
4
5
There is an rc.d script, so the service can be enabled by adding this line
6
in /etc/rc.conf:
7
8
xrdp_enable="YES"
9
xrdp_sesman_enable="YES" # if you want to run xrdp-sesman on the same machine
10
11
Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
12
and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
13
14
==============================================================================
(-)net/xrdp-devel/Makefile (-101 lines)
Lines 1-101 Link Here
1
# Created by: alepulver
2
# $FreeBSD$
3
4
PORTNAME=	xrdp
5
PORTVERSION=	0.9.3
6
DISTVERSIONPREFIX=	v
7
PORTEPOCH=	1
8
CATEGORIES=	net
9
PKGNAMESUFFIX=	-devel
10
DIST_SUBDIR?=	${PORTNAME}
11
12
MAINTAINER=	meta+ports@vmeta.jp
13
COMMENT=	Open source Remote Desktop Protocol (RDP) server
14
15
LICENSE=	APACHE20
16
LICENSE_FILE=	${WRKSRC}/COPYING
17
18
# pulseaudio's built source is required for audio redirection
19
BUILD_DEPENDS=	${NONEXISTENT}:audio/pulseaudio:configure \
20
		${LOCALBASE}/bin/nasm:devel/nasm
21
RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp
22
23
USES=		autoreconf:build jpeg libtool pkgconfig ssl
24
USE_XORG=	ice pixman sm x11 xfixes xrandr
25
GNU_CONFIGURE=	yes
26
USE_LDCONFIG=	${PREFIX}/lib/xrdp
27
USE_GITHUB=	yes
28
GH_ACCOUNT=	neutrinolabs
29
GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
30
GH_TAGNAME=	v0.1.2:librfxcodec v0.1.1:libpainter
31
32
CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
33
		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
34
		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
35
LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl
36
CFLAGS+=	-I${LOCALBASE}/include -L${OPENSSLINC}
37
CONFLICTS=	xrdp-[0-9]*
38
INSTALL_TARGET=	install-strip
39
SUB_FILES=	pkg-install pkg-message
40
SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
41
42
OPTIONS_DEFINE=	DEBUG FUSE IPV6 MP3LAME OPUS
43
OPTIONS_DEFAULT=	OPUS MP3LAME
44
FUSE_DESC=	Enable drive redirection via FUSE (experimental)
45
MP3LAME_DESC=	Enable MP3 Lame for audio redirection
46
OPUS_DESC=	Enable Opus for audio redirection
47
48
IPV6_CONFIGURE_ENABLE=	ipv6
49
DEBUG_CONFIGURE_ENABLE=	xrdpdebug
50
FUSE_CONFIGURE_ENABLE=	fuse
51
FUSE_USES=		fuse
52
MP3LAME_CONFIGURE_ENABLE=	mp3lame
53
MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
54
OPUS_CONFIGURE_ENABLE=	opus
55
OPUS_LIB_DEPENDS=	libopus.so:audio/opus
56
57
# don't forget to increase PORTREVISION after pulseaudio update
58
PULSE_VERSION=	${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION
59
PULSE_WRKSRC=	${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC
60
61
post-extract:
62
	# librfxcodec is provided as git submodule
63
	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/
64
	@${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/
65
66
post-patch:
67
	@${REINPLACE_CMD} \
68
		-e "s|^PULSE_SCRIPT=/etc/xrdp/pulse/default.pa|PULSE_SCRIPT=${PREFIX}/etc/xrdp/pulse/default.pa|" \
69
		${WRKSRC}/sesman/sesman.ini
70
	@${REINPLACE_CMD} \
71
		-e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \
72
		-e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \
73
		${WRKSRC}/sesman/chansrv/pulse/Makefile
74
75
pre-configure:
76
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
77
78
post-build:
79
	# build pulseaudio module
80
	@${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR}
81
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C sesman/chansrv/pulse
82
83
post-install:
84
	# install pulseaudio module
85
	${MKDIR} "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/"
86
.for f in module-xrdp-sink.so module-xrdp-source.so
87
	${INSTALL_LIB} -m 0755 ${WRKSRC}/sesman/chansrv/pulse/$f \
88
		"${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/"
89
.endfor
90
	# substitute pkg-plist not using PLIST_SUB
91
	${REINPLACE_CMD} -e "s|%%PULSE_VERSION%%|`${PULSE_VERSION}`|g" ${TMPPLIST}
92
93
post-stage:
94
	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
95
	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
96
	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
97
.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
98
	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
99
.endfor
100
101
.include <bsd.port.mk>
(-)net/xrdp-devel/pkg-descr (-13 lines)
Lines 1-13 Link Here
1
Based on the work of rdesktop, xrdp uses the remote desktop protocol to
2
present a GUI to the user.
3
4
The goal of this project is to provide a fully functional Linux terminal
5
server, capable of accepting connections from rdesktop and Microsoft's own
6
terminal server / remote desktop clients.
7
8
Unlike Windows NT/2000/2003 server, xrdp will not display a Windows desktop
9
but an X window desktop to the user.
10
11
Xrdp uses Xvnc or X11rdp to manage the X session.
12
13
WWW: http://www.xrdp.org/
(-)net/xrdp-devel/pkg-plist (-101 lines)
Lines 1-101 Link Here
1
bin/xrdp-dis
2
bin/xrdp-genkeymap
3
bin/xrdp-keygen
4
bin/xrdp-sesadmin
5
bin/xrdp-sesrun
6
lib/libpainter.a
7
lib/libpainter.so
8
lib/libpainter.so.0
9
lib/libpainter.so.0.0.0
10
lib/librfxencode.so
11
lib/librfxencode.so.0.0.0
12
lib/librfxencode.a
13
lib/librfxencode.so.0
14
include/painter.h
15
include/rfxcodec_common.h
16
include/rfxcodec_decode.h
17
include/rfxcodec_encode.h
18
include/xrdp_client_info.h
19
include/xrdp_constants.h
20
include/xrdp_rail.h
21
include/xrdp_sockets.h
22
lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so
23
lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so
24
libdata/pkgconfig/libpainter.pc
25
libdata/pkgconfig/rfxcodec.pc
26
libdata/pkgconfig/xrdp.pc
27
lib/xrdp/libcommon.a
28
lib/xrdp/libcommon.so
29
lib/xrdp/libcommon.so.0
30
lib/xrdp/libcommon.so.0.0.0
31
lib/xrdp/libmc.a
32
lib/xrdp/libmc.so
33
lib/xrdp/libscp.a
34
lib/xrdp/libscp.so
35
lib/xrdp/libscp.so.0
36
lib/xrdp/libscp.so.0.0.0
37
lib/xrdp/libvnc.a
38
lib/xrdp/libvnc.so
39
lib/xrdp/libxrdp.a
40
lib/xrdp/libxrdp.so
41
lib/xrdp/libxrdp.so.0
42
lib/xrdp/libxrdp.so.0.0.0
43
lib/xrdp/libxup.a
44
lib/xrdp/libxup.so
45
lib/xrdp/libxrdpapi.so
46
lib/xrdp/libxrdpapi.a
47
lib/xrdp/libxrdpapi.so.0
48
lib/xrdp/libxrdpapi.so.0.0.0
49
etc/pam.d/xrdp-sesman
50
etc/rc.d/xrdp
51
%%ETCDIR%%/km-00000407.ini
52
%%ETCDIR%%/km-00000409.ini
53
%%ETCDIR%%/km-0000040a.ini
54
%%ETCDIR%%/km-0000040b.ini
55
%%ETCDIR%%/km-0000040c.ini
56
%%ETCDIR%%/km-00000410.ini
57
%%ETCDIR%%/km-00000411.ini
58
%%ETCDIR%%/km-00000412.ini
59
%%ETCDIR%%/km-00000414.ini
60
%%ETCDIR%%/km-00000415.ini
61
%%ETCDIR%%/km-00000416.ini
62
%%ETCDIR%%/km-00000419.ini
63
%%ETCDIR%%/km-0000041d.ini
64
%%ETCDIR%%/km-00000807.ini
65
%%ETCDIR%%/km-00000809.ini
66
%%ETCDIR%%/km-0000080c.ini
67
%%ETCDIR%%/km-00000813.ini
68
%%ETCDIR%%/km-00000816.ini
69
%%ETCDIR%%/km-0000100c.ini
70
%%ETCDIR%%/pulse/default.pa
71
@postunexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
72
@postunexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
73
@postunexec if cmp -s %D/etc/xrdp/reconnectwm.sh.sample %D/etc/xrdp/reconnectwm.sh; then rm -f %D/etc/xrdp/reconnectwm.sh; fi
74
@postunexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
75
@postunexec if cmp -s %D/etc/xrdp/xrdp_keyboard.ini.sample %D/etc/xrdp/xrdp_keyboard.ini; then rm -f %D/etc/xrdp/xrdp_keyboard.ini; fi
76
@sample %%ETCDIR%%/sesman.ini.sample
77
@sample %%ETCDIR%%/startwm.sh.sample
78
@sample %%ETCDIR%%/reconnectwm.sh.sample
79
@sample %%ETCDIR%%/xrdp.ini.sample
80
@sample %%ETCDIR%%/xrdp_keyboard.ini.sample
81
man/man1/xrdp-dis.1.gz
82
man/man5/sesman.ini.5.gz
83
man/man8/xrdp.8.gz
84
man/man5/xrdp.ini.5.gz
85
man/man8/xrdp-chansrv.8.gz
86
man/man8/xrdp-genkeymap.8.gz
87
man/man8/xrdp-keygen.8.gz
88
man/man8/xrdp-sesadmin.8.gz
89
man/man8/xrdp-sesman.8.gz
90
man/man8/xrdp-sesrun.8.gz
91
sbin/xrdp
92
sbin/xrdp-chansrv
93
sbin/xrdp-sesman
94
%%DATADIR%%/ad24b.bmp
95
%%DATADIR%%/ad256.bmp
96
%%DATADIR%%/cursor0.cur
97
%%DATADIR%%/cursor1.cur
98
%%DATADIR%%/sans-10.fv1
99
%%DATADIR%%/xrdp24b.bmp
100
%%DATADIR%%/xrdp256.bmp
101
%%DATADIR%%/xrdp_logo.bmp

Return to bug 223512