Apply a security fix. Clean up old revisions.

(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 54 insertions, 89 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 0e70ed082193..39b5d9d55376 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.190 2013/04/19 18:04:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.191 2013/09/13 22:41:08 eva Exp $
+
+*vino-3.8.1-r1 (14 Sep 2013)
+
+  14 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> -vino-3.6.2-r1.ebuild,
+  -vino-3.8.0.ebuild, +vino-3.8.1-r1.ebuild,
+  +files/vino-3.8.1-new-client.patch:
+  Apply a security fix. Clean up old revisions.
 
 *vino-3.8.1 (19 Apr 2013)
 
diff --git a/net-misc/vino/files/vino-3.8.1-new-client.patch b/net-misc/vino/files/vino-3.8.1-new-client.patch
new file mode 100644
index 000000000000..0ec30408cb2c
--- /dev/null
+++ b/net-misc/vino/files/vino-3.8.1-new-client.patch
@@ -0,0 +1,28 @@
+From 860337231eaccfeed4f857afd0579546a260c23f Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Wed, 11 Sep 2013 15:08:47 +0000
+Subject: Reject new clients if in the deferred state
+
+As mentioned in bug 641811, Vino can get stuck trying to process the
+same data in an infinite loop if an authentication request is received
+from a client while that client is in the deferred state.
+
+Avoid this situation by closing new connections from the same client
+when it is in the deferred state.
+---
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 7dfbff9..1295219 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -387,7 +387,8 @@ rfbProcessClientMessage(rfbClientPtr cl)
+         rfbAuthProcessClientMessage(cl);
+         return;
+     case RFB_AUTH_DEFERRED:
+-	rfbLog("Authentication deferred - ignoring client message\n");
++	rfbLog("Authentication deferred for this client - closing connection\n");
++	rfbCloseClient(cl);
+ 	return;
+     case RFB_INITIALISATION:
+         rfbProcessClientInitMessage(cl);
+--
+cgit v0.9.2
diff --git a/net-misc/vino/vino-3.6.2-r1.ebuild b/net-misc/vino/vino-3.6.2-r1.ebuild
deleted file mode 100644
index ac84795d4d13..000000000000
--- a/net-misc/vino/vino-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.6.2-r1.ebuild,v 1.5 2013/02/02 23:07:27 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="http://live.gnome.org/Vino"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt gnome-keyring ipv6 jpeg libnotify networkmanager ssl +telepathy +zlib"
-
-# cairo used in vino-fb
-# libSM and libICE used in eggsmclient-xsmp
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/libgcrypt-1.1.90:=
-	>=net-libs/libsoup-2.24:2.4
-
-	dev-libs/dbus-glib
-	x11-libs/cairo:=
-	x11-libs/pango[X]
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libSM
-	x11-libs/libXtst
-
-	avahi? ( >=net-dns/avahi-0.6:=[dbus] )
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:= )
-	gnome-keyring? ( app-crypt/libsecret )
-	jpeg? ( virtual/jpeg:0= )
-	libnotify? ( >=x11-libs/libnotify-0.7.0:= )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	app-crypt/libsecret"
-# libsecret is always required at build time per bug 322763
-
-# bug #394611; tight encoding requires zlib encoding
-REQUIRED_USE="jpeg? ( zlib )"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--enable-http-server
-		--with-gcrypt
-		$(use_with avahi)
-		$(use_with crypt gcrypt)
-		$(use_enable ipv6)
-		$(use_with jpeg)
-		$(use_with gnome-keyring secret)
-		$(use_with libnotify)
-		$(use_with networkmanager network-manager)
-		$(use_with ssl gnutls)
-		$(use_with telepathy)
-		$(use_with zlib)"
-
-	# clipboard leak to unauthenticated clients, bug #434930
-	epatch "${FILESDIR}/${P}-clipboard-leak.patch"
-
-	# <glib-2.31 compatibility
-	rm -v server/vino-marshal.{c,h} || die
-	gnome2_src_prepare
-}
diff --git a/net-misc/vino/vino-3.8.0.ebuild b/net-misc/vino/vino-3.8.1-r1.ebuild
index fd105a61073b..bf4e6b322f91 100644
--- a/net-misc/vino/vino-3.8.0.ebuild
+++ b/net-misc/vino/vino-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.8.0.ebuild,v 1.1 2013/03/28 17:59:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.8.1-r1.ebuild,v 1.1 2013/09/13 22:41:08 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -17,9 +17,10 @@ IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib"
 
 # cairo used in vino-fb
 # libSM and libICE used in eggsmclient-xsmp
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND="
+	>=dev-libs/glib-2.26:2
 	>=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/libgcrypt-1.1.90:=
+	>=dev-libs/libgcrypt-1.1.90:0=
 	>=net-libs/libsoup-2.24:2.4
 
 	dev-libs/dbus-glib
@@ -36,13 +37,14 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/libnotify-0.7.0:=
 
 	avahi? ( >=net-dns/avahi-0.6:=[dbus] )
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:= )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
 	gnome-keyring? ( app-crypt/libsecret )
 	jpeg? ( virtual/jpeg:0= )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? ( >=net-libs/gnutls-2.2.0:= )
 	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
-	zlib? ( sys-libs/zlib:= )"
+	zlib? ( sys-libs/zlib:= )
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/intltool-0.50
@@ -54,7 +56,17 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="jpeg? ( zlib )"
 
 src_prepare() {
-	gnome2_src_prepare \
+	# Apply upstream patch as announced on distributor list
+	# will be in 3.8.2/3.10
+	epatch "${FILESDIR}"/${P}-new-client.patch
+
+	# <glib-2.31 compatibility
+	rm -v server/vino-marshal.{c,h} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
 		--enable-http-server \
 		--with-gcrypt \
 		$(use_with avahi) \
@@ -66,8 +78,4 @@ src_prepare() {
 		$(use_with ssl gnutls) \
 		$(use_with telepathy) \
 		$(use_with zlib)
-
-	# <glib-2.31 compatibility
-	rm -v server/vino-marshal.{c,h} || die
-	gnome2_src_prepare
 }