Attachment 179570 Details for Bug 216420 – patch

[patch] patch

patch-xrdp-devel-0.9.1.txt (text/plain), 53.68 KB, created by Koichiro Iwao on 2017-02-03 15:55:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2017-02-03 15:55:29 UTC

Size: 53.68 KB

patch

obsolete

>diff --git net/xrdp-devel/Makefile net/xrdp-devel/Makefile
>index 0ee3389..f1d3b87 100644
>--- net/xrdp-devel/Makefile
>+++ net/xrdp-devel/Makefile
>@@ -2,92 +2,105 @@
> # $FreeBSD$
> 
> PORTNAME=	xrdp
>-PORTVERSION=	0.7.0.b20130912
>-PORTREVISION=	4
>+PORTVERSION=	0.9.1
>+DISTVERSIONPREFIX=	v
> PORTEPOCH=	1
> CATEGORIES=	net
> PKGNAMESUFFIX=	-devel
>+DIST_SUBDIR?=	${PORTNAME}
> 
> MAINTAINER=	meta+ports@vmeta.jp
> COMMENT=	Open source Remote Desktop Protocol (RDP) server
> 
>-LICENSE=	GPLv2
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+# pulseaudio's built 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 libtool pkgconfig ssl
>-USE_XORG=	x11 xfixes
>+USE_XORG=	ice pixman sm x11 xfixes xrandr
> GNU_CONFIGURE=	yes
>-USE_RC_SUBR=	xrdp
> USE_LDCONFIG=	${PREFIX}/lib/xrdp
> USE_GITHUB=	yes
> GH_ACCOUNT=	neutrinolabs
>-GH_TAGNAME=	64e2291
>+GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
>+GH_TAGNAME=	v0.1.0:librfxcodec v0.1.0:libpainter
> 
> CONFIGURE_ARGS=	--localstatedir=/var \
>-		--enable-jpeg
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
>-LIBS+=		-L${LOCALBASE}/lib -L${OPENSSLLIB}
>+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
>+		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
>+LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl
>+CFLAGS+=	-I${LOCALBASE}/include -L${OPENSSLINC}
> CONFLICTS=	xrdp-[0-9]*
>-# xrdp v0.7 is not compatible with current net/freerdp (1.0.2)
>-#BUILD_DEPENDS+=	freerdp>=1.0.2:net/freerdp
>-#CONFIGURE_ARGS+=	--enable-freerdp1
>+INSTALL_TARGET=	install-strip
>+SUB_FILES=	pkg-install pkg-message
>+SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
> 
>-OPTIONS_DEFINE=	DEBUG SOUND
>-OPTIONS_DEFAULT=	TIGERVNC JP106
>-OPTIONS_GROUP=	KEYMAP
>-OPTIONS_GROUP_KEYMAP= JP106
>-OPTIONS_RADIO=	XVNC
>-OPTIONS_RADIO_XVNC=	TIGERVNC TIGHTVNC TRIDIAVNC
>-TIGERVNC_DESC=	Use TigerVNC (recommended)
>-TIGHTVNC_DESC=	Use TightVNC
>-TRIDIAVNC_DESC=	Use TridiaVNC
>-SOUND_DESC=	Enable sound support via pulseaudio (experimental)
>-JP106_DESC=	Install Japanese JP106 keymap
>+OPTIONS_DEFINE=	DEBUG FUSE IPV6 MP3LAME OPUS
>+OPTIONS_DEFAULT=	OPUS MP3LAME
>+FUSE_DESC=	Enable drive redirection via FUSE (experimental)
>+MP3LAME_DESC=	Enable MP3 Lame for audio redirection
>+OPUS_DESC=	Enable Opus for audio redirection
>+
>+IPV6_CONFIGURE_ENABLE=	ipv6
>+DEBUG_CONFIGURE_ENABLE=	xrdpdebug
>+FUSE_CONFIGURE_ENABLE=	fuse
>+MP3LAME_CONFIGURE_ENABLE=	mp3lame
>+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.options.mk>
> 
>-# Which Xserver to use
>-.if ${PORT_OPTIONS:MTIGERVNC}
>-RUN_DEPENDS=	Xvnc:net/tigervnc
>-.endif
>-.if ${PORT_OPTIONS:MTIGHTVNC}
>-RUN_DEPENDS=	Xvnc:net/tightvnc
>-.endif
>-.if ${PORT_OPTIONS:MTRIDIAVNC}
>-RUN_DEPENDS=	Xvnc:net/tridiavnc
>+.if ${PORT_OPTIONS:MFUSE}
>+USES+=	fuse
> .endif
> 
>-.if ${PORT_OPTIONS:MDEBUG}
>-CONFIGURE_ARGS+=	--enable-xrdpdebug
>-CFLAGS+=	-DXRDP_DEBUG
>-.endif
>-
>-.if ${PORT_OPTIONS:MJP106}
>-KEYMAP_FILES+=	km-0411.ini km-e0010411.ini \
>-		km-e0200411.ini km-e0210411.ini
>-PLIST_SUB+=	JP106=""
>-.else
>-PLIST_SUB+=	JP106="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MSOUND}
>-BUILD_DEPENDS+=	${LOCALBASE}/include/pulse/simple.h:audio/pulseaudio \
>-		${LOCALBASE}/include/pulse/error.h:audio/pulseaudio
>-CONFIGURE_ARGS+=	--enable-simplesound
>-.endif
>-
>-SUB_FILES=	pkg-message
>+post-extract:
>+	# librfxcodec is provided as git submodule
>+	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/
>+	@${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/
> 
> post-patch:
>-.for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini
>-	@${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample
>-.endfor
>+	@${REINPLACE_CMD} \
>+		-e "s|^PULSE_SCRIPT=/etc/xrdp/pulse/default.pa|PULSE_SCRIPT=${PREFIX}/etc/xrdp/pulse/default.pa|" \
>+		${WRKSRC}/sesman/sesman.ini
>+	@${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} && ./bootstrap
>+	@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:
>-.for f in ${KEYMAP_FILES}
>-	${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp
>+	# 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}
>+
>+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 xrdp.ini xrdp_keyboard.ini
>+	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
> .endfor
> 
> .include <bsd.port.mk>
>diff --git net/xrdp-devel/distinfo net/xrdp-devel/distinfo
>index 2af78ad..50b9291 100644
>--- net/xrdp-devel/distinfo
>+++ net/xrdp-devel/distinfo
>@@ -1,2 +1,7 @@
>-SHA256 (neutrinolabs-xrdp-0.7.0.b20130912-64e2291_GH0.tar.gz) = 2e21006a2bb09f706a5a63e999487a5eab45ab0c7bfcc3a3e056d288d525d06c
>-SIZE (neutrinolabs-xrdp-0.7.0.b20130912-64e2291_GH0.tar.gz) = 2892771
>+TIMESTAMP = 1482726509
>+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 9bfafb0277b07e8242bfdbede2928423d28c5714efb0c226118759fab06c42ab
>+SIZE (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 1885192
>+SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = b05c1812e2daef373bf5e647bc86ee11f136adbe7ea999b5109180f406071f0a
>+SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = 38590
>+SHA256 (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9fd2a3a85ba4f3e311cea34e9824bd38f3673e60951906c06744cf6b8f73397a
>+SIZE (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9859
>diff --git net/xrdp-devel/files/km-0411.ini net/xrdp-devel/files/km-0411.ini
>deleted file mode 100644
>index 781e8cb..0000000
>--- net/xrdp-devel/files/km-0411.ini
>+++ /dev/null
>@@ -1,659 +0,0 @@
>-[noshift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=92:92
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=95:95
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[altgr]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=0:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=0:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=0:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[capslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shiftcapslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>diff --git net/xrdp-devel/files/km-e0010411.ini net/xrdp-devel/files/km-e0010411.ini
>deleted file mode 100644
>index 781e8cb..0000000
>--- net/xrdp-devel/files/km-e0010411.ini
>+++ /dev/null
>@@ -1,659 +0,0 @@
>-[noshift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=92:92
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=95:95
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[altgr]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=0:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=0:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=0:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[capslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shiftcapslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>diff --git net/xrdp-devel/files/km-e0200411.ini net/xrdp-devel/files/km-e0200411.ini
>deleted file mode 100644
>index 781e8cb..0000000
>--- net/xrdp-devel/files/km-e0200411.ini
>+++ /dev/null
>@@ -1,659 +0,0 @@
>-[noshift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=92:92
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=95:95
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[altgr]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=0:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=0:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=0:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[capslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shiftcapslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>diff --git net/xrdp-devel/files/km-e0210411.ini net/xrdp-devel/files/km-e0210411.ini
>deleted file mode 100644
>index 781e8cb..0000000
>--- net/xrdp-devel/files/km-e0210411.ini
>+++ /dev/null
>@@ -1,659 +0,0 @@
>-[noshift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=92:92
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shift]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=95:95
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[altgr]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=59:59
>-Key48=58:58
>-Key49=0:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=0:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=0:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[capslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=49:49
>-Key11=50:50
>-Key12=51:51
>-Key13=52:52
>-Key14=53:53
>-Key15=54:54
>-Key16=55:55
>-Key17=56:56
>-Key18=57:57
>-Key19=48:48
>-Key20=45:45
>-Key21=94:94
>-Key22=65288:8
>-Key23=65289:9
>-Key24=81:81
>-Key25=87:87
>-Key26=69:69
>-Key27=82:82
>-Key28=84:84
>-Key29=89:89
>-Key30=85:85
>-Key31=73:73
>-Key32=79:79
>-Key33=80:80
>-Key34=64:64
>-Key35=91:91
>-Key36=65293:13
>-Key37=65507:0
>-Key38=65:65
>-Key39=83:83
>-Key40=68:68
>-Key41=70:70
>-Key42=71:71
>-Key43=72:72
>-Key44=74:74
>-Key45=75:75
>-Key46=76:76
>-Key47=59:59
>-Key48=58:58
>-Key49=65322:0
>-Key50=65505:0
>-Key51=93:93
>-Key52=90:90
>-Key53=88:88
>-Key54=67:67
>-Key55=86:86
>-Key56=66:66
>-Key57=78:78
>-Key58=77:77
>-Key59=44:44
>-Key60=46:46
>-Key61=47:47
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65513:0
>-Key65=32:32
>-Key66=65328:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65407:0
>-Key78=65300:0
>-Key79=65429:0
>-Key80=65431:0
>-Key81=65434:0
>-Key82=65453:45
>-Key83=65430:0
>-Key84=65437:0
>-Key85=65432:0
>-Key86=65451:43
>-Key87=65436:0
>-Key88=65433:0
>-Key89=65435:0
>-Key90=65438:0
>-Key91=65439:0
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65514:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=0:0
>-Key126=65469:61
>-Key127=0:0
>-Key128=0:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=92:92
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>-
>-[shiftcapslock]
>-Key8=0:0
>-Key9=65307:27
>-Key10=33:33
>-Key11=34:34
>-Key12=35:35
>-Key13=36:36
>-Key14=37:37
>-Key15=38:38
>-Key16=39:39
>-Key17=40:40
>-Key18=41:41
>-Key19=126:126
>-Key20=61:61
>-Key21=126:126
>-Key22=65288:8
>-Key23=65056:0
>-Key24=113:113
>-Key25=119:119
>-Key26=101:101
>-Key27=114:114
>-Key28=116:116
>-Key29=121:121
>-Key30=117:117
>-Key31=105:105
>-Key32=111:111
>-Key33=112:112
>-Key34=96:96
>-Key35=123:123
>-Key36=65293:13
>-Key37=65507:0
>-Key38=97:97
>-Key39=115:115
>-Key40=100:100
>-Key41=102:102
>-Key42=103:103
>-Key43=104:104
>-Key44=106:106
>-Key45=107:107
>-Key46=108:108
>-Key47=43:43
>-Key48=42:42
>-Key49=65322:0
>-Key50=65505:0
>-Key51=125:125
>-Key52=122:122
>-Key53=120:120
>-Key54=99:99
>-Key55=118:118
>-Key56=98:98
>-Key57=110:110
>-Key58=109:109
>-Key59=60:60
>-Key60=62:62
>-Key61=63:63
>-Key62=65506:0
>-Key63=65450:42
>-Key64=65511:0
>-Key65=32:32
>-Key66=65509:0
>-Key67=65470:0
>-Key68=65471:0
>-Key69=65472:0
>-Key70=65473:0
>-Key71=65474:0
>-Key72=65475:0
>-Key73=65476:0
>-Key74=65477:0
>-Key75=65478:0
>-Key76=65479:0
>-Key77=65273:0
>-Key78=65300:0
>-Key79=65463:55
>-Key80=65464:56
>-Key81=65465:57
>-Key82=65453:45
>-Key83=65460:52
>-Key84=65461:53
>-Key85=65462:54
>-Key86=65451:43
>-Key87=65457:49
>-Key88=65458:50
>-Key89=65459:51
>-Key90=65456:48
>-Key91=65454:46
>-Key92=0:0
>-Key93=65406:0
>-Key94=0:0
>-Key95=65480:0
>-Key96=65481:0
>-Key97=65360:0
>-Key98=65362:0
>-Key99=65365:0
>-Key100=65361:0
>-Key101=0:0
>-Key102=65363:0
>-Key103=65367:0
>-Key104=65364:0
>-Key105=65366:0
>-Key106=65379:0
>-Key107=65535:127
>-Key108=65421:13
>-Key109=65508:0
>-Key110=65299:0
>-Key111=65377:0
>-Key112=65455:47
>-Key113=65512:0
>-Key114=0:0
>-Key115=65515:0
>-Key116=65516:0
>-Key117=65383:0
>-Key118=0:0
>-Key119=0:0
>-Key120=0:0
>-Key121=0:0
>-Key122=0:0
>-Key123=0:0
>-Key124=65027:0
>-Key125=65513:0
>-Key126=65469:61
>-Key127=65515:0
>-Key128=65517:0
>-Key129=65315:0
>-Key130=0:0
>-Key131=65314:0
>-Key132=0:0
>-Key133=124:124
>-Key134=0:0
>-Key135=0:0
>-Key136=0:0
>-Key137=0:0
>diff --git net/xrdp-devel/files/patch-common__os_calls.c net/xrdp-devel/files/patch-common__os_calls.c
>deleted file mode 100644
>index d1c16a4..0000000
>--- net/xrdp-devel/files/patch-common__os_calls.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- common/os_calls.c.orig	2011-03-12 16:10:35.000000000 +0900
>-+++ common/os_calls.c	2011-03-12 16:34:05.000000000 +0900
>-@@ -1987,6 +1987,8 @@
>- g_clearenv(void)
>- {
>- #if defined(_WIN32)
>-+#elif defined(__FreeBSD__)
>-+  environ[0] = NULL;
>- #else
>-   environ = 0;
>- #endif
>diff --git net/xrdp-devel/files/patch-fix-autologin net/xrdp-devel/files/patch-fix-autologin
>deleted file mode 100644
>index adcba12..0000000
>--- net/xrdp-devel/files/patch-fix-autologin
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- xrdp/xrdp_wm.c.orig	2013-11-13 10:47:47.291991020 +0000
>-+++ xrdp/xrdp_wm.c	2013-11-13 10:53:12.461993834 +0000
>-@@ -509,12 +509,17 @@
>-         {
>-           /* if no doamin is passed, and no autorun in xrdp.ini,
>-              use the first item in the xrdp.ini
>--             file thats not named 'globals' */
>-+             file thats not named 
>-+             'globals' or 'Logging' or channels */
>-+          /* TODO: change this and have a 'autologin'
>-+             line in globals section */
>-           file_read_sections(fd, names);
>-           for (index = 0; index < names->count; index++)
>-           {
>-             q = (char*)list_get_item(names, index);
>--            if (g_strncasecmp("globals", q, 8) != 0)
>-+            if ((g_strncasecmp("globals", q, 8) != 0) &&
>-+                (g_strncasecmp("Logging", q, 8) != 0) &&
>-+                (g_strncasecmp("channels", q, 9) != 0))
>-             {
>-               g_strncpy(section_name, q, 255);
>-               break;
>diff --git net/xrdp-devel/files/patch-instfiles__Makefile.am net/xrdp-devel/files/patch-instfiles__Makefile.am
>deleted file mode 100644
>index 0d0e0a7..0000000
>--- net/xrdp-devel/files/patch-instfiles__Makefile.am
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- instfiles/Makefile.am.orig	2013-09-12 20:47:57.000000000 +0000
>-+++ instfiles/Makefile.am	2013-10-22 20:53:08.435310429 +0000
>-@@ -1,4 +1,4 @@
>--EXTRA_DIST = xrdp.sh km-0407.ini  km-0409.ini km-040c.ini km-0410.ini km-0419.ini km-041d.ini \
>-+EXTRA_DIST = km-0407.ini km-0409.ini km-040c.ini km-0410.ini km-0419.ini km-041d.ini \
>- xrdp-sesman.service \
>- xrdp.service
>- 
>-@@ -14,14 +14,9 @@
>- startscriptdir=$(sysconfdir)/xrdp
>- 
>- startscript_DATA = \
>--  xrdp.sh \
>-   km-0407.ini \
>-   km-0409.ini \
>-   km-040c.ini \
>-   km-0410.ini \
>-   km-0419.ini \
>-   km-041d.ini
>--
>--# must be tab below
>--install-data-hook:
>--	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
>diff --git net/xrdp-devel/files/patch-sesman__Makefile.am net/xrdp-devel/files/patch-sesman__Makefile.am
>deleted file mode 100644
>index 456fe30..0000000
>--- net/xrdp-devel/files/patch-sesman__Makefile.am
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- sesman/Makefile.am.orig	2009-05-18 23:23:48.000000000 -0500
>-+++ sesman/Makefile.am	2010-10-02 16:07:53.000000000 -0500
>-@@ -55,4 +55,4 @@
>- sesmansysconf_DATA = \
>--  sesman.ini \
>--  startwm.sh
>-+  sesman.ini.sample \
>-+  startwm.sh.sample
>- 
>-@@ -66,2 +66,2 @@
>- install-data-hook:
>--	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh
>-+	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh.sample
>diff --git net/xrdp-devel/files/patch-sesman__session.c net/xrdp-devel/files/patch-sesman__session.c
>deleted file mode 100644
>index f1689fb..0000000
>--- net/xrdp-devel/files/patch-sesman__session.c
>+++ /dev/null
>@@ -1,38 +0,0 @@
>---- sesman/session.c.orig	2013-10-24 03:58:40.958300769 +0000
>-+++ sesman/session.c	2013-10-24 04:24:10.688299377 +0000
>-@@ -422,6 +422,35 @@
>-     g_sprintf(geometry, "%dx%d", width, height);
>-     g_sprintf(depth, "%d", bpp);
>-     g_sprintf(screen, ":%d", display);
>-+#ifdef __FreeBSD__
>-+    /*
>-+     * Create a new session and process group since 4.4BSD
>-+     * setlogin affects the entire process group.
>-+     *
>-+     * from: OpenBSD: session.c,v 1.252 2010/03/07 11:57:13 dtucker Exp
>-+     */
>-+    pid_t bsdsespid = g_fork();
>-+
>-+    if (bsdsespid == -1)
>-+    {
>-+    }
>-+    else if (bsdsespid == 0) /* BSD session leader */
>-+    {
>-+        if (setsid() < 0)
>-+        {
>-+          log_message(LOG_LEVEL_ERROR,
>-+            "setsid failed - pid %d", g_getpid());
>-+        }
>-+
>-+        if (setlogin(username) < 0)
>-+        {
>-+          log_message(LOG_LEVEL_ERROR,
>-+            "setlogin failed for user %s - pid %d", username, g_getpid());
>-+        }
>-+    }
>-+
>-+    g_waitpid(bsdsespid);
>-+#endif
>-     wmpid = g_fork();
>-     if (wmpid == -1)
>-     {
>diff --git net/xrdp-devel/files/patch-xrdp__Makefile.am net/xrdp-devel/files/patch-xrdp__Makefile.am
>deleted file mode 100644
>index d6f24f8..0000000
>--- net/xrdp-devel/files/patch-xrdp__Makefile.am
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- xrdp/Makefile.am.orig	2009-05-18 23:23:48.000000000 -0500
>-+++ xrdp/Makefile.am	2010-10-02 16:05:10.000000000 -0500
>-@@ -36,4 +36,4 @@
>- xrdpsysconf_DATA = \
>--  xrdp.ini \
>--  rsakeys.ini
>-+  xrdp.ini.sample \
>-+  rsakeys.ini.sample
>- 
>-@@ -50,2 +50,2 @@
>- install-data-hook:
>--	chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini
>-+	chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini.sample
>diff --git net/xrdp-devel/files/xrdp.in net/xrdp-devel/files/xrdp.in
>deleted file mode 100644
>index 24d4aab..0000000
>--- net/xrdp-devel/files/xrdp.in
>+++ /dev/null
>@@ -1,61 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-# REQUIRE: DAEMON
>-# PROVIDE: xrdp xrdp_sesman
>-#
>-
>-. /etc/rc.subr
>-
>-name="xrdp"
>-rcvar=xrdp_enable
>-xrdp_daemons="xrdp"
>-
>-# Read settings and set default values.
>-load_rc_config "$name"
>-: ${xrdp_enable="NO"}
>-
>-# Enable/disable dependent daemon.
>-if [ -n "${rcvar}" ] && checkyesno "xrdp_sesman_enable"; then
>-	xrdp_daemons="xrdp xrdp_sesman"
>-fi
>-
>-# Commands.
>-extra_commands="reload status"
>-start_cmd="xrdp_cmd"
>-stop_cmd="xrdp_cmd"
>-status_cmd="xrdp_cmd"
>-reload_cmd="xrdp_cmd"
>-rcvar_cmd="xrdp_cmd"
>-
>-# Command wrapper to call each of them per daemon.
>-xrdp_cmd() {
>-    local name rcvar command pidfile xrdp_daemons
>-    # Prevent recursive calling.
>-    unset "${rc_arg}_cmd"
>-    # Stop processes in the reverse to order.
>-    if [ "${rc_arg}" = "stop" ] ; then
>-	xrdp_daemons=$(reverse_list ${xrdp_daemons})
>-    fi
>-    # Generate rsakeys.ini on start
>-    if [ "${rc_arg}" = "start" -a ! -f %%PREFIX%%/etc/xrdp/rsakeys.ini ] ; then
>-        %%PREFIX%%/bin/xrdp-keygen xrdp %%PREFIX%%/etc/xrdp/rsakeys.ini
>-    fi
>-
>-    # Apply to all the daemons.
>-    for name in ${xrdp_daemons}; do
>-	rcvar=${name}_enable
>-	if [ "${name}" = "xrdp_sesman" ]; then
>-		command="%%PREFIX%%/sbin/xrdp-sesman"
>-		pidfile="/var/run/xrdp-sesman.pid"
>-	else
>-		command="%%PREFIX%%/sbin/${name}"
>-		pidfile="/var/run/${name}.pid"
>-	fi
>-
>-	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
>-    done
>-}
>-
>-run_rc_command "$1"
>diff --git net/xrdp-devel/pkg-plist net/xrdp-devel/pkg-plist
>index d8a18f3..b36e84e 100644
>--- net/xrdp-devel/pkg-plist
>+++ net/xrdp-devel/pkg-plist
>@@ -1,11 +1,29 @@
>-@stopdaemon xrdp
>-bin/xrdp-xcon
> bin/xrdp-dis
> bin/xrdp-genkeymap
> bin/xrdp-keygen
> bin/xrdp-sesadmin
> bin/xrdp-sesrun
>-bin/xrdp-sestest
>+bin/rfxcodectest
>+lib/libpainter.a
>+lib/libpainter.so
>+lib/libpainter.so.0
>+lib/libpainter.so.0.0.0
>+lib/librfxencode.so
>+lib/librfxencode.so.0.0.0
>+lib/librfxencode.a
>+lib/librfxencode.so.0
>+include/painter.h
>+include/rfxcodec_common.h
>+include/rfxcodec_decode.h
>+include/rfxcodec_encode.h
>+include/xrdp_client_info.h
>+include/xrdp_constants.h
>+include/xrdp_rail.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
> lib/xrdp/libcommon.a
> lib/xrdp/libcommon.so
> lib/xrdp/libcommon.so.0
>@@ -39,33 +57,55 @@ lib/xrdp/libxrdpapi.a
> lib/xrdp/libxrdpapi.so.0
> lib/xrdp/libxrdpapi.so.0.0.0
> etc/pam.d/xrdp-sesman
>-etc/xrdp/km-0407.ini
>-etc/xrdp/km-0409.ini
>-etc/xrdp/km-040c.ini
>-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-e0010411.ini
>-%%JP106%%etc/xrdp/km-e0200411.ini
>-%%JP106%%etc/xrdp/km-e0210411.ini
>-@sample etc/xrdp/rsakeys.ini.sample
>-@sample etc/xrdp/sesman.ini.sample
>-@sample etc/xrdp/startwm.sh.sample
>-@sample etc/xrdp/xrdp.ini.sample
>+etc/rc.d/xrdp
>+%%ETCDIR%%/km-00000407.ini
>+%%ETCDIR%%/km-00000409.ini
>+%%ETCDIR%%/km-0000040a.ini
>+%%ETCDIR%%/km-0000040b.ini
>+%%ETCDIR%%/km-0000040c.ini
>+%%ETCDIR%%/km-00000410.ini
>+%%ETCDIR%%/km-00000411.ini
>+%%ETCDIR%%/km-00000412.ini
>+%%ETCDIR%%/km-00000414.ini
>+%%ETCDIR%%/km-00000415.ini
>+%%ETCDIR%%/km-00000416.ini
>+%%ETCDIR%%/km-00000419.ini
>+%%ETCDIR%%/km-0000041d.ini
>+%%ETCDIR%%/km-00000807.ini
>+%%ETCDIR%%/km-00000809.ini
>+%%ETCDIR%%/km-0000080c.ini
>+%%ETCDIR%%/km-00000813.ini
>+%%ETCDIR%%/km-00000816.ini
>+%%ETCDIR%%/km-0000100c.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
>+@postunexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
>+@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
>+@sample %%ETCDIR%%/sesman.ini.sample
>+@sample %%ETCDIR%%/startwm.sh.sample
>+@sample %%ETCDIR%%/xrdp.ini.sample
>+@sample %%ETCDIR%%/xrdp_keyboard.ini.sample
>+man/man1/xrdp-dis.1.gz
> man/man5/sesman.ini.5.gz
>+man/man8/xrdp.8.gz
> man/man5/xrdp.ini.5.gz
>+man/man8/xrdp-chansrv.8.gz
>+man/man8/xrdp-genkeymap.8.gz
>+man/man8/xrdp-keygen.8.gz
>+man/man8/xrdp-sesadmin.8.gz
> man/man8/xrdp-sesman.8.gz
> man/man8/xrdp-sesrun.8.gz
>-man/man8/xrdp.8.gz
>+man/man8/xrdp-sessvc.8.gz
> sbin/xrdp
> sbin/xrdp-chansrv
> sbin/xrdp-sesman
> sbin/xrdp-sessvc
>-share/xrdp/ad24b.bmp
>-share/xrdp/ad256.bmp
>-share/xrdp/cursor0.cur
>-share/xrdp/cursor1.cur
>-share/xrdp/sans-10.fv1
>-share/xrdp/xrdp24b.bmp
>-share/xrdp/xrdp256.bmp
>+%%DATADIR%%/ad24b.bmp
>+%%DATADIR%%/ad256.bmp
>+%%DATADIR%%/cursor0.cur
>+%%DATADIR%%/cursor1.cur
>+%%DATADIR%%/sans-10.fv1
>+%%DATADIR%%/xrdp24b.bmp
>+%%DATADIR%%/xrdp256.bmp
>+%%DATADIR%%/xrdp_logo.bmp

Actions: View | Diff

Attachments on bug 216420: 179267 | 179489 | 179570 | 179734 | 179735