[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2023-12-07 Thread Mike Gilbert 
commit: 60975f5f4bdc9f9c5002ac8cfaf32e0a2095b770
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec  7 20:58:51 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec  7 21:00:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60975f5f

net-misc/freerdp: fix for big-endian archs

Bug: https://bugs.gentoo.org/918531
Signed-off-by: Mike Gilbert  gentoo.org>

 ...ec-encode-messages-considering-endianness.patch | 329 +
 net-misc/freerdp/freerdp-2.11.1.ebuild |   1 +
 net-misc/freerdp/freerdp-2.11.2.ebuild |   1 +
 3 files changed, 331 insertions(+)

diff --git 
a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch
 
b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch
new file mode 100644
index ..8d45331bd95b
--- /dev/null
+++ 
b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch
@@ -0,0 +1,329 @@
+https://github.com/FreeRDP/FreeRDP/issues/9616
+
+From 8b349f4f2b5d14e28a6a73e9c2b9860d7f275bc4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Thu, 7 Dec 2023 15:54:38 -0500
+Subject: [PATCH] Revert "[codec] encode messages considering endianness"
+
+This reverts commit e3ef8a02ddf079bcf6dfa5db69a709ce50c9.
+---
+ libfreerdp/codec/nsc_encode.c | 76 +--
+ libfreerdp/codec/rfx_encode.c | 74 +-
+ 2 files changed, 58 insertions(+), 92 deletions(-)
+
+diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c
+index 477318cc1..fd9626a6d 100644
+--- a/libfreerdp/codec/nsc_encode.c
 b/libfreerdp/codec/nsc_encode.c
+@@ -119,8 +119,6 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* 
context, const BYTE* data, UI
+   UINT16 rw;
+   BYTE ccl;
+   const BYTE* src;
+-  const UINT32* src_32;
+-  const UINT16* src_16;
+   BYTE* yplane = NULL;
+   BYTE* coplane = NULL;
+   BYTE* cgplane = NULL;
+@@ -142,85 +140,69 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* 
context, const BYTE* data, UI
+   coplane = context->priv->PlaneBuffers[1] + y * rw;
+   cgplane = context->priv->PlaneBuffers[2] + y * rw;
+   aplane = context->priv->PlaneBuffers[3] + y * context->width;
+-  src_32 = (UINT32*)src;
+-  src_16 = (UINT16*)src;
+ 
+   for (x = 0; x < context->width; x++)
+   {
+   switch (context->format)
+   {
+   case PIXEL_FORMAT_BGRX32:
+-  b_val = (INT16)(*src_32 & 0xFF);
+-  g_val = (INT16)((*src_32 >> 8) & 0xFF);
+-  r_val = (INT16)((*src_32 >> 16) & 0xFF);
++  b_val = *src++;
++  g_val = *src++;
++  r_val = *src++;
++  src++;
+   a_val = 0xFF;
+-  src_32++;
+   break;
+ 
+   case PIXEL_FORMAT_BGRA32:
+-  b_val = (INT16)(*src_32 & 0xFF);
+-  g_val = (INT16)((*src_32 >> 8) & 0xFF);
+-  r_val = (INT16)((*src_32 >> 16) & 0xFF);
+-  a_val = (INT16)((*src_32 >> 24) & 0xFF);
+-  src_32++;
++  b_val = *src++;
++  g_val = *src++;
++  r_val = *src++;
++  a_val = *src++;
+   break;
+ 
+   case PIXEL_FORMAT_RGBX32:
+-  r_val = (INT16)(*src_32 & 0xFF);
+-  g_val = (INT16)((*src_32 >> 8) & 0xFF);
+-  b_val = (INT16)((*src_32 >> 16) & 0xFF);
++  r_val = *src++;
++  g_val = *src++;
++  b_val = *src++;
++  src++;
+   a_val = 0xFF;
+-  src_32++;
+   break;
+ 
+   case PIXEL_FORMAT_RGBA32:
+-  r_val = (INT16)(*src_32 & 0xFF);
+-  g_val = (INT16)((*src_32 >> 8) & 0xFF);
+-  b_val = (INT16)((*src_32 >> 16) & 0xFF);
+-  a_val = (INT16)((*src_32 >> 24) &

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2023-06-07 Thread Sam James 
commit: da38705a58769604bc1561a23fc7bcd4f60d0056
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  7 10:33:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  7 10:33:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da38705a

net-misc/freerdp: fix build w/ ffmpeg 6

Closes: https://bugs.gentoo.org/901003
Signed-off-by: Sam James  gentoo.org>

 .../freerdp/files/freerdp-2.10.0-ffmpeg-6.patch|  37 ++
 net-misc/freerdp/freerdp-2.10.0-r3.ebuild  | 137 +
 2 files changed, 174 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch 
b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
new file mode 100644
index ..586ae641b58e
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/901003
+https://github.com/FreeRDP/FreeRDP/issues/8686
+https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227
+
+From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001
+From: akallabeth 
+Date: Tue, 14 Feb 2023 07:48:54 +0100
+Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
+
+--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
 b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* 
decoder, const TS_AM_MEDIA_TYP
+   }
+   }
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
+   if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+   mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
++#endif
+ 
+   return TRUE;
+ }
+--- a/libfreerdp/codec/h264_ffmpeg.c
 b/libfreerdp/codec/h264_ffmpeg.c
+@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
+   goto EXCEPTION;
+   }
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
+   if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
+   {
+   sys->codecDecoderContext->flags |= 
AV_CODEC_FLAG_TRUNCATED;
+   }
++#endif
+ 
+ #ifdef WITH_VAAPI
+ 

diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild 
b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
new file mode 100644
index ..7e92eb90ea30
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == * ]]; 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 ~loong ~ppc ~ppc64 ~riscv ~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 kerberos 
openh264 pulseaudio server smartcard systemd test usb valgrind 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? ( media-libs/libjpeg-turbo:0= )
+   kerberos? ( virtual/krb5 )
+   openh264? ( media-libs/openh264:0= )
+   pulseaudio? ( media-libs/libpulse )
+   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}
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2022-05-02 Thread Mike Gilbert 
commit: 12b6d4df9ddb1e3673afe03bdac7ca8586429f8a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon May  2 21:24:37 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon May  2 21:25:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b6d4df

net-misc/freerdp: drop 2.4.1-r1, 2.5.0, 2.5.0_p39

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |   3 -
 .../freerdp/files/freerdp-2.4.1-rdpei-free.patch   |  27 -
 net-misc/freerdp/freerdp-2.4.1-r1.ebuild   | 122 
 net-misc/freerdp/freerdp-2.5.0.ebuild  | 118 
 net-misc/freerdp/freerdp-2.5.0_p39.ebuild  | 124 -
 5 files changed, 394 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 0717b684ad13..83df7c62cd22 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,2 @@
-DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B 
cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398
 SHA512 
9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
-DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 
93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034
 SHA512 
d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d
-DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B 
ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274
 SHA512 
e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db
 DIST freerdp-2.6.1.tar.gz 7270692 BLAKE2B 
c4da1868be5f1fc40fb14ba54b33c7c79c66cf44b464e4f2e62cfd9cad2da3a6980dc5d33fdd93a11bf8138a75e4427c46977a7110f4cb8669827c0940e3b196
 SHA512 
