gentoo resync : 25.10.2021

4 files changed, 31 insertions, 124 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c8bc5f3ecdd7..55908fb5f3eb 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,11 +1,10 @@
 AUX freerdp-2-openssl-3.0.patch 2257 BLAKE2B f1df2fec92572b6afd3bdddbf5b55586d313bb521c84ce49878db969b0dd631b842a292cd17c6d3ace11846d558d3921460a95cef392221d4620a99ef4b6eac9 SHA512 c48514bc83266bfe35e50a83624694f637668cb8b90a650931626c72f100182318036a09ddcfc48f89e7b71f9520afe5212b684926585424e02bd1e830ca2402
 AUX freerdp-2.4.0-TestUnicodeConversion-big-endian.patch 1275 BLAKE2B 1a9352b0288f1d833ba3ded840ec12033aba3bc285e7a82141d7bd6a737f53e821390fc1261abc7e8bd52d95bdca1b4ac3958caf5f34a9b425a165be7ff8929a SHA512 d251f377d37764295276e337c7638a6cacd5cd127b96040f50b71e028c67b394461ef84e1ec51e461b6d3c52616c508d941c2a83ddd65e00a3184054d257f840
-DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
+AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b168fc9e03c4e41b9437388e0e09c2dbfa90e955c254fef2d8c6cae7e796b09cc1875953688c58c13462bc7b05d2a85b11 SHA512 5877a95569d0f3e099d1de35bb8ee5fc8c6889f76aa3f410bd095932440ab6c50c0fc88322ff8982a0ee34a93da97becfa07b52a76804fc262b9a06d9e789f20
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
-DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
-EBUILD freerdp-2.2.0.ebuild 2805 BLAKE2B f351598a209d0c2fb18c711e9f76e9d26325d31605cb6ceb1f06d0508030cd6c127384794b03e5156fb866841a8e27915be0e5edc0e84d66c77b671f4c0639c1 SHA512 452305faf9d31e27b6571f1ada542bfac588b6491e6d451a35b132b816e74e25d8cc88b1abfeeb485989fd96eed79e030f68686b6502295b3895453c1b96dab4
+DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
 EBUILD freerdp-2.3.2.ebuild 2929 BLAKE2B 47576d816fcb596e2e02d8b38cb3075a494975f59c076a5f7ae313c5f780d73e2f5d6e1374e6b11186e25c68ac5a84c2412404c39b1ed8af3c64517c468dd88d SHA512 fc46e1cb5462847fcc0c469c18a4c58983854af89f553ad8bc7ad798250c0dd5e1a1afca1d53b8f41f211500db578d71382ea6b1fa1ef19774fd1f751ace2d87
-EBUILD freerdp-2.4.0.ebuild 2942 BLAKE2B f104f1f79be3918c80eee1bd30bc497bdb61d2a4f7b359feeaf17cd8827fb59f4f1bc605223192bc7e3b3f0bc8f0253b61461306c7b08974849e395c6d08ec04 SHA512 c561e82e204e4251ba8b0af4a9c885bf8b3a2842079bff299292582b35f2d66b8dd41f4f4fa447fa76d4b47da928e7af84c5a37697bbd7c83161c46183a4064f
+EBUILD freerdp-2.4.1-r1.ebuild 2877 BLAKE2B 6715b2b48d87ca94c6501b20317f2c0be9b3fdeb6bcf5f0915b7c953a346332bc63733f7b4809cb4483eb1b6e90f24a1a08030fa81b5aa191c7d7c924d1a675c SHA512 2233ad029c8b5d4b93e92c1d64477cca8d78082e66ee7adab68189f492c51bd69154209afa03cb46aa11e906a464b19922e5f382670eaa7cca3a90ef5c68cd50
 EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
new file mode 100644
index 000000000000..d6e73631c6e2
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
@@ -0,0 +1,27 @@
+From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 24 Oct 2021 10:04:38 -0400
+Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array
+
+This was fixed on master as part of
+268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems
+like too much for the stable branch.
+---
+ channels/rdpei/client/rdpei_main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c
+index f20d58a13..1d95054a0 100644
+--- a/channels/rdpei/client/rdpei_main.c
++++ b/channels/rdpei/client/rdpei_main.c
+@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+ 	return CHANNEL_RC_OK;
+ error_out:
+ 	free(context);
+-	free(rdpei->contactPoints);
+ 	free(rdpei);
+ 	return error;
+ }
+-- 
+2.33.1
+
diff --git a/net-misc/freerdp/freerdp-2.2.0.ebuild b/net-misc/freerdp/freerdp-2.2.0.ebuild
deleted file mode 100644
index d02a1f971769..000000000000
--- a/net-misc/freerdp/freerdp-2.2.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	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:0= )
-	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
-	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_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
-}
diff --git a/net-misc/freerdp/freerdp-2.4.0.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
index 963570637e5a..79d2f82e8349 100644
--- a/net-misc/freerdp/freerdp-2.4.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
@@ -89,8 +89,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
-	"${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch"
+	"${FILESDIR}/freerdp-2.4.1-rdpei-free.patch"
 )
 
 src_configure() {