net/xrdp-devel: - Update to 0.7.0b20130912 (includes vulnerabilites fix) - Support stage - Normalize COMMENT - Add options to select VNC variants - Change RSA key pair generation behaviour - Do not install Linux specific script - Put additional keymaps in FILESDIR rather than fetching from remote site - Change behaviour of installing additional keymaps - and other Makefile style syncs to net/xrdp net/xrdp: - Do not install Linux specific script - Put additional keymaps in FILESDIR rather than fetching from remote site - Change behaviour of installing additional keymaps Fix: http://w.vmeta.jp/temp/patch-xrdp-0.6.1_1,1.txt http://w.vmeta.jp/temp/patch-xrdp-devel-0.7.0.b20130912,1.txt
Responsible Changed From-To: freebsd-ports-bugs->swills swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Author: swills Date: Fri Nov 15 01:26:42 2013 New Revision: 333810 URL: http://svnweb.freebsd.org/changeset/ports/333810 Log: - Do not install Linux specific script - Put additional keymaps in FILESDIR rather than fetching from remote site - Change behaviour of installing additional keymaps PR: ports/183312 Submitted by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer) Added: head/net/xrdp/files/km-0411.ini (contents, props changed) head/net/xrdp/files/km-e0010411.ini (contents, props changed) head/net/xrdp/files/km-e0200411.ini (contents, props changed) head/net/xrdp/files/km-e0210411.ini (contents, props changed) head/net/xrdp/files/patch-instfiles__Makefile.am (contents, props changed) Modified: head/net/xrdp/Makefile head/net/xrdp/pkg-plist Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Thu Nov 14 23:38:59 2013 (r333809) +++ head/net/xrdp/Makefile Fri Nov 15 01:26:42 2013 (r333810) @@ -3,15 +3,12 @@ PORTNAME= xrdp PORTVERSION= 0.6.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= GH DIST_SUBDIR?= ${PORTNAME} -PATCH_SITES= http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \ - http://key2.jp/~meta/patches/xrdp/0.6.0/ - MAINTAINER= meta+ports@vmeta.jp COMMENT= Open source Remote Desktop Protocol (RDP) server @@ -23,22 +20,24 @@ USE_XORG= x11 xfixes USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes USE_RC_SUBR= xrdp +USE_LDCONFIG= ${STAGEDIR}${PREFIX}/lib/xrdp USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= xrdp GH_COMMIT= 5d53758 GH_TAGNAME= ${GH_COMMIT} -CONFIGURE_ARGS= --localstatedir=/var --enable-freerdp1 +CONFIGURE_ARGS= --localstatedir=/var \ + --enable-freerdp1 LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS= xrdp-devel-[0-9]* BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDIR}/net/freerdp -USE_LDCONFIG= ${STAGEDIR}${PREFIX}/lib/xrdp - -OPTIONS_DEFINE= DEBUG JP106 +OPTIONS_DEFINE= DEBUG OPTIONS_DEFAULT= JP106 TIGERVNC +OPTIONS_MULTI= KEYMAP +OPTIONS_MULTI_KEYMAP= JP106 OPTIONS_RADIO= XVNC OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC REALVNC_DESC= Use RealVNC @@ -69,11 +68,8 @@ CFLAGS+= -DXRDP_DEBUG .endif .if ${PORT_OPTIONS:MJP106} -PATCHFILES+= patch-instfiles__Makefile.am \ - patch-instfiles__km-0411.ini \ - patch-instfiles__km-e0010411.ini \ - patch-instfiles__km-e0200411.ini \ - patch-instfiles__km-e0210411.ini +KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ + km-e0200411.ini km-e0210411.ini PLIST_SUB+= JP106="" .else PLIST_SUB+= JP106="@comment " @@ -95,5 +91,8 @@ post-install: ${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \ fi .endfor +.for f in ${KEYMAP_FILES} + ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp +.endfor .include <bsd.port.mk> Added: head/net/xrdp/files/km-0411.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp/files/km-0411.ini Fri Nov 15 01:26:42 2013 (r333810) @@ -0,0 +1,659 @@ +[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 Added: head/net/xrdp/files/km-e0010411.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp/files/km-e0010411.ini Fri Nov 15 01:26:42 2013 (r333810) @@ -0,0 +1,659 @@ +[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 + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Author: swills Date: Fri Nov 15 01:30:05 2013 New Revision: 333811 URL: http://svnweb.freebsd.org/changeset/ports/333811 Log: - Update to 0.7.0b20130912 (includes vulnerabilites fix) - Support stagedir - Normalize COMMENT - Add options to select VNC variants - Change RSA key pair generation behaviour - Do not install Linux specific script - Put additional keymaps in FILESDIR rather than fetching from remote site - Change behaviour of installing additional keymaps - Makefile style sync with net/xrdp PR: ports/183312 Submitted by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer) Added: head/net/xrdp-devel/files/km-0411.ini (contents, props changed) head/net/xrdp-devel/files/km-e0010411.ini (contents, props changed) head/net/xrdp-devel/files/km-e0200411.ini (contents, props changed) head/net/xrdp-devel/files/km-e0210411.ini (contents, props changed) head/net/xrdp-devel/files/patch-instfiles__Makefile.am (contents, props changed) head/net/xrdp-devel/files/patch-sesman__session.c (contents, props changed) Deleted: head/net/xrdp-devel/files/patch-sesman__session_1.patch Modified: head/net/xrdp-devel/Makefile head/net/xrdp-devel/distinfo head/net/xrdp-devel/files/xrdp.in head/net/xrdp-devel/pkg-plist Modified: head/net/xrdp-devel/Makefile ============================================================================== --- head/net/xrdp-devel/Makefile Fri Nov 15 01:26:42 2013 (r333810) +++ head/net/xrdp-devel/Makefile Fri Nov 15 01:30:05 2013 (r333811) @@ -2,66 +2,89 @@ # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.7.0.20120918 +PORTVERSION= 0.7.0.b20130912 +PORTREVISION= 0 +PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/ \ - http://key2.jp/~meta/distfiles/ +MASTER_SITES= GH PKGNAMESUFFIX= -devel DIST_SUBDIR?= ${PORTNAME} -PATCH_SITES= http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \ - http://key2.jp/~meta/patches/xrdp/0.6.0/ - MAINTAINER= meta+ports@vmeta.jp -COMMENT= An open source Remote Desktop Protocol (RDP) server +COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING USES= pkgconfig USE_XORG= x11 xfixes USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes USE_RC_SUBR= xrdp +USE_LDCONFIG= ${STAGEDIR}${PREFIX}/lib/xrdp +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= xrdp +GH_COMMIT= 64e2291 +GH_TAGNAME= ${GH_COMMIT} -CONFIGURE_ARGS= --localstatedir=/var +CONFIGURE_ARGS= --localstatedir=/var \ + --enable-jpeg LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS= xrdp-[0-9]* - -USE_LDCONFIG= ${PREFIX}/lib/xrdp - -OPTIONS_DEFINE= DEBUG GATEWAY JP106 -OPTIONS_DEFAULT= JP106 -GATEWAY_DESC= Install xrdp as RDP gateway (no VNC backend) +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +# xrdp v0.7 is not compatible with current net/freerdp (1.0.2) +#BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDIR}/net/freerdp +#CONFIGURE_ARGS+= --enable-freerdp1 + +OPTIONS_DEFINE= DEBUG SOUND +OPTIONS_DEFAULT= TIGERVNC JP106 +OPTIONS_MULTI= KEYMAP +OPTIONS_MULTI_KEYMAP= JP106 +OPTIONS_RADIO= XVNC +OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC +REALVNC_DESC= Use RealVNC +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 -NO_STAGE= yes .include <bsd.port.options.mk> +# Which Xserver to use +.if ${PORT_OPTIONS:MREALVNC} +RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc +.endif +.if ${PORT_OPTIONS:MTIGERVNC} +RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc +.endif +.if ${PORT_OPTIONS:MTIGHTVNC} +RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc +.endif +.if ${PORT_OPTIONS:MTRIDIAVNC} +RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc +.endif + .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-xrdpdebug CFLAGS+= -DXRDP_DEBUG .endif .if ${PORT_OPTIONS:MJP106} -PATCHFILES+= patch-instfiles__Makefile.am \ - patch-instfiles__km-0411.ini \ - patch-instfiles__km-e0010411.ini \ - patch-instfiles__km-e0200411.ini \ - patch-instfiles__km-e0210411.ini +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:MGATEWAY} -RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc +.if ${PORT_OPTIONS:MSOUND} +BUILD_DEPENDS+= ${LOCALBASE}/include/pulse/simple.h:${PORTSDIR}/audio/pulseaudio \ + ${LOCALBASE}/include/pulse/error.h:${PORTSDIR}/audio/pulseaudio +CONFIGURE_ARGS+= --enable-simplesound .endif -MAN5= sesman.ini.5 xrdp.ini.5 -MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8 - SUB_FILES= pkg-message post-patch: @@ -73,13 +96,13 @@ pre-configure: @cd ${WRKSRC} && ./bootstrap post-install: -.for f in rsakeys.ini sesman.ini startwm.sh xrdp.ini - @if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \ - ${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \ +.for f in sesman.ini startwm.sh xrdp.ini + @if [ ! -f ${STAGEDIR}${PREFIX}/etc/xrdp/$f ]; then \ + ${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \ fi .endfor - @if cmp -s ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini; then \ - ${PREFIX}/bin/xrdp-keygen xrdp ${PREFIX}/etc/xrdp/rsakeys.ini; fi - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} +.for f in ${KEYMAP_FILES} + ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp +.endfor .include <bsd.port.mk> Modified: head/net/xrdp-devel/distinfo ============================================================================== --- head/net/xrdp-devel/distinfo Fri Nov 15 01:26:42 2013 (r333810) +++ head/net/xrdp-devel/distinfo Fri Nov 15 01:30:05 2013 (r333811) @@ -1,12 +1,2 @@ -SHA256 (xrdp/xrdp-0.7.0.20120918.tar.gz) = 97b447a2634dc151b869beca216116c5ec7cb17cc662c0642861c6226c4dcec9 -SIZE (xrdp/xrdp-0.7.0.20120918.tar.gz) = 6618465 -SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07 -SIZE (xrdp/patch-instfiles__Makefile.am) = 710 -SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd -SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576 -SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3 -SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592 -SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8 -SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592 -SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723 -SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592 +SHA256 (xrdp/xrdp-0.7.0.b20130912.tar.gz) = 480d833b04536bde199e9a8250bdf0a7912c5c07b0120a6399ac05364e417278 +SIZE (xrdp/xrdp-0.7.0.b20130912.tar.gz) = 2892900 Added: head/net/xrdp-devel/files/km-0411.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp-devel/files/km-0411.ini Fri Nov 15 01:30:05 2013 (r333811) @@ -0,0 +1,659 @@ +[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 Added: head/net/xrdp-devel/files/km-e0010411.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp-devel/files/km-e0010411.ini Fri Nov 15 01:30:05 2013 (r333811) @@ -0,0 +1,659 @@ +[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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks! BTW, for future reference, it would have been better to split these up into two PRs and attach the patches to the PR. Also, please mail me details on the vulnerability in xrdp-devel so I can write a VuXML entry.