From 79c02357eb6ea62d2186d12ccf5c13edc3aa7ff6 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 13 Nov 2014 12:34:06 +0000 Subject: [PATCH] Drop old (#508854) Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- net-misc/vinagre/ChangeLog | 6 +- net-misc/vinagre/Manifest | 13 ++- .../files/vinagre-2.30.3-gmodule.patch | 12 --- net-misc/vinagre/metadata.xml | 2 - net-misc/vinagre/vinagre-2.30.3.ebuild | 71 --------------- net-misc/vino/ChangeLog | 8 +- net-misc/vino/Manifest | 13 +-- .../files/vino-2.26.2-autorestart-loop.patch | 14 --- .../files/vino-3.6.2-clipboard-leak.patch | 51 ----------- .../vino/files/vino-3.8.1-new-client.patch | 28 ------ net-misc/vino/vino-2.32.2-r2.ebuild | 87 ------------------- 11 files changed, 21 insertions(+), 284 deletions(-) delete mode 100644 net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch delete mode 100644 net-misc/vinagre/vinagre-2.30.3.ebuild delete mode 100644 net-misc/vino/files/vino-2.26.2-autorestart-loop.patch delete mode 100644 net-misc/vino/files/vino-3.6.2-clipboard-leak.patch delete mode 100644 net-misc/vino/files/vino-3.8.1-new-client.patch delete mode 100644 net-misc/vino/vino-2.32.2-r2.ebuild diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog index 651e72e525c6..d769c3fc2149 100644 --- a/net-misc/vinagre/ChangeLog +++ b/net-misc/vinagre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/vinagre # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.108 2014/09/07 13:33:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.109 2014/11/13 12:31:13 pacho Exp $ + + 13 Nov 2014; Pacho Ramos + -files/vinagre-2.30.3-gmodule.patch, -vinagre-2.30.3.ebuild, metadata.xml: + Drop old (#508854) 07 Sep 2014; Pacho Ramos -vinagre-3.10.2.ebuild, -vinagre-3.12.1.ebuild, vinagre-3.12.2.ebuild: diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest index 9680b267d0e3..272e833b8ea2 100644 --- a/net-misc/vinagre/Manifest +++ b/net-misc/vinagre/Manifest @@ -1,17 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX vinagre-2.30.3-gmodule.patch 396 SHA256 3c52b535e4d143b6c7b44b457b10175ffdff62555a259c1e4f132c5cc5b014ba SHA512 d57a0e0237d0cc632e688d2609a405ab084a36fa78ba9c5dfd088c215e79ac0a146b92763e617e3effda27c67e3dfd42aa7a47cbc4b18f7843270d97b690fc4d WHIRLPOOL 7de0085159a6878c684e30a6c43db009b194ad0b1986ff86dc0956198946c3810965f0632ce2ca81ec6edaea0b978a32123a9e12821234067334d3cb39642893 -DIST vinagre-2.30.3.tar.bz2 2447388 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4 SHA512 3363d55f013d1477fd3270f701f717df5ffdf187d2718ab577b3acead5950bdc566bc714fd689a63c44c13160e4d0fdfc7be89b495859d721b8b3c6121443c5d WHIRLPOOL e79aa98f9252b2b50fd77f0debd622d716a4b81addc75d662ea224f876e4e718c20bbbff2c9569a16d8efb563dbe8720430907067eb0cf006261def0397f215b DIST vinagre-3.12.2.tar.xz 1088128 SHA256 d1959bfa7b82aad79b96ed92d11f37209a0f5cccdb025c91574a9a85381d82fc SHA512 8403d31b088b602ef58e8f828ec6ef5abec2c65fb6cf98cd1b42d74e085909257a4d86652771419f1dcd72bc99b2877a07840b5211694c690b6cb81b8e6f9704 WHIRLPOOL 966f67a54ca98e3cffa1167de903c810fe19e5d63a3b13e47128b0e3fe69d16f46bb6bdbd99910522d9accb04c3498aea7d477fca173257280226bcdcd1eaedb -EBUILD vinagre-2.30.3.ebuild 1858 SHA256 80e617428723c8b545630367d86e65760578a5f2ad9317beaceec6e1209702fb SHA512 38147f893ecb869f00576e51789c29422441e557ba5a2ca738f1cd011d559a07c99e5ae83b69e5d085766f1b6296d61d29e7caea6c2fcb1f8d5ba3cde94091b2 WHIRLPOOL 58deb1c11d9fc474f49bd9d61e69d46ee0c8379939bed7d1808fa99554da0e88c04e36f57f789e82d548c6deff1f5b9bfc3fdf63bcc87fd406856fc448458897 EBUILD vinagre-3.12.2.ebuild 1497 SHA256 bf1493e56495a40020a9f988cda63ea926221272d711a99dddd6f45c0798d6ef SHA512 2b3ab98108c78574a42b14dc31d3aa05121589afa764cf9d500a9a4d12f8c22e3f6d6226d69e6b7b4aaa10fba733cee7377d06fb8064d6096ed7eb3c7f9e9f94 WHIRLPOOL b92ebb744c8ff346b6e55b9d897bdfb02833f0eee1959c921d8a29efabd02337517be28b2f733db0c4d153bb7451c08f7211c6536477e88a23d4baa554513b1c -MISC ChangeLog 14982 SHA256 64e2bddbdfd0501714720119544b1fcc2067c8ad03cd6e2c47b581716b090e0d SHA512 7174f5870aa584a3b1f44b4dc6c8cca798f79eb88302e9fa73f007da8291bc7dfbd443ad0a8e1ec53fcc24f1cf5eb70961389e1200998b1af833ec127e846ba0 WHIRLPOOL dda4ca8b11f4961b020a5ae4bcecd99f33f18eb39d8471e4d906069356e801d782da0f5b40eb17c831ac9717c3cb4a42487143af39aa83003e96dbc54ae08ffc -MISC metadata.xml 633 SHA256 a6ad796117ba8acfa7a4751bfab866713d1b5861eba7eef0a5ed239ebc236363 SHA512 1e5eb8f97a57f6d19aaacc15e468bb0388d7bd0c331efa65cff2b843ef61f4a5971c89b0c2745f86d59d27a454211a2e38744f976d0bb2699298506627922ce3 WHIRLPOOL c6deceea983d4d2b215846ff97fd7aaac03e1d2fd8f51c7ce006236baea39fe5aa2b4834ea7be81cb05262a93eca33dd79ed8d98cac1048994b47130060b46d3 +MISC ChangeLog 15127 SHA256 2a5ba7a2dd62c0b4f840c4961a83a86ddc142c5931f19814747156d71ffa4cc2 SHA512 7aec059a4485cb7c05dbc7ed76b5572475eccc96b3168458d7af2421910c166a15b8ed08c3eb08f0dcf4c96aa4a9c806f5a6d4914e0356f1c640fc505e068a48 WHIRLPOOL 959c31107592189f3649751ad12f0e72c52e59cba5f6ea49f856b54246ae275213c63cd6ed1be96227ffcd27b91c7ee256d42d8fede14a00b707516ab4bdd03f +MISC metadata.xml 541 SHA256 b6870da5808fae6b5ceed61f0b35e6367f531f671e270c58f0bd45c52cc49d65 SHA512 00e08cd84141020f44cccb0064f0b92a458dd49d7221a4b0078e20206761508ecf1eee3cf5d7e20e6876347b87888f3bfefe69a8397fa59e108fdef75dc38e46 WHIRLPOOL 17b85c3451b68efb39ca13c8dd81df475bfbc112d2f90ea953230d5eb09560b9082623cb02c28cb8b45a790de0ca0df2a95164a5aa2b0b45e23b2b43d1573869 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQMXrIACgkQCaWpQKGI+9Q2jACbBHYg4xSeExkHHrY6/mqMiVIx -VVkAn2V4xo4QaqRZkB+C5OSQEl1AHC4p -=k7kO +iEYEAREIAAYFAlRkpJIACgkQCaWpQKGI+9TPIgCeK5lLS2pTIb0hsuNn6wDS37Ca +Q5YAnj3Dp2xh5DKf/I2TvBWf9XE7kVOh +=tUNz -----END PGP SIGNATURE----- diff --git a/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch b/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch deleted file mode 100644 index 8b8837ac0de8..000000000000 --- a/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index cb10398..7af7895 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(VINAGRE, \ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gio-unix-2.0 >= $GLIB_REQUIRED \ -+ gmodule-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml index 24190f52d5af..f796c7b607da 100644 --- a/net-misc/vinagre/metadata.xml +++ b/net-misc/vinagre/metadata.xml @@ -3,8 +3,6 @@ gnome - Enable vinagre applet for - gnome-base/gnome-panel Enable access to Windows RDP protocol using net-misc/rdesktop Enable ssh plugin using x11-libs/vte diff --git a/net-misc/vinagre/vinagre-2.30.3.ebuild b/net-misc/vinagre/vinagre-2.30.3.ebuild deleted file mode 100644 index fcc7a4a5ec27..000000000000 --- a/net-misc/vinagre/vinagre-2.30.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.12 2014/01/05 17:27:53 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools gnome2 - -DESCRIPTION="VNC client for the GNOME desktop" -HOMEPAGE="http://www.gnome.org/projects/vinagre/" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="applet avahi +ssh +telepathy test" - -# Telepathy-glib version in tarball is wrong: -# https://bugzilla.gnome.org/show_bug.cgi?id=614716 -RDEPEND=">=dev-libs/glib-2.17:2 - dev-libs/dbus-glib - >=x11-libs/gtk+-2.16:2 - >=gnome-base/gconf-2.16 - >=net-libs/gtk-vnc-0.3.10 - >=gnome-base/gnome-keyring-1 - x11-libs/libX11 - applet? ( || ( gnome-base/gnome-panel[bonobo] =dev-libs/libxml2-2.6.31 - >=net-dns/avahi-0.6.22[dbus,gtk] ) - ssh? ( - >=dev-libs/libxml2-2.6.31 - >=x11-libs/vte-0.20:0 ) - telepathy? ( >=net-libs/telepathy-glib-0.10 )" - -DEPEND="${RDEPEND} - gnome-base/gnome-common - >=dev-lang/perl-5 - virtual/pkgconfig - >=dev-util/intltool-0.40 - app-text/scrollkeeper - app-text/gnome-doc-utils - test? ( ~app-text/docbook-xml-dtd-4.3 )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - G2CONF="${G2CONF} - --disable-scrollkeeper - $(use_enable avahi) - $(use_enable applet) - $(use_enable ssh) - $(use_enable telepathy)" -} - -src_prepare() { - # underlinking failure, bug #497116 - epatch "${FILESDIR}/${P}-gmodule.patch" - - rm missing || die # old missing script causes autoreconf warnings - eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - # Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed - rm -rf "${D}"/usr/share/doc/vinagre -} diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog index 6f33368e21d7..f35d29082507 100644 --- a/net-misc/vino/ChangeLog +++ b/net-misc/vino/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/vino # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.213 2014/09/07 13:50:29 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.214 2014/11/13 12:34:04 pacho Exp $ + + 13 Nov 2014; Pacho Ramos + -files/vino-2.26.2-autorestart-loop.patch, + -files/vino-3.6.2-clipboard-leak.patch, -files/vino-3.8.1-new-client.patch, + -vino-2.32.2-r2.ebuild: + Drop old (#508854) *vino-3.12.0-r1 (07 Sep 2014) diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest index 95fc9303a02d..420aa51da4a1 100644 --- a/net-misc/vino/Manifest +++ b/net-misc/vino/Manifest @@ -1,20 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX vino-2.26.2-autorestart-loop.patch 588 SHA256 e4c09b2a68a803eadb1b91f710ff6a9870a28cafef7856eb844806aec53c853e SHA512 afe4e2944f3d383df2675b49245f020a17893e8640f7efa41b9b00d5c5acf13fad2eb731000d45277a254a191c24b89e4fe79b35b90b26082af902a5c00d93a7 WHIRLPOOL 84837da94faea2c2c7c58f77d2478168d0cac1209e0923097f0ecd7b97cf22319245c3eef62a573e5f4775397214355f3ca358a849a08801e034fb842493dec7 -AUX vino-3.6.2-clipboard-leak.patch 1869 SHA256 74a222caaf49a5d9e2d2edb7aefa87fa78fec204dbb0ab88fa01a2cfa855bc7a SHA512 b7a4597dcaa248eef65fca44baf2862676eb59ed472553d0b66888f28435dc70272045009b98af03369da21982d98320b1d55e193cec93bdb891d21870d643c7 WHIRLPOOL b75b896906b107f26d7175144bf2d978327a5175a8fa4c88336aa55f7a81617fed8db672cad690af29b70869a2fdac4fd62e4f5b3de1c22779e32a5661e1aac9 -AUX vino-3.8.1-new-client.patch 1099 SHA256 e2508bf3e13125cf819c1ee779c10c9836fc39cf6b506a4fc39f1ee0f49228e3 SHA512 0318569a311bb6fb407804c321890efa87d536e3a935cabb7186bf3f809f3a42ba60dd9f02b9278a50ef7a9a3832800f7c5a5f30f6bb9902e36320fc8657fddb WHIRLPOOL 134f8cbc362db6047392d2f5281fa360b9bb8b13c89df84fbd0448dbefd14457c006058fe9efb00d9f91306b44d85d38ea550c56cfd7e108226b5ef9e71645f9 -DIST vino-2.32.2.tar.bz2 856440 SHA256 1260b1f7b647caff69db441dc13c992f843d9d75b9386ec07b724a5e30c6d4fa SHA512 1205341c83f296f93d948d3b0408a54e9a036abc15ad4e980e9abde8d24ab4a1639ea0d0898d768cf0a01e1ef9e916d907c58d4617534b0dc6860900e1a62a58 WHIRLPOOL 13ca83f6fee1f941d6d078202efae91879243862a0e6740b70511368e123a00cc52f681860ab0ef09e301081b5045327bf40800d68006ace634c6ff407bada10 DIST vino-3.12.0.tar.xz 751352 SHA256 86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b SHA512 0955d3446c33999c74b4f4225bef2750fc0384164a5d9675a6a3a571125f860f265b9f2d23541a6ad0eaa78d93a416f63402c84a2e631c60c467ca2b217a88cf WHIRLPOOL fb3c38c56987a29cbc454e75840144ba42fb5416495624681479611da9e578b6ed6c076ecc56738df40b1957a10d0ce362f6488e222524d688c74168675b1bc5 -EBUILD vino-2.32.2-r2.ebuild 2585 SHA256 5ea19fc2d5afab06e6ef7c6792af80fad63b7b99de483d66c0fbe61bfbece61f SHA512 8702fca746ba2da89ca4c7a191984a65b92673cd12c4cd9c3f42627eeb14baecc78ed7af02e4613d92ce707cc3987353e5a0795ecacb3d27cd298ef54300be77 WHIRLPOOL 4f5951fcd67fc1a0979e53c482679abee52135b4fa314e9ee551fc72c356e40d70170065e93b3e5897cad2c5e11fa5a8da531244b8732e3cfc94f53b4cec8223 EBUILD vino-3.12.0-r1.ebuild 1813 SHA256 6b54c56ea30da54c38e7ce79a0791cd6efaf9d94e3d934ad24b561a5162730c4 SHA512 2d57f39fabf8540560a9e9284d44393254a3cadd37046f1db03f62d84c182083e3f90da04476fedeade94666399736265879b5693a2209c71afc58a9409c9e1d WHIRLPOOL 6632bfab3d9c1cb8dbbfee91bc1211a03e37d89b2c97bfe5bf73cc214030818c8aed39e088caa13fefb2b7162460e16b16112ec1108dba3a892108c456a3e910 EBUILD vino-3.12.0.ebuild 1794 SHA256 5c686a1807a15beeeb7a54bc71fc1d7148409edb9dc62e849e8f9333154e4f6f SHA512 dea33187e3bb10219e5acc45f77c0ad51e514d4470eb94217ae4a6ab274929f3ce44b7d6f530ce61a2417a1496f6c27c66acb9b867420d8b2592ab2c3284278f WHIRLPOOL 516d6fbd6d3fb674bf5bebec7498df9aa6ad7c4054bca950db8d0ef44611655ad4e51f7c820b9a4901d7930da827971c1a68d33b5654d9d16359f8ed7043cc05 -MISC ChangeLog 26902 SHA256 f11da02ac63b14a54849726807610263b463c5b40e3f9fcbe202a0e3b2c661ac SHA512 6245fad629ace4a003d8770f4da8dd18d498364dbb5d4f48989e1c103edb37e2756b494cfe87bc6483190a9bd63761e272867f2bfb081f5f04a526a719fdcb34 WHIRLPOOL 8bc1f715f45d8ffcd865deb631b6db6f6ac5ebf3fd4c6d9d774f86e16f773b258f01a76bc25a5fe84ccfcb6fbbf171cba72babcbac814f61134af9fe169f21f3 +MISC ChangeLog 27119 SHA256 29ccee4d6797c11512aa75f689e7eab87e8900e65e94a9b17c8261b30d9f6b7f SHA512 50b587e8974f9ae2db063d3392c3fd918af7430b189e6129378d23baacd819e3a3d93cbc65d4f9480bbc2602683abbb5152463a26dfe1eb5f3062ef7cdf3a153 WHIRLPOOL b4bbfa9f08809aede111a1d3fc74061ef87c2f00d732ea7f28ac15245813da1fdeaeb6a7ec9ce3239b832219970a6cc080799beb108d9f52848f46bd7d45698d MISC metadata.xml 252 SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602 SHA512 62b9c645ac3ae60defe99902b3129005670072b77d5de362223714e0c443103f51234a62dbee476aca83aefd30506334c67daa3eed462b238445d4bcce5125ae WHIRLPOOL 201a4c535e7c8a4d0fa834b09a5765043a8edfe848a7c28c1a0f87e892165488c8a6ae67f9821e33d66ae3c9b6951bdfacb73f2f5db6d4ae946e7e8e92b86dbe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQMYqYACgkQCaWpQKGI+9SH8wCffzApGs0jy6mxfkaBsfYcbeCv -yeQAnj11kRVAYUQX6LUYu4pcx6/DuHhm -=PPta +iEYEAREIAAYFAlRkpT4ACgkQCaWpQKGI+9SXAgCfUngo1zSw0auqq7s9HAhOYu85 +AYEAn1R1TYTl7yU/TPa8z3TH9Dln4PIE +=8cv5 -----END PGP SIGNATURE----- diff --git a/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch b/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch deleted file mode 100644 index a2bce1871ce6..000000000000 --- a/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Disallow vino-server to register into the session since it is auto-started. -# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=277989 -# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=579355 ---- a/server/vino-server.desktop.in.in 2009-03-23 22:17:35.647373307 +0100 -+++ b/server/vino-server.desktop.in.in 2009-03-23 22:17:53.079875343 +0100 -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Remote Desktop - _Comment=GNOME Remote Desktop Server --Exec=@LIBEXECDIR@/vino-server -+Exec=@LIBEXECDIR@/vino-server --sm-disable - Icon=preferences-desktop-remote-desktop - OnlyShowIn=GNOME; - Terminal=false diff --git a/net-misc/vino/files/vino-3.6.2-clipboard-leak.patch b/net-misc/vino/files/vino-3.6.2-clipboard-leak.patch deleted file mode 100644 index c06bfd87b726..000000000000 --- a/net-misc/vino/files/vino-3.6.2-clipboard-leak.patch +++ /dev/null @@ -1,51 +0,0 @@ -From eb3752eed13473c4db20aedec14eb28de914abf0 Mon Sep 17 00:00:00 2001 -From: Huzaifa Sidhpurwala -Date: Mon, 17 Dec 2012 22:11:46 +0000 -Subject: [PATCH] Do not leak clipboard to unauthenticated clients - -vino_server_clipboard_cb() in vino-server.c is the callback which is -triggered when a clipboard copy event is fired. - -After doing some initial checks, (1. If there are any connected clients, -2. If the server is on hold etc), it converts the text to UTF-8 and then -passes it on to rfbSendServerCutText(). Here data is pasted to each -client, without verifying if the client is authenticated. - -The patch checks if the client is authenticated and only then it allows -the clipboard text to be sent to it. - -Fixes bug 678434. This is a security issue, and has been assigned -CVE-2012-4429: -http://www.openwall.com/lists/oss-security/2012/09/14/1 ---- - server/libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index 2d143fa..7dfbff9 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -1522,7 +1522,8 @@ rfbSendBell(rfbScreenInfoPtr rfbScreen) - - - /* -- * rfbSendServerCutText sends a ServerCutText message to all the clients. -+ * rfbSendServerCutText sends a ServerCutText message to all the authenticated -+ * clients. - */ - - void -@@ -1534,6 +1535,10 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { -+ /* Client is not authenticated, ignore. See GNOME bug 678434. */ -+ if (cl->state != RFB_NORMAL) -+ continue; -+ - sct.type = rfbServerCutText; - sct.length = Swap32IfLE(len); - if (WriteExact(cl, (char *)&sct, --- -1.8.0.2 - 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 deleted file mode 100644 index 0ec30408cb2c..000000000000 --- a/net-misc/vino/files/vino-3.8.1-new-client.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 860337231eaccfeed4f857afd0579546a260c23f Mon Sep 17 00:00:00 2001 -From: David King -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-2.32.2-r2.ebuild b/net-misc/vino/vino-2.32.2-r2.ebuild deleted file mode 100644 index 32fb345c8296..000000000000 --- a/net-misc/vino/vino-2.32.2-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.32.2-r2.ebuild,v 1.10 2014/03/01 22:24:52 mgorny Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -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 ipv6 jpeg gnome-keyring libnotify networkmanager ssl +telepathy zlib" - -RDEPEND=">=dev-libs/glib-2.17:2 - >=x11-libs/gtk+-2.20:2 - >=gnome-base/gconf-2:2 - >=sys-apps/dbus-1.2.3 - >=net-libs/libsoup-2.24:2.4 - dev-libs/libunique:1 - dev-libs/dbus-glib - x11-libs/libXext - x11-libs/libXtst - avahi? ( >=net-dns/avahi-0.6:=[dbus] ) - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( || ( gnome-base/libgnome-keyring =x11-libs/libnotify-0.4.4:= ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) - ssl? ( >=net-libs/gnutls-1:= ) - telepathy? ( >=net-libs/telepathy-glib-0.11.6 ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - virtual/pkgconfig - >=dev-util/intltool-0.40 - || ( - gnome-base/libgnome-keyring -