summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Tsoy <alexander@tsoy.me>2019-10-31 21:41:58 +0300
committerJoonas Niilola <juippis@gentoo.org>2019-11-01 16:10:59 +0200
commit5ae4ada68cdf7aa131d7a50c9305b55ba14fcd43 (patch)
treef865e9b4113dd62f602718e26ffbd53caa4d313e /net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
parentdev-libs/libdivecomputer: update BDEPEND for -9999 live ebuild (diff)
downloadgentoo-5ae4ada68cdf7aa131d7a50c9305b55ba14fcd43.tar.gz
gentoo-5ae4ada68cdf7aa131d7a50c9305b55ba14fcd43.tar.bz2
gentoo-5ae4ada68cdf7aa131d7a50c9305b55ba14fcd43.zip
net-libs/libvncserver: Add a bunch of upstream fixes
* fix CVE-2018-20750 (the fix for CVE-2018-15127 was incomplete) * fix CVE-2019-15681 * fix libdir in pkgconfig files * fix regression in Tight/Raw decoding Bug: https://bugs.gentoo.org/699036 Closes: https://bugs.gentoo.org/676942 Closes: https://bugs.gentoo.org/691848 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alexander Tsoy <alexander@tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/13509 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch')
-rw-r--r--net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch32
1 files changed, 28 insertions, 4 deletions
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
index 35ee26dc7b04..cc6e4bdc9097 100644
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
@@ -1,6 +1,27 @@
---- libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
-+++ libvncserver-LibVNCServer-0.9.12/CMakeLists.txt
-@@ -666,8 +666,8 @@
+From 3348a7e42e86dfb98dd7458ad29def476cf6096f Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Sat, 9 Feb 2019 13:23:26 +0100
+Subject: [PATCH 02/51] CMake: replace hardcoded 'lib' with
+ ${CMAKE_INSTALL_LIBDIR}
+
+Closes #281
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 873cc7b..55f7e65 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ include(CheckTypeSize)
+ include(TestBigEndian)
+ include(CheckCSourceCompiles)
+ include(CheckCSourceRuns)
++include(GNUInstallDirs)
+
+ enable_testing()
+
+@@ -666,8 +667,8 @@ get_link_libraries(PRIVATE_LIBS vncclient)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
@@ -11,7 +32,7 @@
install_files(/include/rfb FILES
rfb/keysym.h
rfb/rfb.h
-@@ -677,7 +677,7 @@
+@@ -677,7 +678,7 @@ install_files(/include/rfb FILES
rfb/rfbregion.h
)
@@ -20,3 +41,6 @@
libvncserver.pc
libvncclient.pc
)
+--
+2.23.0
+