Attachment #113896 for bug #155509

Lines 6-17 Link Here

(-)/tmp/xrdp/Makefile (-4 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= xrdp	8	PORTNAME= xrdp
9	PORTVERSION= 0.6.0.20101009cvs	9	PORTVERSION= 0.6.0.20110117cvs
10	PORTREVISION= 1
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/	11	MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/ \
		12	http://key2.jp/~meta/distfiles/
		13	DIST_SUBDIR?= ${PORTNAME}
13		14
14	MAINTAINER= ports@FreeBSD.org	15	PATCH_SITES= http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \
		16	http://key2.jp/~meta/patches/xrdp/0.6.0/
		17
		18	MAINTAINER= meta@club.kyutech.ac.jp
15	COMMENT= An open source Remote Desktop Protocol (RDP) server	19	COMMENT= An open source Remote Desktop Protocol (RDP) server
16		20
17	USE_XORG= x11 xfixes	21	USE_XORG= x11 xfixes
Lines 22-35 Link Here
22	CONFIGURE_ARGS= --localstatedir=/var	26	CONFIGURE_ARGS= --localstatedir=/var
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	28	LDFLAGS="-L${LOCALBASE}/lib"
		29	CPPFLAGS= -I${LOCALBASE}/include
		30	LDFLAGS= -L${LOCALBASE}/lib
		31	RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc
		32	LICENSE= GPLv2
		33	LICENSE_FILE= ${WRKSRC}/COPYING
25		34
26	INSTALL_SHLIB= yes	35	INSTALL_SHLIB= yes
27	LDCONFIG_DIRS= %%PREFIX%%/lib/xrdp	36	LDCONFIG_DIRS= %%PREFIX%%/lib/xrdp
28		37
		38	OPTIONS= DEBUG "Build with debugging symbols" off \
		39	JP106 "Install Japanese JP106 Keymap" on
		40
		41	.include <bsd.port.options.mk>
		42
29	.if defined(WITH_DEBUG)	43	.if defined(WITH_DEBUG)
30	CFLAGS+= -DXRDP_DEBUG	44	CFLAGS+= -DXRDP_DEBUG
31	.endif	45	.endif
32		46
		47	.if defined(WITH_JP106)
		48	PATCHFILES+= patch-instfiles__Makefile.am \
		49	patch-instfiles__km-0411.ini \
		50	patch-instfiles__km-e0010411.ini \
		51	patch-instfiles__km-e0200411.ini \
		52	patch-instfiles__km-e0210411.ini
		53	PLIST_SUB+= JP106=""
		54	.else
		55	PLIST_SUB+= JP106="@comment "
		56	.endif
		57
33	MAN5= sesman.ini.5 xrdp.ini.5	58	MAN5= sesman.ini.5 xrdp.ini.5
34	MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8	59	MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
35		60




SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
SIZE (xrdp/patch-instfiles__Makefile.am) = 710
SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd
SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576
SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3
SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592
SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8
SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592
SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723
SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592

Lines 1-6 Link Here

(-)/tmp/xrdp/files/patch-common__os_calls.c (-3 / +3 lines)
1	--- ./common/os_calls.c.orig Sun Jul 30 01:41:31 2006	1	--- common/os_calls.c.orig 2011-03-12 16:10:35.000000000 +0900
2	+++ ./common/os_calls.c Mon Jun 4 17:37:42 2007	2	+++ common/os_calls.c 2011-03-12 16:34:05.000000000 +0900
3	@@ -1002,6 +1002,8 @@	3	@@ -1987,6 +1987,8 @@
4	g_clearenv(void)	4	g_clearenv(void)
5	{	5	{
6	#if defined(_WIN32)	6	#if defined(_WIN32)

Lines 1-34 Link Here

(-)/tmp/xrdp/files/patch-common__trans.c (-34 lines)
1	--- ./common/trans.c-orig 2010-05-04 09:37:22.000000000 +0200
2	+++ ./common/trans.c 2010-06-15 09:13:05.000000000 +0200
3	@@ -214,6 +214,7 @@
4	/* error */
5	self->status = TRANS_STATUS_DOWN;
6	rv = 1;
7	+ break;
8	}
9	}
10	else if (rcvd == 0)
11	@@ -221,6 +222,7 @@
12	/* error */
13	self->status = TRANS_STATUS_DOWN;
14	rv = 1;
15	+ break;
16	}
17	else
18	{
19	@@ -271,6 +273,7 @@
20	/* error */
21	self->status = TRANS_STATUS_DOWN;
22	rv = 1;
23	+ break;
24	}
25	}
26	else if (sent == 0)
27	@@ -278,6 +281,7 @@
28	/* error */
29	self->status = TRANS_STATUS_DOWN;
30	rv = 1;
31	+ break;
32	}
33	else
34	{

Lines 9-14 Link Here

(-)/tmp/xrdp/files/pkg-message.in (-1 / +1 lines)
9	xrdpsesman_enable="YES"	9	xrdpsesman_enable="YES"
10		10
11	Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"	11	Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
12	and the "%%PREFIX%%/lib/startwm.sh" script.	12	and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
13		13
14	==============================================================================	14	==============================================================================




etc/xrdp/km-0410.ini
etc/xrdp/km-0419.ini
etc/xrdp/km-041d.ini
%%JP106%%etc/xrdp/km-0411.ini
%%JP106%%etc/xrdp/km-e0200411.ini
%%JP106%%etc/xrdp/km-e0010411.ini
%%JP106%%etc/xrdp/km-e0210411.ini
etc/xrdp/rsakeys.ini.sample
etc/xrdp/sesman.ini
etc/xrdp/sesman.ini.sample
etc/xrdp/startwm.sh
etc/xrdp/startwm.sh.sample
etc/xrdp/xrdp.ini
etc/xrdp/xrdp.ini.sample
etc/xrdp/xrdp.sh
lib/xrdp/libcommon.a

Return to bug 155509

Lines 1-2 Link Here

(-)/tmp/xrdp/distinfo (-2 / +12 lines)
1	SHA256 (xrdp-0.6.0.20101009cvs.tar.gz) = b4379fc04e36b434116669b35ac0662ddc1451363e78b91f67017603913c9946	1	SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
2	SIZE (xrdp-0.6.0.20101009cvs.tar.gz) = 297394	2	SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
		3	SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
		4	SIZE (xrdp/patch-instfiles__Makefile.am) = 710
		5	SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd
		6	SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576
		7	SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3
		8	SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592
		9	SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8
		10	SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592
		11	SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723
		12	SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592

Lines 10-22 Link Here

(-)/tmp/xrdp/pkg-plist (-4 / +4 lines)
10	etc/xrdp/km-0410.ini	10	etc/xrdp/km-0410.ini
11	etc/xrdp/km-0419.ini	11	etc/xrdp/km-0419.ini
12	etc/xrdp/km-041d.ini	12	etc/xrdp/km-041d.ini
13	etc/xrdp/rsakeys.ini	13	%%JP106%%etc/xrdp/km-0411.ini
		14	%%JP106%%etc/xrdp/km-e0200411.ini
		15	%%JP106%%etc/xrdp/km-e0010411.ini
		16	%%JP106%%etc/xrdp/km-e0210411.ini
14	etc/xrdp/rsakeys.ini.sample	17	etc/xrdp/rsakeys.ini.sample
15	etc/xrdp/sesman.ini
16	etc/xrdp/sesman.ini.sample	18	etc/xrdp/sesman.ini.sample
17	etc/xrdp/startwm.sh
18	etc/xrdp/startwm.sh.sample	19	etc/xrdp/startwm.sh.sample
19	etc/xrdp/xrdp.ini
20	etc/xrdp/xrdp.ini.sample	20	etc/xrdp/xrdp.ini.sample
21	etc/xrdp/xrdp.sh	21	etc/xrdp/xrdp.sh
22	lib/xrdp/libcommon.a	22	lib/xrdp/libcommon.a