From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Mar 2018 04:54:42 +0000 Subject: gentoo resync : 18.03.2018 --- net-misc/freerdp/Manifest | 3 +- .../files/2.0.0-rc1-CredSSP-protocol-version.patch | 49 ++++++++ net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild | 123 +++++++++++++++++++++ net-misc/freerdp/freerdp-2.0.0_rc1.ebuild | 122 -------------------- 4 files changed, 174 insertions(+), 123 deletions(-) create mode 100644 net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch create mode 100644 net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild delete mode 100644 net-misc/freerdp/freerdp-2.0.0_rc1.ebuild (limited to 'net-misc/freerdp') diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index a150b0108428..f5c3981ba4f9 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,5 +1,6 @@ AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb27886d248e761b9bb0a2f25ba4b2c266e3cf9fd5a91429e3ea38cf78dec94c4a8b4fc6e2e2e23e8eeea3c718206 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b +AUX 2.0.0-rc1-CredSSP-protocol-version.patch 1474 BLAKE2B de37ed627f146807b6aa1a61c766d2909fe056ce0da5e5012d1a6503c6c92a5fc5ba03f82edaa4259d16e55bf8556eb7b9758663b672c5eae17b82034a441693 SHA512 c25f07d162817de0666bf9cfa296580c74b19b3326e1a009123dcf133fb67a876d3bcc99c23b09e96e3072f2811bec236f619b9eec0189b31dcb1e51c8ea1102 AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0 AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77 AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48 @@ -9,6 +10,6 @@ DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2 -EBUILD freerdp-2.0.0_rc1.ebuild 2840 BLAKE2B 8d24bc59910e217d7e7629931dfc8f96cdacac922fbb37948dd0174906e7d090135f7774db668764c676fc5492ae88632bc2ebdccac8ded24126c9d93359b541 SHA512 f89c3b2b7715c895b461de05980af62e7ffdb42b7760d74945b34c425cc00585eb41adfb2b05360f4726c37c0515f6bedef727b229170714b80ca8308a6d4ae4 +EBUILD freerdp-2.0.0_rc1-r1.ebuild 2896 BLAKE2B 9e23ff99f648b5af06ac5851315d044d2b2196b024452c8188881caa5cf6b35aedf097f155e12b88a28b93de704db6b3052fbfb65fc6e3d2944b47b323d1d847 SHA512 80907e233d8886bf3bada13a450d73d29960dc2af534cc34f09ebb1c5e38765f94f8f4d83d3c20757fc59556641c8e4bae15d646dea7f4b93edb9611c934d7ca EBUILD freerdp-9999.ebuild 2673 BLAKE2B 45d40ab23761f6a45ec71031c748984830d37e799eee88c0eb2a90a7924f2d9f6b5f658d7965e55f94e53438a0555a0f8129f72d81480687987e630de8ec03b5 SHA512 adb751e529563f540bd97d03a2c32a6b99d4f1a7ca6e2c8facd6e5b2333651291d3b18f234c21f36d349c14516e26feb38fee394aa21fb282e2c9d23f686541b MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0 diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch new file mode 100644 index 000000000000..59887f698ec9 --- /dev/null +++ b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch @@ -0,0 +1,49 @@ +From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001 +From: Bernhard Miklautz +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 +--- + libfreerdp/core/nla.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c +index 47e087062..8a69f2f6e 100644 +--- a/libfreerdp/core/nla.c ++++ b/libfreerdp/core/nla.c +@@ -1663,15 +1663,19 @@ 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 + diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild new file mode 100644 index 000000000000..6a24709e340a --- /dev/null +++ b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils + +if [[ ${PV} != 9999 ]]; then + MY_PV="${PV/_/-}" + MY_P="FreeRDP-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +else + inherit git-r3 + SRC_URI="" + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="http://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="0/2" +IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + client? ( + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + x11-libs/libXrandr + ) + jpeg? ( virtual/jpeg:0 ) + openh264? ( media-libs/openh264 ) + pulseaudio? ( media-sound/pulseaudio ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + client? ( X? ( doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) ) ) +" + +PATCHES=( + "${FILESDIR}/2.0.0-rc1-libressl.patch" + "${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DCHANNEL_URBDRC=$(usex usb) + -DWITH_ALSA=$(usex alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(usex client) + -DWITH_CUPS=$(usex cups) + -DWITH_DEBUG_ALL=$(usex debug) + -DWITH_MANPAGES=$(usex doc) + -DWITH_FFMPEG=$(usex ffmpeg) + -DWITH_GSTREAMER_1_0=$(usex gstreamer) + -DWITH_JPEG=$(usex jpeg) + -DWITH_NEON=$(usex neon) + -DWITH_OPENH264=$(usex openh264) + -DWITH_PULSE=$(usex pulseaudio) + -DWITH_SERVER=$(usex server) + -DWITH_PCSC=$(usex smartcard) + -DWITH_LIBSYSTEMD=$(usex systemd) + # WITH_SSE2 actually enables code requiring SSSE3 + -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) + -DWITH_X11=$(usex X) + -DWITH_XINERAMA=$(usex xinerama) + -DWITH_XV=$(usex xv) + -DWITH_WAYLAND=$(usex wayland) + ) + cmake-utils_src_configure +} diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild deleted file mode 100644 index c8a6ae3b610d..000000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ ${PV} != 9999 ]]; then - MY_PV="${PV/_/-}" - MY_P="FreeRDP-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" -else - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - client? ( - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264 ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - client? ( X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) ) -" - -PATCHES=( - "${FILESDIR}/2.0.0-rc1-libressl.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DCHANNEL_URBDRC=$(usex usb) - -DWITH_ALSA=$(usex alsa) - -DWITH_CCACHE=OFF - -DWITH_CLIENT=$(usex client) - -DWITH_CUPS=$(usex cups) - -DWITH_DEBUG_ALL=$(usex debug) - -DWITH_MANPAGES=$(usex doc) - -DWITH_FFMPEG=$(usex ffmpeg) - -DWITH_GSTREAMER_1_0=$(usex gstreamer) - -DWITH_JPEG=$(usex jpeg) - -DWITH_NEON=$(usex neon) - -DWITH_OPENH264=$(usex openh264) - -DWITH_PULSE=$(usex pulseaudio) - -DWITH_SERVER=$(usex server) - -DWITH_PCSC=$(usex smartcard) - -DWITH_LIBSYSTEMD=$(usex systemd) - # WITH_SSE2 actually enables code requiring SSSE3 - -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) - -DWITH_X11=$(usex X) - -DWITH_XINERAMA=$(usex xinerama) - -DWITH_XV=$(usex xv) - -DWITH_WAYLAND=$(usex wayland) - ) - cmake-utils_src_configure -} -- cgit v1.2.3