4de8718924b63b32fb5068c6538ba31f966e3cc14d17ae42dc90a01787dfff388c486263dcc085777baf4ce25b89f12191e1a5d6afb42f17cbcb38282f4868b7
 DIST freerdp-2.7.0.tar.gz 7274512 BLAKE2B 
82dc1403c8c2cada81585e869315ee2601d1fe87c3cb293f3cfe90278110644a5dab42ec0b516a204a651dc3127e458cd47994269644c41183501b848e399348
 SHA512 
9e9df14a39412f3ee3cd8a97123377d3da39492f66a0caee37d122f487639483d172cb89824523d57516aa83d22b9da569f2169a0598b475fbe70eab65fa2dc4

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
deleted file mode 100644
index d6e73631c6e2..
--- a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-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.4.1-r1.ebuild 
b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
deleted file mode 100644
index 6494b88b6bfb..
--- a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == * ]]; 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 ~riscv 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=
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2021-10-24 Thread Mike Gilbert 
commit: 99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 24 14:29:17 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 24 14:29:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bd93a4

net-misc/freerdp: fix erroneous free() call

Signed-off-by: Mike Gilbert  gentoo.org>

 .../freerdp/files/freerdp-2.4.1-rdpei-free.patch   | 27 ++
 ...reerdp-2.4.1.ebuild => freerdp-2.4.1-r1.ebuild} |  4 
 2 files changed, 31 insertions(+)

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 000..d6e73631c6e
--- /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 
+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.4.1.ebuild 
b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
similarity index 97%
rename from net-misc/freerdp/freerdp-2.4.1.ebuild
rename to net-misc/freerdp/freerdp-2.4.1-r1.ebuild
index 30cd72a4a8d..79d2f82e834 100644
--- a/net-misc/freerdp/freerdp-2.4.1.ebuild
+++ b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
@@ -88,6 +88,10 @@ BDEPEND="
) )
 "
 
+PATCHES=(
+   "${FILESDIR}/freerdp-2.4.1-rdpei-free.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2021-10-23 Thread Mike Gilbert 
commit: ff750a92de5a11f3e16e9e324465e407be7455d5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct 23 16:08:34 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 23 16:09:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff750a92

net-misc/freerdp: add 2.4.1, drop 2.4.0

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |  2 +-
 net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 --
 ...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 --
 .../{freerdp-2.4.0.ebuild => freerdp-2.4.1.ebuild} |  5 --
 4 files changed, 1 insertion(+), 95 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index aa3ce09c0f5..5509edcadb4 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,3 +1,3 @@
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 
0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12
 SHA512 
8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B 
f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9
 SHA512 
b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
-DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B 
a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d
 SHA512 
5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
+DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B 
cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398
 SHA512 
9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a

diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch 
b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
deleted file mode 100644
index e4662751e5c..000
--- a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001
-From: Ondrej Holy 
-Date: Wed, 12 May 2021 12:48:15 +0200
-Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0
-
-FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode`
-and `FIPS_mode_set` functions, which were removed there. Just a note that
-the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned
-functions are still there (see 
https://wiki.openssl.org/index.php/FIPS_modules).
-Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support.
-
-See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937

- winpr/libwinpr/utils/ssl.c | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 3a859039034..03b23af43ac 100644
 a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags)
- #else
-   WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
- 
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+  if (!EVP_default_properties_is_fips_enabled(NULL))
-+#else
-   if (FIPS_mode() != 1)
-+#endif
-   {
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+  if (EVP_set_default_properties(NULL, "fips=yes"))
-+#else
-   if (FIPS_mode_set(1))
-+#endif
-   WLog_INFO(TAG, "Openssl fips mode ENabled!");
-   else
-   {
-From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Sun, 1 Aug 2021 12:14:43 -0400
-Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0
-
-Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad

- winpr/libwinpr/utils/ssl.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 03b23af43ac..74ef156e7b0 100644
 a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void)
- {
- #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
-   return FALSE;
-+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+  return (EVP_default_properties_is_fips_enabled(NULL) == 1);
- #else
-   return (FIPS_mode() == 1);
- #endif

diff --git 
a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2021-08-11 Thread Mike Gilbert 
commit: 273f561c07735891c90aca6b371ba9ac96ed3d0a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Aug 11 15:03:22 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Aug 11 15:04:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273f561c

net-misc/freerdp: fix TestUnicodeConversion on big endian machines

Closes: https://bugs.gentoo.org/806995
Signed-off-by: Mike Gilbert  gentoo.org>

 ...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ++
 net-misc/freerdp/freerdp-2.3.2.ebuild  |  1 +
 net-misc/freerdp/freerdp-2.4.0.ebuild  |  1 +
 3 files changed, 30 insertions(+)

diff --git 
a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch 
b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch
new file mode 100644
index 000..b8977aecd56
--- /dev/null
+++ 
b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch
@@ -0,0 +1,28 @@
+From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sat, 7 Aug 2021 21:49:12 -0400
+Subject: [PATCH] Fix TestUnicodeConversion on big endian machines
+
+Wide character literals are stored in native byte order.
+Use an array of bytes as a reference instead.
+
+Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968
+---
+ winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c 
b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+index 3bc9c245181..cc2a2597dd8 100644
+--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c
 b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void)
+   /* Test static string buffers of differing sizes */
+   {
+   char name[] = "someteststring";
+-  const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', 
L't',
+-L's', L't', L'r', L'i', L'n', L'g', 0 
};
++  const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 
'e', 0, 's', 0, 't', 0,
++   's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 
'g', 0, 0, 0 };
+   WCHAR xname[128] = { 0 };
+   LPWSTR aname = NULL;
+   LPWSTR wname = [0];

diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild 
b/net-misc/freerdp/freerdp-2.3.2.ebuild
index 2aa7099751a..ca45e00a93e 100644
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.3.2.ebuild
@@ -90,6 +90,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/freerdp-2-openssl-3.0.patch"
+   "${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch"
 )
 
 src_configure() {

diff --git a/net-misc/freerdp/freerdp-2.4.0.ebuild 
b/net-misc/freerdp/freerdp-2.4.0.ebuild
index c08a85f6d05..9a213eb7db2 100644
--- a/net-misc/freerdp/freerdp-2.4.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.4.0.ebuild
@@ -90,6 +90,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/freerdp-2-openssl-3.0.patch"
+   "${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2021-07-31 Thread Mike Gilbert 
commit: 9ef604de7f80a1db7a66d4574623bc3127862125
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jul 31 19:55:43 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul 31 19:55:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef604de

net-misc/freerdp: fix build with openssl-3.0

Closes: https://bugs.gentoo.org/805548
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 38 ++
 net-misc/freerdp/freerdp-2.3.2.ebuild  |  4 +++
 net-misc/freerdp/freerdp-2..ebuild |  4 +++
 3 files changed, 46 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch 
b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
new file mode 100644
index 000..74b9d406130
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
@@ -0,0 +1,38 @@
+From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001
+From: Ondrej Holy 
+Date: Wed, 12 May 2021 12:48:15 +0200
+Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0
+
+FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode`
+and `FIPS_mode_set` functions, which were removed there. Just a note that
+the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned
+functions are still there (see 
https://wiki.openssl.org/index.php/FIPS_modules).
+Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support.
+
+See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937
+---
+ winpr/libwinpr/utils/ssl.c | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index 3a859039034..03b23af43ac 100644
+--- a/winpr/libwinpr/utils/ssl.c
 b/winpr/libwinpr/utils/ssl.c
+@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags)
+ #else
+   WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
+ 
++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
++  if (!EVP_default_properties_is_fips_enabled(NULL))
++#else
+   if (FIPS_mode() != 1)
++#endif
+   {
++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
++  if (EVP_set_default_properties(NULL, "fips=yes"))
++#else
+   if (FIPS_mode_set(1))
++#endif
+   WLog_INFO(TAG, "Openssl fips mode ENabled!");
+   else
+   {

diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild 
b/net-misc/freerdp/freerdp-2.3.2.ebuild
index 50350a7d1f9..c08a85f6d05 100644
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.3.2.ebuild
@@ -88,6 +88,10 @@ BDEPEND="
) )
 "
 
+PATCHES=(
+   "${FILESDIR}/freerdp-2-openssl-3.0.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)

diff --git a/net-misc/freerdp/freerdp-2..ebuild 
b/net-misc/freerdp/freerdp-2..ebuild
index 50350a7d1f9..c08a85f6d05 100644
--- a/net-misc/freerdp/freerdp-2..ebuild
+++ b/net-misc/freerdp/freerdp-2..ebuild
@@ -88,6 +88,10 @@ BDEPEND="
) )
 "
 
