bump; add required patch sourced from upstream, setting herd to proxy-maintainers and proxy maintainer to Alex Xu, all wrt sec bug #523590

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 140 insertions, 17 deletions

diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index 1664a288dddc..74d3ca212634 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libvncserver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.86 2015/03/02 09:29:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.87 2015/04/07 13:52:01 idella4 Exp $
+
+*libvncserver-0.9.10 (07 Apr 2015)
+
+  07 Apr 2015; Ian Delaney <idella4@gentoo.org>
+  +files/libvncserver-0.9.10-libva-1.0.patch, +libvncserver-0.9.10.ebuild,
+  metadata.xml:
+  bump; add required patch sourced from upstream, setting herd to proxy-
+  maintainers and proxy maintainer to Alex Xu, all wrt sec bug #523590
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> libvncserver-0.9.9-r3.ebuild:
   Stable for ppc, wrt bug #526032
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 384953088645..1f53e067eae8 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,33 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libvncserver-0.9.10-libva-1.0.patch 1689 SHA256 602b166e63e3732ae3ddc91051082af94856e07b8cb2fc0f981911eaec2205de SHA512 241d1f1f0606d8c20eefc9ff0cd20db7183a7af7db0f18c9fe6895ae5fb63dcf0ea861e4f8d470e59d4cd184a028e892bc255b3f6a95064354a539961b058a9a WHIRLPOOL 2eb196318cceb72b78cd54c95cf2171256b0c521ec852315590fbfc1c83cb4d17f899df707917fb5a5f8f9f694587044f0ab01cf6f53f42d0312bff5240ec1f4
 AUX libvncserver-0.9.9-segfault.patch 2649 SHA256 39fdddac4c111992578cccbbfad8bf5340aa90145023682e70a6e0862f34b997 SHA512 91fec4353bb8fd15068470ed0acf40b2ee5bb66fe6bea35c965434d105aa7d87e1fb8bc6591d03252661637cff29e8eb9dac66baa0fb5995435902d795551e8c WHIRLPOOL 1904f6c9e6721fbcb05dcbe44ce743fc79525ba0574d5778b20c65f9bb34236890641cdb3b25577349a726eabb83d6369b700eaaa9e2915b1117fc8df0e84d3c
 AUX libvncserver-memcpy.patch 861 SHA256 193e426d0cc10a0718afdca616a1686d2e766fe24a139db04ba8f7048f96866f SHA512 079e17e870363a21becbcca5142414f20ce3bef81ac5db0542a5331e3b984c9a0355fb486bbbdbe54084d60531869c11f6efcbfc13893f15de1eb14312448046 WHIRLPOOL 864ddc0010bfd91daf2b1e114a728283d0224f154e432cbdb09060c7bd690315fc2bcf5cf8a1adedf15be8252d346c85c2325919aa5e97a9fdc652231f248521
+DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256 ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512 eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae WHIRLPOOL 821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4
 DIST LibVNCServer-0.9.7.tar.gz 1105538 SHA256 2adb60ebb64706df088418cfb01691d9c273040fc286618e021e51ac61a77571 SHA512 546044e4accfcf2b1570bd792dcdf8e1ba3dc97be1d529b25bbbc93c39459489c8fad929f5d68a274fbf7f3eecb36b54e9c9ec8f6e35a45de26652cc09b16897 WHIRLPOOL fb4901d1dd609794b9e58d0bbf0afdbc4b5dea33b30b8c6fa5e7c205d9fd7a2deb9e2302271dabbada1f7086abb5b0a5e428ad921972300cd2b6700864720991
 DIST LibVNCServer-0.9.8.2.tar.gz 1238439 SHA256 2d243cd4b8d7f09a26b5d65e74375cedc85f3298621540a0724bde7e0fa1eaff SHA512 f28d334f7130b5228dcb65944f73a100eaa49c5b330ffb99a25d01602bbc77bfd6d470035409bd653a746d0029ec39126c7436e8f1d78263bf9df94a1273f5ea WHIRLPOOL 168797de49dde34155c0d38795894ddbe4639dbb90dde866897986808df6719feb4ced7e5cf2a080810970934e73d221d7b8debe100e020092b35a86ea8c9746
 DIST LibVNCServer-0.9.9.tar.gz 1678609 SHA256 cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9 SHA512 a37a1aa7a8d38d1a734b22d55d5fbfd07332e64a22067eb937e04256e3034691b7a9506b13f2d73e10d1e4f1e9fc05e66b35321c93225505297ef0a9beba0458 WHIRLPOOL 7c3fed4f99d36af88cdd1ecd6c8c949f3a7dccf877d22b736882d9f58490926d892af02b5de6cdee4f5365b70e221b5f2518fbfe16f600f16ec7b8a30135e8d3
