Attachment #184991 for bug #220820

Lines 1-7 Link Here

(-)net/xrdp-devel/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1482726509	1	TIMESTAMP = 1500361123
2	SHA256 (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 9bfafb0277b07e8242bfdbede2928423d28c5714efb0c226118759fab06c42ab	2	SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b
3	SIZE (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 1885192	3	SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654
4	SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = b05c1812e2daef373bf5e647bc86ee11f136adbe7ea999b5109180f406071f0a	4	SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = f4aa7f4247a42f6f5e49fc56eb70589a1d26cae7c8d5d4e32f75200d5c473a42
5	SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = 38590	5	SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = 46139
6	SHA256 (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9fd2a3a85ba4f3e311cea34e9824bd38f3673e60951906c06744cf6b8f73397a	6	SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
7	SIZE (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9859	7	SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929




--- configure.ac.orig	2017-07-14 12:22:02 UTC
index 5c73168a..abbf4135 100644
--- configure.ac
+++ configure.ac
@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
 AC_SUBST(DLOPEN_LIBS)
 
 # checking for openssl
-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
-  [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+if test "x$freebsd" = "xyes"; then
+  # FreeBSD may have two OpenSSL, base and port however
+  # base OpenSSL doesn.t have openssl.pc file.
+  PKG_CHECK_MODULES(
+                    [OPENSSL],
+                    [openssl >= 0],
+                    [freebsd_openssl=port],
+                    [
+		     AC_CHECK_HEADER(
+		       [openssl/rc4.h],
+		       [freebsd_openssl=base],
+		       [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
+		       [#include <stdlib.h>])
+		    ]
+                   )
+
+  if test "x$freebsd_openssl" = "xport"; then
+    OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
+  elif test "x$freebsd_openssl" = "xbase"; then
+    OPENSSL_BIN=/usr/bin
+  fi
+else
+  # OpenSSL detection for other OS
+  PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
   [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+  OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
+fi
 
 # look for openssl binary
-OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
 AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
 
 # checking for pam variation
 # Linux-PAM is used in Linux systems




--- xrdp/xrdp.ini.orig	2016-12-22 17:04:29 UTC
+++ xrdp/xrdp.ini
@@ -147,24 +147,24 @@ tcutils=true
 ; Session types
 ;
 
-[X11rdp]
-name=X11rdp
+[Xorg]
+name=Xorg
 lib=libxup.so
 username=ask
 password=ask
 ip=127.0.0.1
 port=-1
-xserverbpp=24
-code=10
+code=20
 
-[Xorg]
-name=Xorg
+[X11rdp]
+name=X11rdp
 lib=libxup.so
 username=ask
 password=ask
 ip=127.0.0.1
 port=-1
-code=20
+xserverbpp=24
+code=10
 
 [Xvnc]
 name=Xvnc




# $FreeBSD$

PORTNAME=	xrdp
PORTVERSION=	0.9.3
DISTVERSIONPREFIX=	v
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	net
PKGNAMESUFFIX=	-devel

		${LOCALBASE}/bin/nasm:devel/nasm
RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp

USES=		autoreconf:build jpeg libtool localbase pkgconfig ssl
USE_XORG=	ice pixman sm x11 xfixes xrandr
GNU_CONFIGURE=	yes
USE_LDCONFIG=	${PREFIX}/lib/xrdp
USE_GITHUB=	yes
GH_ACCOUNT=	neutrinolabs
GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
GH_TAGNAME=	v0.1.2: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
CFLAGS+=	-I${LOCALBASE}/include -L${OPENSSLINC}
CONFLICTS=	xrdp-[0-9]*
INSTALL_TARGET=	install-strip
SUB_FILES=	pkg-install pkg-message

IPV6_CONFIGURE_ENABLE=	ipv6
DEBUG_CONFIGURE_ENABLE=	xrdpdebug
FUSE_CONFIGURE_ENABLE=	fuse
FUSE_USES=		fuse
MP3LAME_CONFIGURE_ENABLE=	mp3lame
MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
OPUS_CONFIGURE_ENABLE=	opus


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MFUSE}
USES+=	fuse
.endif

post-extract:
	# librfxcodec is provided as git submodule
	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/




bin/xrdp-keygen
bin/xrdp-sesadmin
bin/xrdp-sesrun
bin/rfxcodectest
lib/libpainter.a
lib/libpainter.so
lib/libpainter.so.0

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

lib/xrdp/libcommon.so.0.0.0
lib/xrdp/libmc.a
lib/xrdp/libmc.so
lib/xrdp/libmc.so.0
lib/xrdp/libmc.so.0.0.0
lib/xrdp/librdp.a
lib/xrdp/librdp.so
lib/xrdp/librdp.so.0
lib/xrdp/librdp.so.0.0.0
lib/xrdp/libscp.a
lib/xrdp/libscp.so
lib/xrdp/libscp.so.0
lib/xrdp/libscp.so.0.0.0
lib/xrdp/libvnc.a
lib/xrdp/libvnc.so
lib/xrdp/libvnc.so.0
lib/xrdp/libvnc.so.0.0.0
lib/xrdp/libxrdp.a
lib/xrdp/libxrdp.so
lib/xrdp/libxrdp.so.0
lib/xrdp/libxrdp.so.0.0.0
lib/xrdp/libxup.a
lib/xrdp/libxup.so
lib/xrdp/libxup.so.0
lib/xrdp/libxup.so.0.0.0
lib/xrdp/libxrdpapi.so
lib/xrdp/libxrdpapi.a
lib/xrdp/libxrdpapi.so.0

man/man8/xrdp-sesadmin.8.gz
man/man8/xrdp-sesman.8.gz
man/man8/xrdp-sesrun.8.gz
man/man8/xrdp-sessvc.8.gz
sbin/xrdp
sbin/xrdp-chansrv
sbin/xrdp-sesman
sbin/xrdp-sessvc
%%DATADIR%%/ad24b.bmp
%%DATADIR%%/ad256.bmp
%%DATADIR%%/cursor0.cur

Return to bug 220820

Lines 1-22 Link Here

(-)net/xrdp-devel/files/patch-configure.ac (-14 / +32 lines)
1	diff --git configure.ac configure.ac	1	--- configure.ac.orig 2017-07-14 12:22:02 UTC
2	index 5c73168a..abbf4135 100644
3	--- configure.ac
4	+++ configure.ac	2	+++ configure.ac
5	@@ -138,8 +138,15 @@ AC_CHECK_FUNC(dlopen, [],	3	@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
6	AC_SUBST(DLOPEN_LIBS)	4	AC_SUBST(DLOPEN_LIBS)
7		5
8	# checking for openssl	6	# checking for openssl
9	-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],	7	-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
10	- [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
11	+if test "x$freebsd" = "xyes"; then	8	+if test "x$freebsd" = "xyes"; then
12	+ # FreeBSD base doesn't supply "*.pc"	9	+ # FreeBSD may have two OpenSSL, base and port however
13	+ AC_CHECK_HEADER([openssl/rc4.h], [],	10	+ # base OpenSSL doesn.t have openssl.pc file.
14	+ [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],	11	+ PKG_CHECK_MODULES(
15	+ [#include <stdlib.h>])	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
16	+else	29	+else
		30	+ # OpenSSL detection for other OS
17	+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],	31	+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
18	+ [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])	32	[AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
		33	+ OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
19	+fi	34	+fi
20		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
21	# checking for pam variation	40	# checking for pam variation
22	# Linux-PAM is used in Linux systems

Lines 1-34 Link Here

(-)net/xrdp-devel/files/patch-xrdp_xrdp.ini (-34 lines)
1	--- xrdp/xrdp.ini.orig 2016-12-22 17:04:29 UTC
2	+++ xrdp/xrdp.ini
3	@@ -147,24 +147,24 @@ tcutils=true
4	; Session types
5	;
6
7	-[X11rdp]
8	-name=X11rdp
9	+[Xorg]
10	+name=Xorg
11	lib=libxup.so
12	username=ask
13	password=ask
14	ip=127.0.0.1
15	port=-1
16	-xserverbpp=24
17	-code=10
18	+code=20
19
20	-[Xorg]
21	-name=Xorg
22	+[X11rdp]
23	+name=X11rdp
24	lib=libxup.so
25	username=ask
26	password=ask
27	ip=127.0.0.1
28	port=-1
29	-code=20
30	+xserverbpp=24
31	+code=10
32
33	[Xvnc]
34	name=Xvnc

Lines 2-10 Link Here

(-)net/xrdp-devel/Makefile (-11 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xrdp	4	PORTNAME= xrdp
5	PORTVERSION= 0.9.1	5	PORTVERSION= 0.9.3
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 2
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= net	8	CATEGORIES= net
10	PKGNAMESUFFIX= -devel	9	PKGNAMESUFFIX= -devel
Lines 21-40 Link Here
21	${LOCALBASE}/bin/nasm:devel/nasm	20	${LOCALBASE}/bin/nasm:devel/nasm
22	RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp	21	RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp
23		22
24	USES= autoreconf:build jpeg libtool pkgconfig ssl	23	USES= autoreconf:build jpeg libtool localbase pkgconfig ssl
25	USE_XORG= ice pixman sm x11 xfixes xrandr	24	USE_XORG= ice pixman sm x11 xfixes xrandr
26	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
27	USE_LDCONFIG= ${PREFIX}/lib/xrdp	26	USE_LDCONFIG= ${PREFIX}/lib/xrdp
28	USE_GITHUB= yes	27	USE_GITHUB= yes
29	GH_ACCOUNT= neutrinolabs	28	GH_ACCOUNT= neutrinolabs
30	GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter	29	GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter
31	GH_TAGNAME= v0.1.0:librfxcodec v0.1.0:libpainter	30	GH_TAGNAME= v0.1.2:librfxcodec v0.1.1:libpainter
32		31
33	CONFIGURE_ARGS= --localstatedir=/var \	32	CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \
34	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \	33	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
35	--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter	34	--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
36	LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl	35	LDFLAGS+= -lssl
37	CFLAGS+= -I${LOCALBASE}/include -L${OPENSSLINC}
38	CONFLICTS= xrdp-[0-9]*	36	CONFLICTS= xrdp-[0-9]*
39	INSTALL_TARGET= install-strip	37	INSTALL_TARGET= install-strip
40	SUB_FILES= pkg-install pkg-message	38	SUB_FILES= pkg-install pkg-message
Lines 49-54 Link Here
49	IPV6_CONFIGURE_ENABLE= ipv6	47	IPV6_CONFIGURE_ENABLE= ipv6
50	DEBUG_CONFIGURE_ENABLE= xrdpdebug	48	DEBUG_CONFIGURE_ENABLE= xrdpdebug
51	FUSE_CONFIGURE_ENABLE= fuse	49	FUSE_CONFIGURE_ENABLE= fuse
		50	FUSE_USES= fuse
52	MP3LAME_CONFIGURE_ENABLE= mp3lame	51	MP3LAME_CONFIGURE_ENABLE= mp3lame
53	MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame	52	MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
54	OPUS_CONFIGURE_ENABLE= opus	53	OPUS_CONFIGURE_ENABLE= opus
Lines 60-69 Link Here
60		59
61	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
62		61
63	.if ${PORT_OPTIONS:MFUSE}
64	USES+= fuse
65	.endif
66
67	post-extract:	62	post-extract:
68	# librfxcodec is provided as git submodule	63	# librfxcodec is provided as git submodule
69	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/	64	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/

Lines 3-9 Link Here

(-)net/xrdp-devel/pkg-plist (-13 / +1 lines)
3	bin/xrdp-keygen	3	bin/xrdp-keygen
4	bin/xrdp-sesadmin	4	bin/xrdp-sesadmin
5	bin/xrdp-sesrun	5	bin/xrdp-sesrun
6	bin/rfxcodectest
7	lib/libpainter.a	6	lib/libpainter.a
8	lib/libpainter.so	7	lib/libpainter.so
9	lib/libpainter.so.0	8	lib/libpainter.so.0
Lines 19-24 Link Here
19	include/xrdp_client_info.h	18	include/xrdp_client_info.h
20	include/xrdp_constants.h	19	include/xrdp_constants.h
21	include/xrdp_rail.h	20	include/xrdp_rail.h
		21	include/xrdp_sockets.h
22	lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so	22	lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so
23	lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so	23	lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so
24	libdata/pkgconfig/libpainter.pc	24	libdata/pkgconfig/libpainter.pc
Lines 30-57 Link Here
30	lib/xrdp/libcommon.so.0.0.0	30	lib/xrdp/libcommon.so.0.0.0
31	lib/xrdp/libmc.a	31	lib/xrdp/libmc.a
32	lib/xrdp/libmc.so	32	lib/xrdp/libmc.so
33	lib/xrdp/libmc.so.0
34	lib/xrdp/libmc.so.0.0.0
35	lib/xrdp/librdp.a
36	lib/xrdp/librdp.so
37	lib/xrdp/librdp.so.0
38	lib/xrdp/librdp.so.0.0.0
39	lib/xrdp/libscp.a	33	lib/xrdp/libscp.a
40	lib/xrdp/libscp.so	34	lib/xrdp/libscp.so
41	lib/xrdp/libscp.so.0	35	lib/xrdp/libscp.so.0
42	lib/xrdp/libscp.so.0.0.0	36	lib/xrdp/libscp.so.0.0.0
43	lib/xrdp/libvnc.a	37	lib/xrdp/libvnc.a
44	lib/xrdp/libvnc.so	38	lib/xrdp/libvnc.so
45	lib/xrdp/libvnc.so.0
46	lib/xrdp/libvnc.so.0.0.0
47	lib/xrdp/libxrdp.a	39	lib/xrdp/libxrdp.a
48	lib/xrdp/libxrdp.so	40	lib/xrdp/libxrdp.so
49	lib/xrdp/libxrdp.so.0	41	lib/xrdp/libxrdp.so.0
50	lib/xrdp/libxrdp.so.0.0.0	42	lib/xrdp/libxrdp.so.0.0.0
51	lib/xrdp/libxup.a	43	lib/xrdp/libxup.a
52	lib/xrdp/libxup.so	44	lib/xrdp/libxup.so
53	lib/xrdp/libxup.so.0
54	lib/xrdp/libxup.so.0.0.0
55	lib/xrdp/libxrdpapi.so	45	lib/xrdp/libxrdpapi.so
56	lib/xrdp/libxrdpapi.a	46	lib/xrdp/libxrdpapi.a
57	lib/xrdp/libxrdpapi.so.0	47	lib/xrdp/libxrdpapi.so.0
Lines 98-108 Link Here
98	man/man8/xrdp-sesadmin.8.gz	88	man/man8/xrdp-sesadmin.8.gz
99	man/man8/xrdp-sesman.8.gz	89	man/man8/xrdp-sesman.8.gz
100	man/man8/xrdp-sesrun.8.gz	90	man/man8/xrdp-sesrun.8.gz
101	man/man8/xrdp-sessvc.8.gz
102	sbin/xrdp	91	sbin/xrdp
103	sbin/xrdp-chansrv	92	sbin/xrdp-chansrv
104	sbin/xrdp-sesman	93	sbin/xrdp-sesman
105	sbin/xrdp-sessvc
106	%%DATADIR%%/ad24b.bmp	94	%%DATADIR%%/ad24b.bmp
107	%%DATADIR%%/ad256.bmp	95	%%DATADIR%%/ad256.bmp
108	%%DATADIR%%/cursor0.cur	96	%%DATADIR%%/cursor0.cur