+PATCHES=(
+   "${FILESDIR}/freerdp-2-openssl-3.0.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-08-30 Thread Mike Gilbert 
commit: 4173a91a5ea81cf05cecd384efd3a7e1dd89b050
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 30 21:42:03 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 30 21:42:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4173a91a

net-misc/freerdp: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |   1 -
 .../freerdp/files/2.1.2-mask-cached_brush.patch|  23 
 net-misc/freerdp/freerdp-2.1.2-r1.ebuild   | 123 -
 3 files changed, 147 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 617aeaaef4a..4a18414a798 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,2 +1 @@
-DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B 
f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc
 SHA512 
6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 
0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12
 SHA512 
8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae

diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch 
b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
deleted file mode 100644
index bb8fedb1992..000
--- a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 Mon Sep 17 00:00:00 2001
-From: Armin Novak 
-Date: Tue, 23 Jun 2020 09:24:35 +0200
-Subject: [PATCH] Fixed #6298: Mask CACHED_BRUSH when checking brush style
-

- libfreerdp/core/orders.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
-index dc4e51a873..537e694264 100644
 a/libfreerdp/core/orders.c
-+++ b/libfreerdp/core/orders.c
-@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid)
- {
-   if (pValid)
-   *pValid = TRUE;
--  switch (bmf)
-+  /* Mask out highest bit */
-+  switch (bmf & (~CACHED_BRUSH))
-   {
-   case 1:
-   return 1;

diff --git a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild 
b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
deleted file mode 100644
index 41f40c41665..000
--- a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == * ]]; 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 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 )
-   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? (
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-07-18 Thread Mike Gilbert 
commit: 24433701675335005b6a5948d109818d195aca63
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jul 18 13:14:45 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul 18 13:14:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24433701

net-misc/freerdp: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |   1 -
 .../files/2.1.1-write_pixel_16-endian.patch|  23 
 net-misc/freerdp/freerdp-2.1.1-r1.ebuild   | 122 -
 3 files changed, 146 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 424b986ab8f..3051e59fac3 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,2 +1 @@
-DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B 
b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd
 SHA512 
6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b
 DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B 
f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc
 SHA512 
6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96

diff --git a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch 
b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
deleted file mode 100644
index f5d4d7638ad..000
--- a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 733026dada313cf345c3e3664cfe5790519e9fae Mon Sep 17 00:00:00 2001
-From: akallabeth 
-Date: Mon, 8 Jun 2020 07:09:07 +0200
-Subject: [PATCH] Fixed #6267: adjust write_pixel_16 endian handling
-

- libfreerdp/codec/interleaved.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c
-index e9f92c7009..b76fe1ca3c 100644
 a/libfreerdp/codec/interleaved.c
-+++ b/libfreerdp/codec/interleaved.c
-@@ -232,7 +232,8 @@ static INLINE void write_pixel_24(BYTE* _buf, UINT32 _pix)
- 
- static INLINE void write_pixel_16(BYTE* _buf, UINT16 _pix)
- {
--  *(UINT16*)_buf = _pix;
-+  _buf[0] = _pix & 0xFF;
-+  _buf[1] = (_pix >> 8) & 0xFF;
- }
- 
- #undef DESTWRITEPIXEL

diff --git a/net-misc/freerdp/freerdp-2.1.1-r1.ebuild 
b/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
deleted file mode 100644
index ffab34deaee..000
--- a/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == * ]]; 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/_/-}
-   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 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 )
-   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? (
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-06-08 Thread Mike Gilbert 
commit: f264b4a53a97749d5d7a07df8a3e65490694cf76
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jun  8 17:24:14 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jun  8 17:24:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f264b4a5

net-misc/freerdp: backport big-endian fix

Closes: https://bugs.gentoo.org/727446
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/2.1.1-write_pixel_16-endian.patch| 23 ++
 ...reerdp-2.1.1.ebuild => freerdp-2.1.1-r1.ebuild} |  4 
 2 files changed, 27 insertions(+)

diff --git a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch 
b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
new file mode 100644
index 000..f5d4d7638ad
--- /dev/null
+++ b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
@@ -0,0 +1,23 @@
+From 733026dada313cf345c3e3664cfe5790519e9fae Mon Sep 17 00:00:00 2001
+From: akallabeth 
+Date: Mon, 8 Jun 2020 07:09:07 +0200
+Subject: [PATCH] Fixed #6267: adjust write_pixel_16 endian handling
+
+---
+ libfreerdp/codec/interleaved.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c
+index e9f92c7009..b76fe1ca3c 100644
+--- a/libfreerdp/codec/interleaved.c
 b/libfreerdp/codec/interleaved.c
+@@ -232,7 +232,8 @@ static INLINE void write_pixel_24(BYTE* _buf, UINT32 _pix)
+ 
+ static INLINE void write_pixel_16(BYTE* _buf, UINT16 _pix)
+ {
+-  *(UINT16*)_buf = _pix;
++  _buf[0] = _pix & 0xFF;
++  _buf[1] = (_pix >> 8) & 0xFF;
+ }
+ 
+ #undef DESTWRITEPIXEL

diff --git a/net-misc/freerdp/freerdp-2.1.1.ebuild 
b/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
similarity index 97%
rename from net-misc/freerdp/freerdp-2.1.1.ebuild
rename to net-misc/freerdp/freerdp-2.1.1-r1.ebuild
index d52fe4d1a0a..b9405ff047e 100644
--- a/net-misc/freerdp/freerdp-2.1.1.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
@@ -88,6 +88,10 @@ BDEPEND="
) )
 "
 