+EBUILD libvncserver-0.9.10.ebuild 1979 SHA256 d8c96db82233ccdd4b1f2f7a681b376c287e63973ec2c8b44b9f016565ffbd8f SHA512 cb493426d046ac93cff53f45dcfa977821d313ec2b6182d260f7a22b2dca3ba50fb0001f04fbfa36c7a57a052d94d0c900cbeac0baed4c0f770a6a3561fcecab WHIRLPOOL a7cb8d2d7b9768b000152d04c603ebb503acb71813cfaf5e6b37b0b71773b2071ba0e68f198469da121daebf7d05d330a42d4bf01192308158e094ca5d87f793
 EBUILD libvncserver-0.9.7.ebuild 1420 SHA256 12af061365469dc81b59c8c3d7af66b00c9df1b7d5a44d874c23ffdda4c63556 SHA512 3c4b2a5ad7a799ea89a7e984015a4998ec6cf0579625e01be0b6d57a101be941053c29903d61f38650d07143b0ad96b63afe8c28718067b41bfa44eda8de8250 WHIRLPOOL 2224792c21f4ddc4f98577a0dc0a3c60f020015f0fbfe029afa2c0b51cbaa3ee6f8113afa58dd429799389ad2bfb5ec3aaf68b99036010c89c618fc478b98518
 EBUILD libvncserver-0.9.8.2-r2.ebuild 1496 SHA256 57946c59b5a1159299d220f65d5eb7e06a1b026dee5af4dd2e2259f02881b134 SHA512 3bfe96b57aa01769a592796527274e268e28f56dfb1cabe855a16372a03787987a77b5b134b19a09176afcd82ceb0544936c2ee53677f7f5071767e39ea662e4 WHIRLPOOL f8de95fb4157e05a24a313aa2c196fb5e6919545cbb4dc7788d57b7dccba7c3457f33db8041645b4194348411536fbccfb461d02df80287ac1ebb5c8908a8737
 EBUILD libvncserver-0.9.9-r1.ebuild 1735 SHA256 431252fe3cc4d1f1f966fa03ed204df55a72be0ad4eaf14e74ccc715be299ab4 SHA512 b0106aa41fd267aa318530c09edfad0067b3e0688c851f41f40cb736aed57c20ac3a8d09df8a2bceea822a9e2d8586b4855d7831eae16cbe6f08194f7871ad8e WHIRLPOOL b57c3fde9e0f07df05a0ab2bf747a56417e106843ab01887640bd49710e32aa2d4da623ae271b31fd530ccb92ad552b4b9885cf16e12a29e45d4d6ec8aad6e13
 EBUILD libvncserver-0.9.9-r2.ebuild 2050 SHA256 4dfed190aa02cf9e84b27862edfba06287604ef124f87c5e676f33f26be7fd44 SHA512 3ceae0052f6aed5f43eac9f85471745fbc81c1728875fd7702a6d0a04ca9b575beba5be581e1f4dfffa40b6dfda9f3a561401041264242629c67c4cfac494119 WHIRLPOOL 0d7634eed5f346a5cbce5732b03acb93ff8f685be9ae54ef0629975a867a395aa2d048c5f72879cd649180e0d808180863852c7f7f6978c4da016f0e9477f60a
 EBUILD libvncserver-0.9.9-r3.ebuild 2086 SHA256 851a1dadab3d1a567950597b1f55f7bf9e3cc7f5bb89c1132e643896124ba6ad SHA512 58a283b07d500df2a2eab3fc6540cae39fe92e30b85f994f96bf745cabb0c6a78cebc3e92d57584bbec758ad3d000cb8e4d40274a49f0638f7fe9d511eecd893 WHIRLPOOL 8ce43444255cba0d507642174bd8d077aff700e2971ee9a4b9d021dff0a21acdcb5cbd906cff50e0ac5dd682cc9fd8efb987e7181b03cd0a933e05cd5ce5a654
 EBUILD libvncserver-0.9.9.ebuild 1629 SHA256 610e4b3ee7b727e73664a3af9e90f86a56eeff732b30c1a6f1195328eb06bb46 SHA512 327cc9833c5487dfff24cc60601f8990390e5b4477f29835014b29ab5f559ba92b56cba65f5a0144d0b2947ec574b9bc4cab6cf13252f2c6d69694ba6f3ba5fd WHIRLPOOL 39113745bb743ef3de45ac353165079565e8503ae6788367049b69724378dca1892f9a66f47feb655a131501de6c5e615cf6b2d4548670325b61ccb06f7bda11
