commit: 6c329ef7d981dbb47dee4c1b45d7a98b7f60e38e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 09:38:32 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 09:38:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c329ef7
net-libs/libvncserver: Security cleanup (bug #605326)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-libs/libvncserver/Manifest | 2 -
.../files/libvncserver-0.9.10-libva-1.0.patch | 52 ----------------
.../libvncserver/libvncserver-0.9.10-r3.ebuild | 69 ---------------------
.../libvncserver/libvncserver-0.9.10-r4.ebuild | 72 ----------------------
.../libvncserver-0.9.10_p20160127.ebuild | 67 --------------------
5 files changed, 262 deletions(-)
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index a0a440b054..9f3efc5747 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,3 +1 @@
-DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256
ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512
eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae
WHIRLPOOL
821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4
DIST LibVNCServer-0.9.11.tar.gz 1413739 SHA256
193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894 SHA512
e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
WHIRLPOOL
98a24e533a0b8065d1f3c52672b601750f26a89e29cee8e3b253cc15219d0249befd1aa2735f06351d7911777ff7dc3ce39dc903f7046f39a0abf0af277dff11
-DIST libvncserver-0.9.10_p20160127.tar.gz 1407878 SHA256
cac045bc068e567e9639624e66fb0db18205d93c12845366e16b8351b70ebd2e SHA512
3e8079d814c624e7c8f6f4dd91dfdf05e035ec489fc87a797a4a08b4f8998156b420b941b94c48f6b5f783f1a962f802e83d4bbdefc1f4093837331c8247676d
WHIRLPOOL
4884303a7071c450f06b93b2b483903d45f871c0d6e1dd55f2a1c141feb3eca97d9fbcd32e8f02bf6413beb6a11e70f53b498f15172bb2f04be1796045095331
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 2e6939e886..0000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 7b6243157f042a7bde353abc6fb22aadad6d9e2d
-Author: Floris Bos <b...@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 <b...@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 {
-
diff --git a/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild
b/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild
deleted file mode 100644
index 298b3dff2e..0000000000
--- a/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="http://libvncserver.sourceforge.net/";
-SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads +zlib"
-REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
-
-DEPEND="
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
- gnutls? (
- >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-LibVNCServer-${PV}
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
- # https://github.com/LibVNC/libvncserver/issues/11
- epatch "${FILESDIR}/${P}-libva-1.0.patch"
-
- sed -i -r \
- -e "/^SUBDIRS/s:\<$(usex test ''
'test|')client_examples|examples\>::g" \
- Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # bug 548012: disable vaapi per upstream
- ECONF_SOURCE=${S} \
- econf \
- --disable-silent-rules \
- --without-libva \
- $(use_enable static-libs static) \
- $(use_with 24bpp) \
- $(use_with gnutls) \
- $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
- $(usex gnutls --without-ssl $(use_with ssl)) \
- $(use_with ipv6) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with zlib)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.10-r4.ebuild
b/net-libs/libvncserver/libvncserver-0.9.10-r4.ebuild
deleted file mode 100644
index c5903de34a..0000000000
--- a/net-libs/libvncserver/libvncserver-0.9.10-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="http://libvncserver.sourceforge.net/";
-SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs test
threads +zlib"
-REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
-
-DEPEND="
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
- gnutls? (
- >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- ssl? (
- !libressl? (
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-LibVNCServer-${PV}
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
- # https://github.com/LibVNC/libvncserver/issues/11
- epatch "${FILESDIR}/${P}-libva-1.0.patch"
-
- sed -i -r \
- -e "/^SUBDIRS/s:\<$(usex test ''
'test|')client_examples|examples\>::g" \
- Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # bug 548012: disable vaapi per upstream
- ECONF_SOURCE=${S} \
- econf \
- --disable-silent-rules \
- --without-libva \
- $(use_enable static-libs static) \
- $(use_with 24bpp) \
- $(use_with gnutls) \
- $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
- $(usex gnutls --without-ssl $(use_with ssl)) \
- $(use_with ipv6) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with zlib)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.10_p20160127.ebuild
b/net-libs/libvncserver/libvncserver-0.9.10_p20160127.ebuild
deleted file mode 100644
index 8d83469a33..0000000000
--- a/net-libs/libvncserver/libvncserver-0.9.10_p20160127.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal vcs-snapshot
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="http://libvncserver.sourceforge.net/";
-SRC_URI="https://github.com/LibVNC/${PN}/archive/5b322f523faa437d8e7d03736bdb1714e8f84ce5.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs test
threads +zlib"
-REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
-
-DEPEND="
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
- gnutls? (
- >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- ssl? (
- !libressl? (
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
- default
-
- sed -i -r \
- -e "/^SUBDIRS/s:\<$(usex test ''
'test|')client_examples|examples\>::g" \
- Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- $(use_with 24bpp) \
- $(use_with gnutls) \
- $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
- $(usex gnutls --without-ssl $(use_with ssl)) \
- $(use_with ipv6) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with zlib)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