+PATCHES=(
+   "${FILESDIR}/2.1.1-write_pixel_16-endian.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-05-14 Thread Thomas Deutschmann 
commit: 2a9eabba5ea46d68ed4e5f5f59b6ea60a4330fc4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu May 14 22:14:46 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu May 14 22:15:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9eabba

net-misc/freerdp: security cleanup

Bug: https://bugs.gentoo.org/716830
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/freerdp/Manifest|   1 -
 net-misc/freerdp/files/2.0.0-backports.patch |  94 
 net-misc/freerdp/freerdp-2.0.0-r1.ebuild | 123 ---
 net-misc/freerdp/metadata.xml|   1 -
 4 files changed, 219 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 9e59f87b53e..7d7fe20fbc5 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,2 +1 @@
-DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 
2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db
 SHA512 
4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
 DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B 
d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166
 SHA512 
c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b

diff --git a/net-misc/freerdp/files/2.0.0-backports.patch 
b/net-misc/freerdp/files/2.0.0-backports.patch
deleted file mode 100644
index a1cf36539fd..000
--- a/net-misc/freerdp/files/2.0.0-backports.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001
-From: akallabeth 
-Date: Fri, 10 Apr 2020 14:11:15 +0200
-Subject: [PATCH] Fixed return type for subsystem entry
-

- channels/client/CMakeLists.txt | 2 +-
- channels/client/tables.h   | 2 +-
- channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
-index a0d3a73581..eb0c80f129 100644
 a/channels/client/CMakeLists.txt
-+++ b/channels/client/CMakeLists.txt
-@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
-   set(STATIC_SUBSYSTEM_ENTRY 
"${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry")
-   endif()
-   set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ 
\"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", 
${STATIC_SUBSYSTEM_ENTRY} },")
--  set(SUBSYSTEM_IMPORT "extern void 
${STATIC_SUBSYSTEM_ENTRY}(void);")
-+  set(SUBSYSTEM_IMPORT "extern UINT 
${STATIC_SUBSYSTEM_ENTRY}(void*);")
-   set(CLIENT_STATIC_SUBSYSTEM_IMPORTS 
"${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}")
-   endforeach()
-   set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};")
-diff --git a/channels/client/tables.h b/channels/client/tables.h
-index fd998a6ae1..b6b3f9ca27 100644
 a/channels/client/tables.h
-+++ b/channels/client/tables.h
-@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY
- {
-   const char* name;
-   const char* type;
--  void (*entry)(void);
-+  UINT (*entry)();
- };
- typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY;
- 
-diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c 
b/channels/urbdrc/client/libusb/libusb_udevman.c
-index 67360ad430..7509326c22 100644
 a/channels/urbdrc/client/libusb/libusb_udevman.c
-+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
- #else
- #define freerdp_urbdrc_client_subsystem_entry FREERDP_API 
freerdp_urbdrc_client_subsystem_entry
- #endif
--int 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS 
pEntryPoints)
-+UINT 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS 
pEntryPoints)
- {
--  int rc;
-+  UINT rc;
-   UINT status;
-   UDEVMAN* udevman;
-   ADDIN_ARGV* args = pEntryPoints->args;
-@@ -922,5 +922,5 @@ int 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p
-   return 0;
- fail:
-   udevman_free(>iface);
--  return -1;
-+  return ERROR_INTERNAL_ERROR;
- }
-From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001
-From: akallabeth 
-Date: Fri, 10 Apr 2020 14:16:19 +0200
-Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions
-

- channels/urbdrc/client/urbdrc_main.h | 14 ++
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/channels/urbdrc/client/urbdrc_main.h 
b/channels/urbdrc/client/urbdrc_main.h
-index

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-05-08 Thread Mike Gilbert 
commit: 049c86b6a13a1c9913cc01e4110313fb683eaac8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat May  9 04:15:13 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat May  9 04:15:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049c86b6

net-misc/freerdp: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |   3 -
 .../freerdp/files/2.0.0-rc4-bitmap-endian.patch|  30 -
 net-misc/freerdp/files/2.0.0-rc4-libressl.patch|  78 -
 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild  | 121 -
 net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild| 119 
 5 files changed, 351 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 3fd51796e61..9e59f87b53e 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -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
index cd78ba983b7..000
--- a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
-From: Armin Novak 
-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
index fd6e6148607..000
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
-From: Armin Novak 
-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 >= 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2020-04-10 Thread Mike Gilbert 
commit: 79094ffc4ccfeb34f83da5be1fb86ecb45641caf
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Apr 10 14:48:26 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr 10 14:48:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79094ffc

net-misc/freerdp: backport a couple of fixes

Closes: https://bugs.gentoo.org/716934
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/files/2.0.0-backports.patch   | 94 ++
 ...reerdp-2.0.0.ebuild => freerdp-2.0.0-r1.ebuild} |  4 +
 2 files changed, 98 insertions(+)

diff --git a/net-misc/freerdp/files/2.0.0-backports.patch 
b/net-misc/freerdp/files/2.0.0-backports.patch
new file mode 100644
index 000..a1cf36539fd
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-backports.patch
@@ -0,0 +1,94 @@
+From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001
+From: akallabeth 
+Date: Fri, 10 Apr 2020 14:11:15 +0200
+Subject: [PATCH] Fixed return type for subsystem entry
+
+---
+ channels/client/CMakeLists.txt | 2 +-
+ channels/client/tables.h   | 2 +-
+ channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
+index a0d3a73581..eb0c80f129 100644
+--- a/channels/client/CMakeLists.txt
 b/channels/client/CMakeLists.txt
+@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
+   set(STATIC_SUBSYSTEM_ENTRY 
"${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry")
+   endif()
+   set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ 
\"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", 
${STATIC_SUBSYSTEM_ENTRY} },")
+-  set(SUBSYSTEM_IMPORT "extern void 
${STATIC_SUBSYSTEM_ENTRY}(void);")
++  set(SUBSYSTEM_IMPORT "extern UINT 
${STATIC_SUBSYSTEM_ENTRY}(void*);")
+   set(CLIENT_STATIC_SUBSYSTEM_IMPORTS 
"${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}")
+   endforeach()
+   set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};")
+diff --git a/channels/client/tables.h b/channels/client/tables.h
+index fd998a6ae1..b6b3f9ca27 100644
+--- a/channels/client/tables.h
 b/channels/client/tables.h
+@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY
+ {
+   const char* name;
+   const char* type;
+-  void (*entry)(void);
++  UINT (*entry)();
+ };
+ typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY;
+ 
+diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c 
b/channels/urbdrc/client/libusb/libusb_udevman.c
+index 67360ad430..7509326c22 100644
+--- a/channels/urbdrc/client/libusb/libusb_udevman.c
 b/channels/urbdrc/client/libusb/libusb_udevman.c
+@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
+ #else
+ #define freerdp_urbdrc_client_subsystem_entry FREERDP_API 
freerdp_urbdrc_client_subsystem_entry
+ #endif
+-int 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS 
pEntryPoints)
++UINT 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS 
pEntryPoints)
+ {
+-  int rc;
++  UINT rc;
+   UINT status;
+   UDEVMAN* udevman;
+   ADDIN_ARGV* args = pEntryPoints->args;
+@@ -922,5 +922,5 @@ int 
freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p
+   return 0;
+ fail:
+   udevman_free(>iface);
+-  return -1;
++  return ERROR_INTERNAL_ERROR;
+ }
+From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001
+From: akallabeth 
+Date: Fri, 10 Apr 2020 14:16:19 +0200
+Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions
+
+---
+ channels/urbdrc/client/urbdrc_main.h | 14 ++
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/channels/urbdrc/client/urbdrc_main.h 
b/channels/urbdrc/client/urbdrc_main.h
+index 5ec839983b..749aaf8727 100644
+--- a/channels/urbdrc/client/urbdrc_main.h
 b/channels/urbdrc/client/urbdrc_main.h
