Date: Friday, May 17, 2019 @ 15:38:32 Author: spupykin Revision: 467718
archrelease: copy trunk to community-x86_64 Added: freerdp/repos/community-x86_64/PKGBUILD (from rev 467717, freerdp/trunk/PKGBUILD) freerdp/repos/community-x86_64/fix_nla-8cd156a-backport.patch (from rev 467717, freerdp/trunk/fix_nla-8cd156a-backport.patch) Deleted: freerdp/repos/community-x86_64/PKGBUILD freerdp/repos/community-x86_64/fix_nla-8cd156a-backport.patch --------------------------------+ PKGBUILD | 107 +++++++++++++++++++-------------------- fix_nla-8cd156a-backport.patch | 96 +++++++++++++++++----------------- 2 files changed, 102 insertions(+), 101 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-05-17 15:38:19 UTC (rev 467717) +++ PKGBUILD 2019-05-17 15:38:32 UTC (rev 467718) @@ -1,53 +0,0 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=freerdp -epoch=1 -pkgver=2.0.0_rc4 -#_commit=6001cb710dc67eb8811362b7bf383754257a902b -_pkgver=${pkgver/_/-} -_pkgver=${_pkgver/+/-} -pkgrel=3 -pkgdesc="Free RDP client" -arch=('x86_64') -url="http://freerdp.sourceforge.net" -license=('GPL') -depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage' - 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse' 'libxkbfile' - 'libxrender' 'libxfixes' 'gst-plugins-base-libs' 'dbus-glib' - 'libxkbcommon') -makedepends=('krb5' 'cmake' 'damageproto' 'fixesproto' 'renderproto' - 'xmlto' 'docbook-xsl' 'git') -provides=('libwinpr-tools2.so' 'libfreerdp-client2.so' 'libfreerdp2.so' - 'libwinpr2.so') -#source=("FreeRDP-${_pkgver}::git://github.com/FreeRDP/FreeRDP.git#commit=${_commit}") -source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/${pkgver/_/-}.tar.gz - fix_nla-8cd156a-backport.patch) -sha256sums=('3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49' - '2d449e0c1adee1ef131501e1613fc4c59fd122ca866d09f52eeff61236de81e4') - -prepare() { - cd "$srcdir"/FreeRDP-${_pkgver} -# patch -Np1 -i "${srcdir}/fix_nla-8cd156a-backport.patch" -} - -build() { - cd "$srcdir"/FreeRDP-${_pkgver} - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DWITH_PULSE=ON \ - -DWITH_CUPS=ON \ - -DWITH_CHANNELS=ON \ - -DWITH_CLIENT_CHANNELS=ON \ - -DWITH_SERVER_CHANNELS=ON \ - -DWITH_WAYLAND=ON \ - -DCHANNEL_URBDRC_CLIENT=ON \ - . - make -} - -package() { - cd "$srcdir"/FreeRDP-${_pkgver} - make DESTDIR="${pkgdir}" install -} Copied: freerdp/repos/community-x86_64/PKGBUILD (from rev 467717, freerdp/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-05-17 15:38:32 UTC (rev 467718) @@ -0,0 +1,54 @@ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> + +pkgname=freerdp +epoch=1 +pkgver=2.0.0_rc4 +#_commit=6001cb710dc67eb8811362b7bf383754257a902b +_pkgver=${pkgver/_/-} +_pkgver=${_pkgver/+/-} +pkgrel=4 +pkgdesc="Free RDP client" +arch=('x86_64') +url="http://freerdp.sourceforge.net" +license=('GPL') +depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage' + 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse' 'libxkbfile' + 'libxrender' 'libxfixes' 'gst-plugins-base-libs' 'dbus-glib' + 'libxkbcommon') +makedepends=('krb5' 'cmake' 'damageproto' 'fixesproto' 'renderproto' + 'xmlto' 'docbook-xsl' 'git') +provides=('libwinpr-tools2.so' 'libfreerdp-client2.so' 'libfreerdp2.so' + 'libwinpr2.so') +#source=("FreeRDP-${_pkgver}::git://github.com/FreeRDP/FreeRDP.git#commit=${_commit}") +source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/${pkgver/_/-}.tar.gz + fix_nla-8cd156a-backport.patch) +sha256sums=('3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49' + '2d449e0c1adee1ef131501e1613fc4c59fd122ca866d09f52eeff61236de81e4') + +prepare() { + cd "$srcdir"/FreeRDP-${_pkgver} +# patch -Np1 -i "${srcdir}/fix_nla-8cd156a-backport.patch" +} + +build() { + cd "$srcdir"/FreeRDP-${_pkgver} + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DWITH_PULSE=ON \ + -DWITH_CUPS=ON \ + -DWITH_CHANNELS=ON \ + -DWITH_CLIENT_CHANNELS=ON \ + -DWITH_SERVER_CHANNELS=ON \ + -DWITH_WAYLAND=ON \ + -DCHANNEL_URBDRC_CLIENT=ON \ + -DWITH_SERVER=ON \ + . + make +} + +package() { + cd "$srcdir"/FreeRDP-${_pkgver} + make DESTDIR="${pkgdir}" install +} Deleted: fix_nla-8cd156a-backport.patch =================================================================== --- fix_nla-8cd156a-backport.patch 2019-05-17 15:38:19 UTC (rev 467717) +++ fix_nla-8cd156a-backport.patch 2019-05-17 15:38:32 UTC (rev 467718) @@ -1,48 +0,0 @@ -From: Bernhard Miklautz <bernhard.mikla...@thincast.com> -Date: Wed, 14 Mar 2018 13:39:23 +0100 -Subject: [PATCH] fix nla: don't use server version - -FreeRDP currently only supports CredSSP protocol version 3. However the -current implementation always sent back the version received by the -server indicating that this version was supported. -With recent windows updates applied the protocol changed and this approach -doesn't work anymore (see -https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes). - -With this fix FreeRDP always sends version 3 as supported version. - -Credit goes to @mfleisz. - -Fixes #4449 - -(patch above adjusted to apply on top of FreeRDP-2.0.0-rc1) ---- - libfreerdp/core/nla.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libfreerdp/core/nla.c b/trunk/src/FreeRDP-2.0.0-rc1/libfreerdp/core/nla.c -index 47e0870..4bfcf7e 100644 ---- a/libfreerdp/core/nla.c -+++ b/libfreerdp/core/nla.c -@@ -1663,14 +1663,17 @@ BOOL nla_send(rdpNla* nla) - static int nla_decode_ts_request(rdpNla* nla, wStream* s) - { - int length; -+ UINT32 version = 0; - - /* TSRequest */ - if (!ber_read_sequence_tag(s, &length) || - !ber_read_contextual_tag(s, 0, &length, TRUE) || -- !ber_read_integer(s, &nla->version)) -+ !ber_read_integer(s, &version)) - { - return -1; - } -+ if (version < nla->version) -+ nla->version = version; - - /* [1] negoTokens (NegoData) */ - if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE) --- -2.16.2 - Copied: freerdp/repos/community-x86_64/fix_nla-8cd156a-backport.patch (from rev 467717, freerdp/trunk/fix_nla-8cd156a-backport.patch) =================================================================== --- fix_nla-8cd156a-backport.patch (rev 0) +++ fix_nla-8cd156a-backport.patch 2019-05-17 15:38:32 UTC (rev 467718) @@ -0,0 +1,48 @@ +From: Bernhard Miklautz <bernhard.mikla...@thincast.com> +Date: Wed, 14 Mar 2018 13:39:23 +0100 +Subject: [PATCH] fix nla: don't use server version + +FreeRDP currently only supports CredSSP protocol version 3. However the +current implementation always sent back the version received by the +server indicating that this version was supported. +With recent windows updates applied the protocol changed and this approach +doesn't work anymore (see +https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes). + +With this fix FreeRDP always sends version 3 as supported version. + +Credit goes to @mfleisz. + +Fixes #4449 + +(patch above adjusted to apply on top of FreeRDP-2.0.0-rc1) +--- + libfreerdp/core/nla.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libfreerdp/core/nla.c b/trunk/src/FreeRDP-2.0.0-rc1/libfreerdp/core/nla.c +index 47e0870..4bfcf7e 100644 +--- a/libfreerdp/core/nla.c ++++ b/libfreerdp/core/nla.c +@@ -1663,14 +1663,17 @@ BOOL nla_send(rdpNla* nla) + static int nla_decode_ts_request(rdpNla* nla, wStream* s) + { + int length; ++ UINT32 version = 0; + + /* TSRequest */ + if (!ber_read_sequence_tag(s, &length) || + !ber_read_contextual_tag(s, 0, &length, TRUE) || +- !ber_read_integer(s, &nla->version)) ++ !ber_read_integer(s, &version)) + { + return -1; + } ++ if (version < nla->version) ++ nla->version = version; + + /* [1] negoTokens (NegoData) */ + if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE) +-- +2.16.2 +