net/xrdp{,-devel}: Update to 0.9.6

* mark -devel port as IGNORE since net/xrdp has been updated
* s/XRDP/xrdp/ in pkg-message, upstream usually spell it lowercase

x11-servers/x11rdp: remove port

This port is only required by net/xrdp 0.6.2. Since net/xrdp has been
updated to 0.9.6, it is no longer required any other port and not useful
with standalone at all. 0.9.1 or later uses x11-drivers/xorgxrdp instead.

Approved by:	hrs (mentor, via email)
Relnotes:	https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.1
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.2
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.4
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.5
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.6
Differential Revision:	https://reviews.freebsd.org/D15375

18 files changed, 238 insertions, 2997 deletions

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 75547b651384..abfa54a440b7 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -2,76 +2,100 @@
 # $FreeBSD$
 
 PORTNAME=	xrdp
-PORTVERSION=	0.6.2
+PORTVERSION=	0.9.6
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net
-DIST_SUBDIR=	${PORTNAME}
+DIST_SUBDIR?=	${PORTNAME}
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
-LICENSE=	GPLv2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+# 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
+USE_XORG=	ice pixman sm x11 xfixes xrandr
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build libtool pkgconfig ssl
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
-USE_RC_SUBR=	xrdp
-USE_XORG=	x11 xfixes
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
+GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
+GH_TAGNAME=	v0.1.4: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
+CONFLICTS=	xrdp-devel[0-9]*
+INSTALL_TARGET=	install-strip
+SUB_FILES=	pkg-install pkg-message
+SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
+
+OPTIONS_DEFINE=	DEBUG FUSE IPV6
+OPTIONS_DEFAULT=	FDKAAC MP3LAME OPUS
+OPTIONS_GROUP=	AUDIO_CODEC
+OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
+FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
+FUSE_DESC=	Enable drive redirection via FUSE (experimental)
+MP3LAME_DESC=	Enable MP3 Lame for audio redirection
+OPUS_DESC=	Enable Opus for audio redirection
 
-CONFIGURE_ARGS=	--localstatedir=/var
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=	DEBUG
-OPTIONS_DEFAULT=	JP106 X11RDP
-OPTIONS_GROUP=	KEYMAP XSERVER
-OPTIONS_GROUP_KEYMAP=	JP106
-OPTIONS_GROUP_XSERVER=	X11RDP
-OPTIONS_RADIO=	XVNC
-OPTIONS_RADIO_XVNC=	TIGERVNC TIGHTVNC TRIDIAVNC
-TIGERVNC_DESC=	Use TigerVNC (recommended)
-TIGHTVNC_DESC=	Use TightVNC
-TRIDIAVNC_DESC=	Use TridiaVNC
-X11RDP_DESC=	Use X11rdp (most recommended)
-JP106_DESC=	Install Japanese JP106 keymap
-
-# Debug
 DEBUG_CONFIGURE_ENABLE=	xrdpdebug