+@@ -222,14 +222,12 @@ struct _IUDEVMAN
+   UINT32 status;
+ };
+ 
+-enum
+-{
+-  DEVICE_ADD_FLAG_BUS,
+-  DEVICE_ADD_FLAG_DEV,
+-  DEVICE_ADD_FLAG_VENDOR,
+-  DEVICE_ADD_FLAG_PRODUCT,
+-  DEVICE_ADD_FLAG_REGISTER
+-} device_add_flag_t;
++#define DEVICE_ADD_FLAG_BUS 0x01
++#define DEVICE_ADD_FLAG_DEV 0x02
++#define DEVICE_ADD_FLAG_VENDOR 0x04
++#define DEVICE_ADD_FLAG_PRODUCT 0x08
++#define DEVICE_ADD_FLAG_REGISTER 0x10
++
+ #define DEVICE_ADD_FLAG_ALL   \
+   (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \
+DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER)

diff --git a/net-misc/freerdp/freerdp-2.0.0.ebuild 
b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
similarity index 98%
rename from

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2019-12-12 Thread Mike Gilbert 
commit: 08f2438131f86e39251efb3620668c776f9f4243
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec 12 20:14:23 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec 12 20:15:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f24381

net-misc/freerdp: remove old

Bug: https://bugs.gentoo.org/672010
Bug: https://bugs.gentoo.org/679416
Package-Manager: Portage-2.3.80_p5, Repoman-2.3.19_p4
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest |   1 -
 net-misc/freerdp/files/2.0.0-rc2-primitives.patch |  41 
 net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild  | 120 --
 3 files changed, 162 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index ad3f3a0ba7b..fd0ee55a133 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,3 +1,2 @@
-DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 
564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3
 SHA512 
cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 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

diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch 
b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
deleted file mode 100644
index a82dec1ad0f..000
--- a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Wed, 16 May 2018 16:15:50 -0400
-Subject: [PATCH] primitives: ensure primitives_get() returns a populated
- struct
-
-Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658

- libfreerdp/primitives/primitives.c | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/primitives/primitives.c 
b/libfreerdp/primitives/primitives.c
-index fd236df6e7..d25c5b41dc 100644
 a/libfreerdp/primitives/primitives.c
-+++ b/libfreerdp/primitives/primitives.c
-@@ -28,10 +28,12 @@
- #include "prim_internal.h"
- 
- /* Singleton pointer used throughout the program when requested. */
--static primitives_t pPrimitives = { 0 };
- static primitives_t pPrimitivesGeneric = { 0 };
- static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#if defined(HAVE_OPTIMIZED_PRIMITIVES)
-+static primitives_t pPrimitives = { 0 };
- static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#endif
- 
- 
- /* - 
*/
-@@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
-   InitOnceExecuteOnce(_primitives_InitOnce, 
primitives_init_generic, NULL, NULL);
- #if defined(HAVE_OPTIMIZED_PRIMITIVES)
-   InitOnceExecuteOnce(_InitOnce, primitives_init, NULL, NULL);
--#endif
-   return 
-+#else
-+  return 
-+#endif
- }
- 
- primitives_t* primitives_get_generic(void)

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index fdbeb49fd21..000
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} !=  ]]; then
-   MY_P=${P/_/-}
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="https://pub.freerdp.com/releases/${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_arm_neon cups debug doc ffmpeg gstreamer jpeg 
libav 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=
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2019-10-07 Thread Mike Gilbert 
commit: e800eb711b7372087af804f91c5cb14b8e7d35bf
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Oct  7 17:17:51 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Oct  7 17:17:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e800eb71

net-misc/freerdp: backport another ppc fix

Closes: https://bugs.gentoo.org/672744
Package-Manager: Portage-2.3.76_p10, Repoman-2.3.17_p62
Signed-off-by: Mike Gilbert  gentoo.org>

 .../freerdp/files/2.0.0-rc4-bitmap-endian.patch| 30 ++
 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild  |  1 +
 2 files changed, 31 insertions(+)

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
new file mode 100644
index 000..cd78ba983b7
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
@@ -0,0 +1,30 @@
+From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
+From: Armin Novak 
+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/freerdp-2.0.0_rc4.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index f727736d924..26e3c838fd0 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -90,6 +90,7 @@ DEPEND="${RDEPEND}
 
 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
 )

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2018-12-04 Thread Mike Gilbert 
commit: f71c4d0d7d8b4561bdae56c388a0676f6fca944b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Dec  4 17:30:40 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Dec  4 17:30:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71c4d0d

net-misc/freerdp: fix build with libressl

Closes: https://bugs.gentoo.org/672094
Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 47 +
 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild   |  4 +++
 2 files changed, 51 insertions(+)

diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch 
b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
new file mode 100644
index 000..f666e0d4d67
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
@@ -0,0 +1,47 @@
+From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
+From: Armin Novak 
+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 >= 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
+   SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
+ #endif
+ 
+From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
+From: akallabeth 
+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 >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+   SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
+ #endif
+ 

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 69625f21c2a..b0b9ea11319 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -87,6 +87,10 @@ DEPEND="${RDEPEND}
) ) )
 "
 
+PATCHES=(
+   "${FILESDIR}"/2.0.0-rc4-libressl.patch
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2018-12-02 Thread Mike Gilbert 
commit: 33b46b6ee0ee08282ff60b0cb264b92a932b4584
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 26 19:20:20 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec  2 17:15:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b46b6e

net-misc/freerdp: remove old

Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/Manifest  |   4 -
 net-misc/freerdp/files/1.2.1-gstreamer.patch   |  71 
 net-misc/freerdp/files/2.0.0-rc0-libressl.patch|  89 ---
 .../files/2.0.0-rc1-CredSSP-protocol-version.patch |  49 
 net-misc/freerdp/files/2.0.0-rc1-libressl.patch|  35 --
 .../freerdp-Fix-gstreamer-1.0-detection.patch  |  25 -
 net-misc/freerdp/files/freerdp-armfp.patch |  84 --
 net-misc/freerdp/files/freerdp-ffmpeg29.patch  |  42 ---
 .../freerdp/freerdp-1.2.1_pre20150326-r1.ebuild| 114 ---
 net-misc/freerdp/freerdp-2.0.0_rc0.ebuild  | 124 -
 net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild   | 123 
 net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild   | 116 ---
 net-misc/freerdp/freerdp-2.0.0_rc3.ebuild  | 115 ---
 13 files changed, 991 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index bbd94c0d422..4b61307e109 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,6 +1,2 @@
-DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 
6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525
 SHA512 
d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd
-DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 
5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955
 SHA512 
5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182
-DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 
8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a
 SHA512 
ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 
564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3
 SHA512 
cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
-DIST freerdp-2.0.0-rc3.tar.gz 6575186 BLAKE2B 
a99b54ca284d1c5c61104e22edd6bb4bc435ed1d5b95a84f089c06e6d49c14987be24c5e6b08e02f7df4a56230159c827b8ada24f68ff0188e74c0386507d691
 SHA512 
0019daadd5f0071d983053c554834392a751ec3bcde2ed96d4c0fceb7c32a319b9bbfeb68ff9b15216f7db479c883b461e7c51e612c99626dd09af5a68ff96f5
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 
50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6
 SHA512 
63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20

diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch 
b/net-misc/freerdp/files/1.2.1-gstreamer.patch
deleted file mode 100644
index cafe9702210..000
--- a/net-misc/freerdp/files/1.2.1-gstreamer.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
-From: Jean-Louis Dupond 
-Date: Sun, 4 Oct 2015 18:17:33 +0200
-Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
- versions
-

- cmake/FindGStreamer_1_0.cmake | 30 +++---
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index f7bf990..3aa8fc6 100644
 a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
- # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
- #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES 
variables (eg. "GSTREAMER_1_0_AUDIO")
- #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", 
or "gstreamer-video-1.0").
--#   _header is the component's header, relative to the gstreamer-1.0 
directory (eg. "gst/gst.h").
- #   _library is the component's library name (eg. "gstreamer-1.0" or 
"gstvideo-1.0")
--macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header 
_library)
-+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
- # FIXME: The QUIET keyword can be used once we

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2018-05-16 Thread Mike Gilbert 
commit: 00e26fc064d3097406733d3242c14f8b872a239e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed May 16 21:18:42 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed May 16 21:18:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e26fc0

