net-misc/freerdp: remove old
authorMike Gilbert <floppym@gentoo.org>
Sat, 9 May 2020 04:15:13 +0000 (00:15 -0400)
committerMike Gilbert <floppym@gentoo.org>
Sat, 9 May 2020 04:15:51 +0000 (00:15 -0400)
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
net-misc/freerdp/Manifest
net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch [deleted file]
net-misc/freerdp/files/2.0.0-rc4-libressl.patch [deleted file]
net-misc/freerdp/freerdp-2.0.0_rc4.ebuild [deleted file]
net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild [deleted file]

index 3fd51796e61b87b00003cd81c0317749b3b60e35..9e59f87b53e805239a10fa5ea9d489268f786309 100644 (file)
@@ -1,5 +1,2 @@
-DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
-DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
 DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
-DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
 DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
deleted file mode 100644 (file)
index cd78ba9..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Wed, 13 Feb 2019 09:30:34 +0100
-Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
-
----
- libfreerdp/codec/bitmap.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
-index 7524bb99ce..479c965e52 100644
---- a/libfreerdp/codec/bitmap.c
-+++ b/libfreerdp/codec/bitmap.c
-@@ -26,12 +26,14 @@
- static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
--      return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
-+      const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
-+      return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
- }
- static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
--      return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
-+      const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
-+      return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
- }
- /*****************************************************************************/
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
deleted file mode 100644 (file)
index fd6e614..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Thu, 22 Nov 2018 09:23:46 +0100
-Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level
-
----
- libfreerdp/crypto/tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 20fde415d8..76f51701fe 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
- #endif
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-       SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
-From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Thu, 22 Nov 2018 19:10:05 +0100
-Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
-
-Need to check specifically for LIBRESSL_VERSION_NUMBER as they
-set the version higher than OpenSSL 1.1 but without API support.
----
- libfreerdp/crypto/tls.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 76f51701fe..ded41f127e 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
-       SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
- #endif
--
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-       SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
-From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Mon, 7 Jan 2019 14:18:14 +0100
-Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
-
----
- libfreerdp/crypto/tls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index b2cf5416c8..56e16bacb4 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
-        * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
-        *        SSL struct is opaqe now
-        */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
-+      (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
-       if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
-       {
-@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
-               if (tls->ssl->s3->wbuf.left == 0)
-                       tls->ssl->method->ssl_dispatch_alert(tls->ssl);
-       }
--
- #endif
-       return TRUE;
- }
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
deleted file mode 100644 (file)
index 862fb22..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-       MY_P=${P/_/-}
-       S="${WORKDIR}/${MY_P}"
-       SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-               https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch"
-       KEYWORDS="~alpha amd64 arm arm64 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_arm_neon cups debug doc ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-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? ( 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-rc4-libressl.patch
-       "${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
-       "${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.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_DSP_FFMPEG=$(usex ffmpeg)
-               -DWITH_GSTREAMER_1_0=$(usex gstreamer)
-               -DWITH_JPEG=$(usex jpeg)
-               -DWITH_NEON=$(usex cpu_flags_arm_neon)
-               -DWITH_OPENH264=$(usex openh264)
-               -DWITH_PULSE=$(usex pulseaudio)
-               -DWITH_SERVER=$(usex server)
-               -DWITH_PCSC=$(usex smartcard)
-               -DWITH_LIBSYSTEMD=$(usex systemd)
-               -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_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
deleted file mode 100644 (file)
index 81fe15d..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} != 9999 ]]; then
-       COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
-       SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-       S="${WORKDIR}/FreeRDP-${COMMIT}"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-       inherit git-r3
-       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_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-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? ( media-video/ffmpeg:0= )
-       !ffmpeg? (
-               x11-libs/cairo: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}"
-BDEPEND="
-       virtual/pkgconfig
-       client? ( X? ( doc? (
-               app-text/docbook-xml-dtd:4.1.2
-               app-text/xmlto
-       ) ) )
-"
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_TESTING=$(usex test ON OFF)
-               -DCHANNEL_URBDRC=$(usex usb ON OFF)
-               -DWITH_ALSA=$(usex alsa ON OFF)
-               -DWITH_CCACHE=OFF
-               -DWITH_CLIENT=$(usex client ON OFF)
-               -DWITH_CUPS=$(usex cups ON OFF)
-               -DWITH_DEBUG_ALL=$(usex debug ON OFF)
-               -DWITH_MANPAGES=$(usex doc ON OFF)
-               -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-               -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-               -DWITH_CAIRO=$(usex ffmpeg OFF ON)
-               -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-               -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-               -DWITH_JPEG=$(usex jpeg ON OFF)
-               -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-               -DWITH_OPENH264=$(usex openh264 ON OFF)
-               -DWITH_PULSE=$(usex pulseaudio ON OFF)
-               -DWITH_SERVER=$(usex server ON OFF)
-               -DWITH_PCSC=$(usex smartcard ON OFF)
-               -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-               -DWITH_X11=$(usex X ON OFF)
-               -DWITH_XINERAMA=$(usex xinerama ON OFF)
-               -DWITH_XV=$(usex xv ON OFF)
-               -DWITH_WAYLAND=$(usex wayland ON OFF)
-       )
-       cmake_src_configure
-}