summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2017-02-17 10:38:32 +0100
committerThomas Deutschmann <whissi@gentoo.org>2017-02-17 10:38:32 +0100
commit6c329ef7d981dbb47dee4c1b45d7a98b7f60e38e (patch)
tree95d90be1d2401af2d7c4d811b637e26a3537960b /net-libs/libvncserver/files
parentdev-tex/tex4ht: ppc64 stable (bug 432144) (diff)
downloadgentoo-6c329ef7d981dbb47dee4c1b45d7a98b7f60e38e.tar.gz
gentoo-6c329ef7d981dbb47dee4c1b45d7a98b7f60e38e.tar.bz2
gentoo-6c329ef7d981dbb47dee4c1b45d7a98b7f60e38e.zip
net-libs/libvncserver: Security cleanup (bug #605326)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-libs/libvncserver/files')
-rw-r--r--net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch b/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
deleted file mode 100644
index 2e6939e8860f..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 7b6243157f042a7bde353abc6fb22aadad6d9e2d
-Author: Floris Bos <bos@je-eigen-domein.nl>
-Date: 2014-12-29 00:02:33 +0100
-
- Fix libva related compile errors
-
- - Make h264.c compile with recent libva version by including va_compat.h
- - Only enable libva if libva-x11 is installed
- - Modified configure help text
- Previous help text suggested libva was only build when --with-libva
- was specified, while actual behavior is to build it by default.
-
- Warning: THIS CODE IS UNTESTED. Lacking a h.264 capable VNC server
- Also no attempt is made to support platforms not using X11
-
- Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
-
-diff --git a/configure.ac b/configure.ac
-index ca9f3b3..fe8b1de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,12 +150,11 @@ AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
-
-
- # See if we want libva support
--# TODO: check if library actually exists
- AH_TEMPLATE(CONFIG_LIBVA, [Build libva support])
- AC_ARG_WITH(libva,
--[ --with-libva build libva support],,)
-+[ --without-libva disable support for libva],,)
- if test "x$with_libva" != "xno"; then
-- AC_CHECK_LIB(va, vaInitialize,
-+ AC_CHECK_LIB(va-x11, vaGetDisplay,
- VA_LIBS="-lva -lva-x11"
- [AC_DEFINE(CONFIG_LIBVA) CONFIG_LIBVA="true"], ,)
- fi
-diff --git a/libvncclient/h264.c b/libvncclient/h264.c
-index 1d94454..c63a713 100644
---- a/libvncclient/h264.c
-+++ b/libvncclient/h264.c
-@@ -20,6 +20,10 @@
- #ifdef LIBVNCSERVER_CONFIG_LIBVA
-
- #include <X11/Xlib.h>
-+#include <va/va_version.h>
-+#if VA_CHECK_VERSION(0,34,0)
-+#include <va/va_compat.h>
-+#endif
- #include <va/va_x11.h>
-
- enum _slice_types {
-