net-misc/freerdp: fix null pointer deref in primitives

Closes: https://bugs.gentoo.org/655904
Package-Manager: Portage-2.3.36_p22, Repoman-2.3.9_p215

 net-misc/freerdp/files/2.0.0-rc2-primitives.patch  | 41 ++
 0.0_rc2.ebuild => freerdp-2.0.0_rc2-r1.ebuild} |  4 +++
 2 files changed, 45 insertions(+)

diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch 
b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
new file mode 100644
index 000..a82dec1ad0f
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
@@ -0,0 +1,41 @@
+From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Wed, 16 May 2018 16:15:50 -0400
+Subject: [PATCH] primitives: ensure primitives_get() returns a populated
+ struct
+
+Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658
+---
+ libfreerdp/primitives/primitives.c | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/primitives/primitives.c 
b/libfreerdp/primitives/primitives.c
+index fd236df6e7..d25c5b41dc 100644
+--- a/libfreerdp/primitives/primitives.c
 b/libfreerdp/primitives/primitives.c
+@@ -28,10 +28,12 @@
+ #include "prim_internal.h"
+ 
+ /* Singleton pointer used throughout the program when requested. */
+-static primitives_t pPrimitives = { 0 };
+ static primitives_t pPrimitivesGeneric = { 0 };
+ static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
++#if defined(HAVE_OPTIMIZED_PRIMITIVES)
++static primitives_t pPrimitives = { 0 };
+ static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
++#endif
+ 
+ 
+ /* - 
*/
+@@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
+   InitOnceExecuteOnce(_primitives_InitOnce, 
primitives_init_generic, NULL, NULL);
+ #if defined(HAVE_OPTIMIZED_PRIMITIVES)
+   InitOnceExecuteOnce(_InitOnce, primitives_init, NULL, NULL);
+-#endif
+   return 
++#else
++  return 
++#endif
+ }
+ 
+ primitives_t* primitives_get_generic(void)

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
similarity index 97%
rename from net-misc/freerdp/freerdp-2.0.0_rc2.ebuild
rename to net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index 48abe1a3fc7..328ca08dce1 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -87,6 +87,10 @@ DEPEND="${RDEPEND}
) ) )
 "
 
+PATCHES=(
+   "${FILESDIR}"/2.0.0-rc2-primitives.patch
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2017-12-14 Thread Mike Gilbert 
commit: 9c7939e92210deb470bddaf8f293a7b3fd2dc36e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec 14 20:03:37 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec 14 20:04:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7939e9

net-misc/freerdp: fix build with libressl

Closes: https://bugs.gentoo.org/640988
Package-Manager: Portage-2.3.18, Repoman-2.3.6_p30

 net-misc/freerdp/files/2.0.0-rc1-libressl.patch | 35 +
 net-misc/freerdp/freerdp-2.0.0_rc1.ebuild   |  4 +++
 2 files changed, 39 insertions(+)

diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch 
b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
new file mode 100644
index 000..76e2514ef2b
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
@@ -0,0 +1,35 @@
+From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001
+From: Greg V 
+Date: Fri, 1 Dec 2017 18:34:48 +0300
+Subject: [PATCH] Fix LibreSSL build
+
+LibreSSL does not support FIPS mode.
+---
+ winpr/libwinpr/utils/ssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index f749939ac..194f82609 100644
+--- a/winpr/libwinpr/utils/ssl.c
 b/winpr/libwinpr/utils/ssl.c
+@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE 
once, PVOID param, PVO
+ 
+   if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
+   {
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+   WLog_ERR(TAG, "Openssl fips mode ENable not available on 
openssl versions less than 1.0.1!");
+ #else
+   WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
+@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ 
+ BOOL winpr_FIPSMode(void)
+ {
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+   return FALSE;
+ #else
+   return (FIPS_mode() == 1);
+-- 
+2.15.1
+

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
index 631b7548fe1..c8a6ae3b610 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
@@ -88,6 +88,10 @@ DEPEND="${RDEPEND}
) ) )
 "
 
+PATCHES=(
+   "${FILESDIR}/2.0.0-rc1-libressl.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2017-08-26 Thread Mike Gilbert 
commit: c839cd4129639b115151ec473de2c6c6edb4e6a3
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 26 19:05:25 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 26 19:05:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c839cd41

net-misc/freerdp: fix build with libressl

Bug: https://bugs.gentoo.org/626506
Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17

 net-misc/freerdp/files/2.0.0-rc0-libressl.patch | 89 +
 net-misc/freerdp/freerdp-2.0.0_rc0.ebuild   |  5 +-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch 
b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
new file mode 100644
index 000..9e565e5b05d
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
@@ -0,0 +1,89 @@
+From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001
+From: Valery Kartel 
+Date: Wed, 26 Jul 2017 17:12:14 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+---
+ libfreerdp/crypto/crypto.c  | 2 +-
+ winpr/libwinpr/utils/ssl.c  | 6 +++---
+ winpr/tools/makecert/makecert.c | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
+index 15e65d534..f3bb595b8 100644
+--- a/libfreerdp/crypto/crypto.c
 b/libfreerdp/crypto/crypto.c
+@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* 
certificate_store_path)
+   if (cert_ctx == NULL)
+   goto end;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   OpenSSL_add_all_algorithms();
+ #else
+   OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index b674e21d5..78cbab1d8 100644
+--- a/winpr/libwinpr/utils/ssl.c
 b/winpr/libwinpr/utils/ssl.c
+@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE 
once, PVOID param, PVO
+   }
+ #endif
+   /* SSL_load_error_strings() is void */
+-#if (OPENSSL_VERSION_NUMBER < 0x1010L)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
+   SSL_load_error_strings();
+   /* SSL_library_init() always returns "1" */
+   SSL_library_init();
+@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
+   _winpr_openssl_cleanup_locking();
+ #endif
+-#if (OPENSSL_VERSION_NUMBER < 0x1010L)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
+   CRYPTO_cleanup_all_ex_data();
+   ERR_free_strings();
+   EVP_cleanup();
+@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
+   if (flags & WINPR_SSL_CLEANUP_THREAD)
+   {
+-#if (OPENSSL_VERSION_NUMBER < 0x1000L)
++#if (OPENSSL_VERSION_NUMBER < 0x1000L) || defined(LIBRESSL_VERSION_NUMBER)
+   ERR_remove_state(0);
+ #else
+   ERR_remove_thread_state(NULL);
+diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
+index a9efb352c..c9e38200a 100644
+--- a/winpr/tools/makecert/makecert.c
 b/winpr/tools/makecert/makecert.c
+@@ -620,7 +620,7 @@ int 
makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa
+   printf("Using default export password 
\"password\"\n");
+   }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   OpenSSL_add_all_algorithms();
+   OpenSSL_add_all_ciphers();
+   OpenSSL_add_all_digests();
+@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, 
int argc, char** argv)
+   key_length = atoi(arg->Value);
+   }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010L)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
+   context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
+ #else
+   {
+@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, 
int argc, char** argv)
+   {
+   ASN1_TIME* before;
+   ASN1_TIME* after;
+-#if (OPENSSL_VERSION_NUMBER < 0x1010L)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
+   before = X509_get_notBefore(context->x509);
+   after = X509_get_notAfter(context->x509);
+ #else
+-- 
+2.14.1
+

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
index 457a95da4a3..aeade402801 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -89,7 +89,10 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( README )
-PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2017-07-28 Thread Mike Gilbert 
commit: 6e92d8b5ae50a4083d2d7e8e9b795c08bc90f0ec
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jul 28 21:01:18 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jul 28 21:03:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e92d8b5

net-misc/freerdp: bump to 2.0.0-rc0

Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1

 net-misc/freerdp/Manifest  |  1 +
 .../freerdp-Fix-gstreamer-1.0-detection.patch  | 25 ++
 ...reerdp-.ebuild => freerdp-2.0.0_rc0.ebuild} | 10 +
 net-misc/freerdp/freerdp-.ebuild   |  9 
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index fe876660526..3e04a778e0c 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,3 +1,4 @@
+DIST FreeRDP-2.0.0-rc0.tar.gz 6486533 SHA256 
b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664 SHA512 
9bc9ee976c73f274a4258613409e242088bd077bcd1cc43f7941170374fc0f9deda7f2f7644506d0cdc2e029b6037abb21d848810dcce6aefa3c5f1642f19cb3
 WHIRLPOOL 