-MISC ChangeLog 11285 SHA256 e37b840133860afd8f7d5694aeb219a402a4e10ff976f84f13ff67fa6de5e447 SHA512 c573eb6315babc33863adc143df25b50e1940fc5386d828b9b167a9ec29069c2cc83669a71781c4c741f6cee2d46f7b9078d556b8e4dcd6c63ce842be14aabf0 WHIRLPOOL a10f94380a0884e6ed9a431f8715f57ac4b2aee76f696f00ef62140c15a5e29e2201edbbc142a7e847f637c681660b1392c1d0372f74da19424e5718a8fb856a
-MISC metadata.xml 843 SHA256 85f0d30afc8149013009d47354be909d848d392439962ceb3deb25b75a924055 SHA512 05d13266943280a8a88103a2a4359f14f512d08358bbe0f8e1368e974f7825f286054c5d34bbe4309645d378b26216fbf7ddc28d8dd63f949d9faa5f5e988379 WHIRLPOOL 479ca76c097d537cd902e58be19fb3ece3e5adde4bae73c4acee0c0bf5eba4245670c5c7ac36dddd37f902a2b87e2cab9c04cc45335ee1c048155a0c380e62a7
+MISC ChangeLog 11609 SHA256 9057af08624c48ba1f04b3aa3d40f762bdb8190fd599ee656790380cbde4d37f SHA512 d6fe63c6862a1bd89d6b4fff5f50e367de6e36c5d9aa6bad93a1ada46a9642665687c8535ef670787a86307c29fba71743c99927a5f12f86854f569e072f2eb6 WHIRLPOOL 2fa8c179fb649025aab6fc5631e6fc8e0b05392bc82b752bd90f314e057e2f584e5c314c80b8855c9e1e40613c6ded50f4bfb9fc588e0c4af9a7b8c184c19642
+MISC metadata.xml 934 SHA256 c698668b7aafe1148ce345e4f6608ebae37a3d90aed797f80f4233c92d0db98c SHA512 a2adc4358dbb73dbec3137f91654126f235f629306069101bf82ee1177fda8592016e6a9e2a5edf7ce5fa7b76161e5903c59ae8691c8b80fd0da81195f5f58e5 WHIRLPOOL a0a5303a48ab51dba2bd9b8960fc20a6666988b2380155e95de69298fa14f1e3bf15dfd1dab90513ec55e1e5f3ee8126dd58b1984f80b84222fed030fd66c6ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9C1jAAoJELp701BxlEWf6KAP/03hwEElQt99lH7gDSK28k6K
-nbGun7kVXeTxxTTEspckV4pLRifbcT3y9U3EFF1RKWcGI444lOc1ANka2lb4laiw
-vbfXKcUGmgfGReBEKZOH2pKxmYtkD48QdeDVkumnhY6HOpBdB9zOlYbCxUFKYf3G
-nwA1Og1un+6H+l0jtXWnnf56W8EYU5lEm2Ulw6vXNw3i7mXJtVuJ9pdZ+IAu1n53
-2V3vOSuRd29MvL/Btcb3Jgdh9KZAg2uAveaINwuuWJFhZ7/fMSLSlJEN/t7uA3P6
-WDO/aDoWKHxP0pA0ACCqUqImb0JaufXf2cmGk/g4gj9+Pz/lOd1R44YSeDG9WcVd
-K7qPwsmgxmr6cMih6F53ukiWvVFP5CXwrq5eOedre8+pGC1F76bn/u+459E+3KWl
-8RnANq2NZ8WlCFllMCM0+QbsspCotj52+UvdXFYL6G/JKM5trU2bYOhqVzOnIADR
-Mo9aZiz3wKWFYk7CxyqyPrSn2FF+kuiTJon/ZIIvoGLybktfoMVe5ew9nYX29hhw
-W/XiwOlYTFMWXCU4QIzH2k4s/sxvaNFInvPHP9LXKmf7TYNZ4x+Js49FcQewS4tH
-vm8TUvT1xud9gjf9o43uTEH1T4oApySxzGt+Xgu2qaelpFf9dbK1rEy7Xp4pKRgg
-HUVI209QIBw/8i4QynWT
-=VVtP
+iEYEAREIAAYFAlUj4REACgkQso7CE7gHKw3PDgCeJHIcjospl3pYAR3c1VNibaIl
+VcMAn1pS8mlbRo6AhzxeJE+R0L6tUNgM
+=uo2+
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..2e6939e8860f
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
@@ -0,0 +1,52 @@
+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 {
+
diff --git a/net-libs/libvncserver/libvncserver-0.9.10.ebuild b/net-libs/libvncserver/libvncserver-0.9.10.ebuild
new file mode 100644
index 000000000000..922bde3f4451
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.10.ebuild,v 1.1 2015/04/07 13:52:01 idella4 Exp $
+
+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 vaapi +zlib"
+
+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}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${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() {
+	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
+}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index 2b9b4012438a..816febc93599 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>alex_y_xu@yahoo.ca</email>
+		<name>Alex Xu</name>
+		<description>Proxy maintainer</description>
 	</maintainer>
 	<longdescription>
 If you don't know VNC, have a look at the original VNC or at Tridia