mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
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 <whissi@gentoo.org>
This commit is contained in:
Thomas Deutschmann
@@ -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
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001
|
||||
From: akallabeth <akallabeth@posteo.net>
|
||||
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(&udevman->iface);
|
||||
- return -1;
|
||||
+ return ERROR_INTERNAL_ERROR;
|
||||
}
|
||||
From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001
|
||||
From: akallabeth <akallabeth@posteo.net>
|
||||
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)
|
||||
@@ -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} != 9999 ]]; then
|
||||
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"
|
||||
else
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
|
||||
HOMEPAGE="http://www.freerdp.com/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0/2"
|
||||
IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
sys-libs/zlib:0
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
cups? ( net-print/cups )
|
||||
client? (
|
||||
usb? (
|
||||
virtual/libudev:0=
|
||||
sys-apps/util-linux:0=
|
||||
dev-libs/dbus-glib:0=
|
||||
virtual/libusb:1=
|
||||
)
|
||||
X? (
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
xinerama? ( x11-libs/libXinerama )
|
||||
xv? ( x11-libs/libXv )
|
||||
)
|
||||
)
|
||||
ffmpeg? ( media-video/ffmpeg:0= )
|
||||
!ffmpeg? (
|
||||
x11-libs/cairo:0=
|
||||
)
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
x11-libs/libXrandr
|
||||
)
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
openh264? ( media-libs/openh264 )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
server? (
|
||||
X? (
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXtst
|
||||
xinerama? ( x11-libs/libXinerama )
|
||||
)
|
||||
)
|
||||
smartcard? ( sys-apps/pcsc-lite )
|
||||
systemd? ( sys-apps/systemd:0= )
|
||||
wayland? (
|
||||
dev-libs/wayland
|
||||
x11-libs/libxkbcommon
|
||||
)
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libxkbfile
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
client? ( X? ( doc? (
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
) ) )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/2.0.0-backports.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_TESTING=$(usex test ON OFF)
|
||||
-DCHANNEL_URBDRC=$(usex usb ON OFF)
|
||||
-DWITH_ALSA=$(usex alsa ON OFF)
|
||||
-DWITH_CCACHE=OFF
|
||||
-DWITH_CLIENT=$(usex client ON OFF)
|
||||
-DWITH_CUPS=$(usex cups ON OFF)
|
||||
-DWITH_DEBUG_ALL=$(usex debug ON OFF)
|
||||
-DWITH_MANPAGES=$(usex doc ON OFF)
|
||||
-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
|
||||
-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
|
||||
-DWITH_CAIRO=$(usex ffmpeg OFF ON)
|
||||
-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
|
||||
-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
|
||||
-DWITH_JPEG=$(usex jpeg ON OFF)
|
||||
-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
|
||||
-DWITH_OPENH264=$(usex openh264 ON OFF)
|
||||
-DWITH_PULSE=$(usex pulseaudio ON OFF)
|
||||
-DWITH_SERVER=$(usex server ON OFF)
|
||||
-DWITH_PCSC=$(usex smartcard ON OFF)
|
||||
-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
|
||||
-DWITH_X11=$(usex X ON OFF)
|
||||
-DWITH_XINERAMA=$(usex xinerama ON OFF)
|
||||
-DWITH_XV=$(usex xv ON OFF)
|
||||
-DWITH_WAYLAND=$(usex wayland ON OFF)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -6,7 +6,6 @@
|
||||
<name>Mike Gilbert</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="client">Build client binaries</flag>
|
||||
<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
|
||||
<flag name="server">Build server binaries</flag>
|
||||
</use>
|
||||
|
||||
Reference in New Issue
Block a user