ae0e5d0422a1a3bb95e351dcf9a8845d56eb39189cd94f1a33d27f6a8282d6901ba743f0e3dfda6f53e1915b506a596bac6812553bf5a42ec1fecfb8c5b875ea
 DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 SHA256 
c0646f224ea30a485e165fb31eb8a039af2ca3f257cdf784b319e1b5c13e0425 SHA512 
ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
 WHIRLPOOL 
1ff6ce70d454a7e0cbb3cd4fbafe1fb4191dadc3b2f8a6dbff10d8c725b8fc2838a863837d9b01f6daa670483fe40266fb57569904ad8ac8503549d6605c9e64
 DIST freerdp-2.0.0_pre20160722.tar.gz 6412437 SHA256 
17d6b7b9ec6bcfbb78d72ecda034e1ed6bdae4f95a8100297096a5e5e095463a SHA512 
3b67de8f31740ccba0ce59f0035328bda6c1602e6197a31008bdd5bcab15e85f473c6c4eca5cb87670b34fa174e4b0da21a7f75be99686df485bb7f9cda6f589
 WHIRLPOOL 
b494070185435da954e9d998915fbe4b47286c803c03bc4839afa583082434fc4d51776b62db27255b9ba62ecb8ef9c95af96e2920414e0fff9b27dceecb4cd4
 DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 
b71aa5e99624f7bd4c28e69cb2bf3b7710696db121f67091de843c5c652194fd SHA512 
ad1699f520df2fdc0719ca35623beaa7b24ca9325e3ed6f30a153a34a237606dc43af2d71068c003f56e4ecbb0bdc07651564d62ba26c792896cecd9065c019a
 WHIRLPOOL 
80dda4d7f97854a19dec48d6169b2cca6bebcd28feab153ca2686faba67d9ae8ae6286661667567315a8e19e7d40bd45c97829171743489681f391236415b8cb

diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch 
b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
new file mode 100644
index 000..b63771d0818
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
@@ -0,0 +1,25 @@
+From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 28 Jul 2017 16:31:41 -0400
+Subject: [PATCH] Fix gstreamer-1.0 detection
+
+---
+ cmake/FindGStreamer_1_0.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index 3aa8fc6dc..6fbc0ecc5 100644
+--- a/cmake/FindGStreamer_1_0.cmake
 b/cmake/FindGStreamer_1_0.cmake
+@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix 
_pkgconfig_name _library)
+ 
+ string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
+ if ("${CMAKE_MATCH_2}" STREQUAL "")
+-pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= 
${GStreamer_FIND_VERSION}")
++pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= 
${GSTREAMER_1_0_MINIMUM_VERSION}")
+ else ()
+ pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+ endif ()
+-- 
+2.13.3
+

diff --git a/net-misc/freerdp/freerdp-.ebuild 
b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
similarity index 90%
copy from net-misc/freerdp/freerdp-.ebuild
copy to net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
index c8427184b90..347d8debd63 100644
--- a/net-misc/freerdp/freerdp-.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,10 +6,11 @@ EAPI="6"
 inherit cmake-utils
 
 if [[ ${PV} !=  ]]; then
-   COMMIT=""
-   SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   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"
-   S="${WORKDIR}/FreeRDP-${COMMIT}"
 else