-# Xvnc
-TIGERVNC_RUN_DEPENDS=	Xvnc:net/tigervnc
-TIGHTVNC_RUN_DEPENDS=	Xvnc:net/tightvnc
-TRIDIAVNC_RUN_DEPENDS=	Xvnc:net/tridiavnc
-# X11rdp
-X11RDP_RUN_DEPENDS=	X11rdp:x11-servers/x11rdp
-X11RDP_EXTRA_PATCHES=	${FILESDIR}/extra-patch-x11rdp_xrdp.ini
-# JP106 keymap
-JP106_PLIST_SUB=	JP106=""
-JP106_PLIST_SUB_OFF=	JP106="@comment "
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJP106}
-KEYMAP_FILES+=	km-0411.ini km-e0010411.ini \
-		km-e0200411.ini km-e0210411.ini
-.endif
+FDKAAC_CONFIGURE_ENABLE=	fdkaac
+FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
+FUSE_CONFIGURE_ENABLE=	fuse
+FUSE_USES=		fuse
+IPV6_CONFIGURE_ENABLE=	ipv6
+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
+
+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_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 reconnectwm.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 a/net/xrdp/distinfo b/net/xrdp/distinfo
index b8c1e011cc7c..49b168f757fa 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1475561595
-SHA256 (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1e12e41537b3cac15f5c216663fc18a15df5a16e9eb2bc1768bea16190815438
-SIZE (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1559505
+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
+SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
+SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
diff --git a/net/xrdp/files/extra-patch-x11rdp_xrdp.ini b/net/xrdp/files/extra-patch-x11rdp_xrdp.ini
deleted file mode 100644
index f6a2663976dc..000000000000
--- a/net/xrdp/files/extra-patch-x11rdp_xrdp.ini
+++ /dev/null
@@ -1,74 +0,0 @@
---- xrdp/xrdp.ini.orig	2013-02-01 14:36:13.909344583 +0000
-+++ xrdp/xrdp.ini	2013-02-01 14:41:12.679342721 +0000
-@@ -17,6 +17,15 @@
- #background=626c72
- 
- [xrdp1]
-+name=sesman-X11rdp
-+lib=libxup.so
-+username=ask
-+password=ask
-+ip=127.0.0.1
-+port=-1
-+xserverbpp=24
-+
-+[xrdp2]
- name=sesman-Xvnc
- lib=libvnc.so
- username=ask
-@@ -24,7 +33,7 @@
- ip=127.0.0.1
- port=-1
- 
--[xrdp2]
-+[xrdp3]
- name=console
- lib=libvnc.so
- ip=127.0.0.1
-@@ -32,7 +41,7 @@
- username=na
- password=ask
- 
--[xrdp3]
-+[xrdp4]
- name=vnc-any
- lib=libvnc.so
- ip=ask
-@@ -40,7 +49,7 @@
- username=na
- password=ask
- 
--[xrdp4]
-+[xrdp5]
- name=sesman-any
- lib=libvnc.so
- ip=ask
-@@ -48,13 +57,13 @@
- username=ask
- password=ask
- 
--[xrdp5]
-+[xrdp6]
- name=rdp-any
- lib=librdp.so
- ip=ask
- port=ask3389
- 
--[xrdp6]
-+[xrdp7]
- name=freerdp-any
- lib=libxrdpfreerdp1.so
- ip=ask
-@@ -62,11 +71,4 @@
- username=ask
- password=ask
- 
--[xrdp7]
--name=sesman-X11rdp
--lib=libxup.so
--username=ask
--password=ask
--ip=127.0.0.1
--port=-1
--xserverbpp=24
-+
diff --git a/net/xrdp/files/km-0411.ini b/net/xrdp/files/km-0411.ini
deleted file mode 100644
index 781e8cbde867..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/km-e0010411.ini b/net/xrdp/files/km-e0010411.ini
deleted file mode 100644
index 781e8cbde867..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/km-e0200411.ini b/net/xrdp/files/km-e0200411.ini
deleted file mode 100644
index 781e8cbde867..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/km-e0210411.ini b/net/xrdp/files/km-e0210411.ini
deleted file mode 100644
index 781e8cbde867..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/patch-configure.ac b/net/xrdp/files/patch-configure.ac
new file mode 100644
index 000000000000..762394926700
--- /dev/null
+++ b/net/xrdp/files/patch-configure.ac
@@ -0,0 +1,40 @@
+--- configure.ac.orig	2017-12-27 14:40:24 UTC
++++ configure.ac
+@@ -159,11 +159,35 @@ AC_CHECK_FUNC(dlopen, [],
+ AC_SUBST(DLOPEN_LIBS)
+ 
+ # checking for openssl
+-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
++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
diff --git a/net/xrdp/files/patch-instfiles__Makefile.am b/net/xrdp/files/patch-instfiles__Makefile.am
deleted file mode 100644
index 48a1a91af89b..000000000000
--- a/net/xrdp/files/patch-instfiles__Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
---- instfiles/Makefile.am.orig	2013-10-22 20:09:12.432299450 +0000
-+++ instfiles/Makefile.am	2013-10-22 20:09:54.714401214 +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
- 
- SUBDIRS = \
-   pam.d
-@@ -6,14 +6,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 a/net/xrdp/files/patch-sesman__Makefile.am b/net/xrdp/files/patch-sesman__Makefile.am
deleted file mode 100644
index 456fe30d0441..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/patch-sesman__session.c b/net/xrdp/files/patch-sesman__session.c
deleted file mode 100644
index abdd76be1381..000000000000
--- a/net/xrdp/files/patch-sesman__session.c
+++ /dev/null
@@ -1,85 +0,0 @@
---- sesman/session.c.orig	2011-03-12 16:10:35.000000000 +0900
-+++ sesman/session.c	2011-10-27 12:13:11.000000000 +0900
-@@ -16,7 +16,47 @@
-    xrdp: A Remote Desktop Protocol server.
-    Copyright (C) Jay Sorg 2005-2008
- */
--
-+/*
-+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-+ *                    All rights reserved
-+ *
-+ * As far as I am concerned, the code I have written for this software
-+ * can be used freely for any purpose.  Any derived versions of this
-+ * software must be clearly marked as such, and if the derived work is
-+ * incompatible with the protocol description in the RFC file, it must be
-+ * called by a name other than "ssh" or "Secure Shell".
-+ *
-+ * SSH2 support by Markus Friedl.
-+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * 
-+ * Copyright (c) 2011 Iwao, Koichiro <meta@club.kyutech.ac.jp>, 
-+ *                    Kyushu Institute of Technology.
-+ *                    All rights reserved.
-+ *
-+ * 	from: OpenBSD: session.c,v 1.252 2010/03/07 11:57:13 dtucker Exp
-+ *            with some ideas about process grouping from OpenSSH to xrdp
-+ * 	       
-+ */
- /**
-  *
-  * @file session.c
-@@ -373,6 +413,33 @@
-     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.
-+     */
-+    pid_t bsdsespid = g_fork();
-+
-+    if (bsdsespid == -1)
-+    {
-+    }
-+    else if (bsdsespid == 0) /* BSD session leader */
-+    {
-+        if (setsid() < 0)
-+        {
-+          log_message(&(g_cfg->log), LOG_LEVEL_ERROR,
-+            "setsid failed: %.100s", strerror(errno));
-+        }
-+
-+        if (setlogin(username) < 0)
-+        {
-+          log_message(&(g_cfg->log), LOG_LEVEL_ERROR,
-+            "setlogin failed: %.100s", strerror(errno));
-+        }
-+    }
-+
-+    g_waitpid(bsdsespid);
-+#endif
-     wmpid = g_fork();
-     if (wmpid == -1)
-     {
diff --git a/net/xrdp/files/patch-sesman_sesman.ini.in b/net/xrdp/files/patch-sesman_sesman.ini.in
new file mode 100644
index 000000000000..94302d0cee34
--- /dev/null
+++ b/net/xrdp/files/patch-sesman_sesman.ini.in
@@ -0,0 +1,13 @@
+--- sesman/sesman.ini.in.orig	2017-12-27 14:40:24 UTC
++++ sesman/sesman.ini.in
+@@ -75,8 +75,8 @@ param=xrdp/xorg.conf
+ param=-noreset
+ param=-nolisten
+ param=tcp
+-param=-logfile
+-param=.xorgxrdp.%s.log
++#param=-logfile
++#param=.xorgxrdp.%s.log
+ 
+ [X11rdp]
+ param=X11rdp
diff --git a/net/xrdp/files/patch-xrdp__Makefile.am b/net/xrdp/files/patch-xrdp__Makefile.am
deleted file mode 100644
index d6f24f808229..000000000000
--- a/net/xrdp/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 a/net/xrdp/files/patch-xrdp_xrdp.ini b/net/xrdp/files/patch-xrdp_xrdp.ini
deleted file mode 100644
index 1bd4e8372dc2..000000000000
--- a/net/xrdp/files/patch-xrdp_xrdp.ini
+++ /dev/null
@@ -1,11 +0,0 @@
---- xrdp/xrdp.ini.orig	2013-09-12 21:36:02.000000000 +0000
-+++ xrdp/xrdp.ini	2013-12-19 07:05:11.089270612 +0000
-@@ -3,7 +3,7 @@
- bitmap_cache=yes
- bitmap_compression=yes
- port=3389
--crypt_level=low
-+crypt_level=high
- channel_code=1
- max_bpp=24
- #black=000000
diff --git a/net/xrdp/files/pkg-install.in b/net/xrdp/files/pkg-install.in
new file mode 100644
index 000000000000..f9980a370494
--- /dev/null
+++ b/net/xrdp/files/pkg-install.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+# vim:ts=4:sw=4:et
+
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+case $2 in
+    PRE-INSTALL)
+        : nothing to do here
+        ;;
+    POST-INSTALL)
+        RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini
+        PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem
+        CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem
+        # make sure rsakeys and certificates are private
+        umask 077
+        # generate rsakeys.ini
+        [ -e "$RSAKEYS" ] || %%PREFIX%%/bin/xrdp-keygen xrdp "$RSAKEYS"
+        # generate self-signed certificate
+        [ -e "$PRIVATEKEY" -a -e "$CERTIFICATE" ] || \
+            %%OPENSSLBASE%%/bin/openssl req \
+                 -x509 \
+                 -newkey rsa:4096 \
+                 -keyout "$PRIVATEKEY" \
+                 -sha256 \
+                 -nodes \
+                 -out "$CERTIFICATE" \
+                 -days 365 \
+                 -subj "/CN=$(hostname)"
+        ;;
+    *)
+        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in
index 7d4e3914601e..9024c32d5738 100644
--- a/net/xrdp/files/pkg-message.in
+++ b/net/xrdp/files/pkg-message.in
@@ -1,6 +1,6 @@
 ==============================================================================
 
-XRDP has been installed.
+xrdp has been installed.
 
 There is an rc.d script, so the service can be enabled by adding this line
 in /etc/rc.conf:
diff --git a/net/xrdp/files/xrdp.in b/net/xrdp/files/xrdp.in
deleted file mode 100644
index 24d4aabefa77..000000000000
--- a/net/xrdp/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 a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index ff2421279b1b..39739d9fa886 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -3,59 +3,95 @@ bin/xrdp-genkeymap
 bin/xrdp-keygen
 bin/xrdp-sesadmin
 bin/xrdp-sesrun
-bin/xrdp-sestest
+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
+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
 lib/xrdp/libcommon.a
 lib/xrdp/libcommon.so
 lib/xrdp/libcommon.so.0
 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
-man/man5/sesman.ini.5.gz
-man/man5/xrdp.ini.5.gz
-man/man8/xrdp-sesman.8.gz
-man/man8/xrdp-sesrun.8.gz
-man/man8/xrdp.8.gz
+lib/xrdp/libxrdpapi.so
+lib/xrdp/libxrdpapi.a
+lib/xrdp/libxrdpapi.so.0
+lib/xrdp/libxrdpapi.so.0.0.0
 etc/pam.d/xrdp-sesman
-%%ETCDIR%%/km-0407.ini
-%%ETCDIR%%/km-0409.ini
-%%ETCDIR%%/km-040c.ini
-%%ETCDIR%%/km-0410.ini
-%%ETCDIR%%/km-0419.ini
-%%ETCDIR%%/km-041d.ini
-%%JP106%%%%ETCDIR%%/km-0411.ini
-%%JP106%%%%ETCDIR%%/km-e0010411.ini
-%%JP106%%%%ETCDIR%%/km-e0200411.ini
-%%JP106%%%%ETCDIR%%/km-e0210411.ini
-@sample %%ETCDIR%%/rsakeys.ini.sample
+etc/rc.d/xrdp
+%%ETCDIR%%/km-00000407.ini
+%%ETCDIR%%/km-00000409.ini
+%%ETCDIR%%/km-00010409.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/reconnectwm.sh.sample %D/etc/xrdp/reconnectwm.sh; then rm -f %D/etc/xrdp/reconnectwm.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%%/reconnectwm.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
 sbin/xrdp
 sbin/xrdp-chansrv
 sbin/xrdp-sesman
-sbin/xrdp-sessvc
 %%DATADIR%%/ad24b.bmp
 %%DATADIR%%/ad256.bmp
 %%DATADIR%%/cursor0.cur
@@ -63,3 +99,4 @@ sbin/xrdp-sessvc
 %%DATADIR%%/sans-10.fv1
 %%DATADIR%%/xrdp24b.bmp
 %%DATADIR%%/xrdp256.bmp
+%%DATADIR%%/xrdp_logo.bmp