inherit git-r3
SRC_URI=""
@@ -88,6 +89,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( README )
+PATCHES=( "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch )
 
 src_configure() {
local

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2017-03-20 Thread Mike Gilbert 
commit: 419c9cbad4248fdf0fd043341026a60f423d561b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Mar 20 20:57:54 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Mar 20 20:57:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419c9cba

net-misc/freerdp: fix build with libressl

Thanks to Aric Belsito for the patch.

Bug: https://bugs.gentoo.org/603656
Package-Manager: Portage-2.3.5_p2, Repoman-2.3.2_p32

 net-misc/freerdp/files/freerdp-libressl.patch | 148 ++
 net-misc/freerdp/freerdp-2.0.0_pre20161219.ebuild |   6 +-
 2 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/net-misc/freerdp/files/freerdp-libressl.patch 
b/net-misc/freerdp/files/freerdp-libressl.patch
new file mode 100644
index 000..cbb79bcc1d3
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-libressl.patch
@@ -0,0 +1,148 @@
+From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
+From: Aric Belsito 
+Date: Sun, 19 Mar 2017 13:58:24 -0700
+Subject: [PATCH] Support LibreSSL
+
+Broken by the addition of OpenSSL 1.1.0 support.
+---
+ libfreerdp/crypto/opensslcompat.c | 4 ++--
+ libfreerdp/crypto/opensslcompat.h | 4 ++--
+ libfreerdp/crypto/tls.c   | 8 
+ winpr/libwinpr/crypto/hash.c  | 8 
+ winpr/libwinpr/utils/ssl.c| 2 +-
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/libfreerdp/crypto/opensslcompat.c 
b/libfreerdp/crypto/opensslcompat.c
+index bb5aff7..701902d 100644
+--- a/libfreerdp/crypto/opensslcompat.c
 b/libfreerdp/crypto/opensslcompat.c
+@@ -19,7 +19,7 @@
+ 
+ #include "opensslcompat.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ BIO_METHOD* BIO_meth_new(int type, const char* name)
+ {
+@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const 
BIGNUM** e, const BIGNUM
+   *d = r->d;
+ }
+ 
+-#endif /* OPENSSL < 1.1.0 */
++#endif /* OPENSSL < 1.1.0 || LIBRESSL */
+diff --git a/libfreerdp/crypto/opensslcompat.h 
b/libfreerdp/crypto/opensslcompat.h
+index a599863..b42d32f 100644
+--- a/libfreerdp/crypto/opensslcompat.h
 b/libfreerdp/crypto/opensslcompat.h
+@@ -30,7 +30,7 @@
+ 
+ #include 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include 
+ #include 
+@@ -59,7 +59,7 @@
+ BIO_METHOD* BIO_meth_new(int type, const char* name);
+ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const 
BIGNUM** d);
+ 
+-#endif /* OPENSSL < 1.1.0 */
++#endif /* OPENSSL < 1.1.0 || LIBRESSL */
+ #endif /* WITH_OPENSSL */
+ 
+ #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index 1071a2e..c415763 100644
+--- a/libfreerdp/crypto/tls.c
 b/libfreerdp/crypto/tls.c
+@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, 
void* ptr)
+   case BIO_CTRL_PUSH:
+   if (next_bio && (next_bio != ssl_rbio))
+   {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   SSL_set_bio(tls->ssl, next_bio, next_bio);
+   CRYPTO_add(&(bio->next_bio->references), 1, 
CRYPTO_LOCK_BIO);
+ #else
+@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, 
void* ptr)
+   if (ssl_rbio != ssl_wbio)
+   BIO_free_all(ssl_wbio);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   if (next_bio)
+   
CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
+   tls->ssl->wbio = tls->ssl->rbio = NULL;
+@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, 
void* ptr)
+   BIO_push(ssl_rbio, next_bio);
+ 
+   BIO_set_next(bio, ssl_rbio);
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   CRYPTO_add(&(ssl_rbio->references), 1, 
CRYPTO_LOCK_BIO);
+ #else
+   BIO_up_ref(ssl_rbio);
+@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
+  *SSL struct is opaqe now
+  */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
+   {
+   /**
+diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
+index 949d687..27eb434 100644
+--- a/winpr/libwinpr/crypto/hash.c

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2015-11-08 Thread Mike Gilbert 
commit: a998d5281b750cc84c8d411d186a1d3fbebaf6a5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov  8 17:43:20 2015 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov  8 17:44:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a998d528

net-misc/freerdp: Backport gstreamer build fix

Bug: https://bugs.gentoo.org/564486

Package-Manager: portage-2.2.23_p18

 net-misc/freerdp/files/1.2.1-gstreamer.patch   | 71 ++
 .../freerdp/freerdp-1.2.1_pre20150326-r1.ebuild|  6 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch 
b/net-misc/freerdp/files/1.2.1-gstreamer.patch
new file mode 100644
index 000..cafe970
--- /dev/null
+++ b/net-misc/freerdp/files/1.2.1-gstreamer.patch
@@ -0,0 +1,71 @@
+From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
+From: Jean-Louis Dupond 
+Date: Sun, 4 Oct 2015 18:17:33 +0200
+Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
+ versions
+
+---
+ cmake/FindGStreamer_1_0.cmake | 30 +++---
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index f7bf990..3aa8fc6 100644
+--- a/cmake/FindGStreamer_1_0.cmake
 b/cmake/FindGStreamer_1_0.cmake
+@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
+ # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
+ #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES 
variables (eg. "GSTREAMER_1_0_AUDIO")
+ #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", 
or "gstreamer-video-1.0").
+-#   _header is the component's header, relative to the gstreamer-1.0 
directory (eg. "gst/gst.h").
+ #   _library is the component's library name (eg. "gstreamer-1.0" or 
"gstvideo-1.0")
+-macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header 
_library)
++macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+ # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
+-pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+ 
+-find_path(${_component_prefix}_INCLUDE_DIRS
+-NAMES ${_header}
+-HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} 
${PC_${_component_prefix}_INCLUDEDIR}
+-PATH_SUFFIXES gstreamer-1.0
+-)
++string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
++if ("${CMAKE_MATCH_2}" STREQUAL "")
++pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= 
${GStreamer_FIND_VERSION}")
++else ()
++pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
++endif ()
++set(${_component_prefix}_INCLUDE_DIRS 
${PC_${_component_prefix}_INCLUDE_DIRS})
+ 
+ find_library(${_component_prefix}_LIBRARIES
+ NAMES ${_library} gstreamer_android
+@@ -78,8 +78,8 @@ endmacro()
+ # 1.1. Find headers and libraries
+ set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
+ find_package(Glib REQUIRED)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h 
gstbase-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
+ 
+ # 1.2. Check Gstreamer version
+ if (GSTREAMER_1_0_INCLUDE_DIRS)
+@@ -110,11 +110,11 @@ endif ()
+ # 2. Find Gstreamer plugins
+ # -
+ 
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 
gst/app/gstappsink.h gstapp-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 
gst/audio/audio.h gstaudio-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h 
gstfft-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 
gst/pbutils/pbutils.h gstpbutils-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 
gst/video/video.h gstvideo-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 
gstpbutils-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
+ 
+ # 
+ # 3. Process the COMPONENTS passed to FIND_PACKAGE
+-- 
+2.6.3
+

diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild 
b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
index 0ea2daf..e914037 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -81,7 +81,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/freerdp-armfp.patch"

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/

2015-09-16 Thread Alexis Ballier 
commit: 036cf8158e6a78596ea5a9ea3455b3784926482f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep 16 20:56:52 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep 16 20:56:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036cf815

net-misc/freerdp: fix build with ffmpeg git master.

Package-Manager: portage-2.2.20.1

 net-misc/freerdp/files/freerdp-ffmpeg29.patch | 40 +++
 net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild |  4 +--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch 
b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
new file mode 100644
index 000..6113c3b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
@@ -0,0 +1,40 @@
+Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+===
+--- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
 freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
+   mdecoder->codec_context->bit_rate = media_type->BitRate;
+   mdecoder->codec_context->time_base.den = 
media_type->SamplesPerSecond.Numerator;
+   mdecoder->codec_context->time_base.num = 
media_type->SamplesPerSecond.Denominator;
+-  mdecoder->frame = avcodec_alloc_frame();
++  mdecoder->frame = av_frame_alloc();
+   return TRUE;
+ }
+ 
+@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+
mdecoder->codec_context->width, mdecoder->codec_context->height);
+   mdecoder->decoded_data = malloc(mdecoder->decoded_size);
+   ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
+-  frame = avcodec_alloc_frame();
++  frame = av_frame_alloc();
+   avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
+  mdecoder->codec_context->pix_fmt,
+  mdecoder->codec_context->width, 
mdecoder->codec_context->height);
+@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
+   
(int16_t *) dst, _size, src, src_size);
+ #else
+   {
+-  AVFrame *decoded_frame = avcodec_alloc_frame();
++  AVFrame *decoded_frame = av_frame_alloc();
+   int got_frame = 0;
+   AVPacket pkt;
+   av_init_packet();
+@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
+ 
+   switch (mdecoder->codec_context->pix_fmt)
+   {
+-  case PIX_FMT_YUV420P:
++  case AV_PIX_FMT_YUV420P:
+   return RDP_PIXFMT_I420;
+   default:
+   WLog_ERR(TAG, "unsupported pixel format %u",

diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild 
b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
index 4c23a32..5ca32d5 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
)
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? ( >=virtual/ffmpeg-9 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/freerdp-armfp.patch" )
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" 
"${FILESDIR}/freerdp-ffmpeg29.patch" )
 
 src_configure() {
local mycmakeargs=(