Pull upstream patch to stop vino forgetting it's password. Bug #162905

Package-Manager: portage-2.1.2-r5

5 files changed, 96 insertions, 8 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index e8b18e12866e..aea3ffa8370c 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.78 2007/01/21 20:26:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.79 2007/01/30 21:13:26 dang Exp $
+
+*vino-2.16.0-r1 (30 Jan 2007)
+
+  30 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/vino-2.16.0-keep-password.patch, +vino-2.16.0-r1.ebuild:
+  Pull upstream patch to stop vino forgetting it's password.  Bug #162905
 
   21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> vino-2.16.0.ebuild:
   Stable on IA64, bug 156662.
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 396a3d05e433..83621f957c68 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -13,20 +13,28 @@ AUX vino-2.13.5-as-needed.patch 358 RMD160 e8faabdeec90067e51ea41b3687a1b1833775
 MD5 66e2d98639476f282f00bb952bc70aba files/vino-2.13.5-as-needed.patch 358
 RMD160 e8faabdeec90067e51ea41b3687a1b1833775517 files/vino-2.13.5-as-needed.patch 358
 SHA256 b0e6f24d9b87452358e2f8ef1d65410bc9f150229661d073b998b8528e5f165d files/vino-2.13.5-as-needed.patch 358
+AUX vino-2.16.0-keep-password.patch 577 RMD160 920f17cee571e9654ba51916bdcef27a6fc5334d SHA1 5f6e41a980cc10eea019f262c004ba26e422868b SHA256 cf49f38acdb8ac2d46bad2c0b7d16c9b23ab7aaba2fa8b960f9a83b8c2f58fc8
+MD5 0eecfceb9fd17dcf0475399d6fb7ef40 files/vino-2.16.0-keep-password.patch 577
+RMD160 920f17cee571e9654ba51916bdcef27a6fc5334d files/vino-2.16.0-keep-password.patch 577
+SHA256 cf49f38acdb8ac2d46bad2c0b7d16c9b23ab7aaba2fa8b960f9a83b8c2f58fc8 files/vino-2.16.0-keep-password.patch 577
 DIST vino-2.13.5.tar.bz2 566620 RMD160 9daeb18df6d5cbbe3d993325c1ed0800327a7b68 SHA1 f5224a5f9445d86bacf742d0e5ffc9fc72204a35 SHA256 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f
 DIST vino-2.16.0.tar.bz2 593224 RMD160 047829b29e078ee46f3c3a16f25c88938e40d2c9 SHA1 d7f58b8bc9d56d6e40017fce124878a9711e058e SHA256 bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369
 EBUILD vino-2.13.5.ebuild 1965 RMD160 249503bb7f6de5785fa6543e7d519dbf46e05b9e SHA1 e905c3a4d74c49f3d261520f30d21902b4dd8b10 SHA256 5dda96ca59fe761a1be2ec4e96827740d3901062f36e4853686bbfc022c7b2a3
 MD5 61b3a8f87387caf600105102939840a0 vino-2.13.5.ebuild 1965
 RMD160 249503bb7f6de5785fa6543e7d519dbf46e05b9e vino-2.13.5.ebuild 1965
 SHA256 5dda96ca59fe761a1be2ec4e96827740d3901062f36e4853686bbfc022c7b2a3 vino-2.13.5.ebuild 1965
+EBUILD vino-2.16.0-r1.ebuild 1812 RMD160 7457c94e853aea26911a0d9a7f7d119c63ba2bfc SHA1 f6d406a4bd6afaf318d0d5a089a14c5ca4e45da9 SHA256 f3349f587c50d6464598f84d5ff470848bfff363669dc256f8eae9e88d156341
+MD5 3d562480d6afd2dd988059a07b64ffb9 vino-2.16.0-r1.ebuild 1812
+RMD160 7457c94e853aea26911a0d9a7f7d119c63ba2bfc vino-2.16.0-r1.ebuild 1812
+SHA256 f3349f587c50d6464598f84d5ff470848bfff363669dc256f8eae9e88d156341 vino-2.16.0-r1.ebuild 1812
 EBUILD vino-2.16.0.ebuild 1718 RMD160 674bd33a38c7004c83614654f89617c91dc941d3 SHA1 3606a92f8216397d8aef4fd75492092fc37f400f SHA256 266b1bdab09a1942d9f8c5d0481ca8449af865618130287673d22a993c00ab01
 MD5 801a64c6e8a10cd1b26b86d0528880bd vino-2.16.0.ebuild 1718
 RMD160 674bd33a38c7004c83614654f89617c91dc941d3 vino-2.16.0.ebuild 1718
 SHA256 266b1bdab09a1942d9f8c5d0481ca8449af865618130287673d22a993c00ab01 vino-2.16.0.ebuild 1718
-MISC ChangeLog 8689 RMD160 7f973e6c19730edc634882056e1b0c60e2d8f3b6 SHA1 204716430ee47923a6c98fdea89446bc6513c832 SHA256 9030668d58f558cbc4cbca9d4ea9f7297d433238b8082cab0263c0801a8da8e0
-MD5 a4eef4f6a7a9a10a06a1652db0083f80 ChangeLog 8689
-RMD160 7f973e6c19730edc634882056e1b0c60e2d8f3b6 ChangeLog 8689
-SHA256 9030668d58f558cbc4cbca9d4ea9f7297d433238b8082cab0263c0801a8da8e0 ChangeLog 8689
+MISC ChangeLog 8910 RMD160 727561b7568437cd18064e33cc51c1f1a45c13bd SHA1 0852d44cd4968ad54930a8224b1e4b6beb0a7f94 SHA256 61cadae6d2560c03675cd73e19c32049ba92a6b30c795f07a496aecc1e8b9c9f
+MD5 7efa3f19e5b2f2dfb39bf53bcecfd8c1 ChangeLog 8910
+RMD160 727561b7568437cd18064e33cc51c1f1a45c13bd ChangeLog 8910
+SHA256 61cadae6d2560c03675cd73e19c32049ba92a6b30c795f07a496aecc1e8b9c9f ChangeLog 8910
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -37,10 +45,13 @@ SHA256 87de5077ff6419015a562ac4c24d644920d11a8a41dd92882136eb2271d41583 files/di
 MD5 3ff9dd727e07186ba6d82bc647fb0213 files/digest-vino-2.16.0 238
 RMD160 fb544c1bf736f75b2a6e88369fe3e0b5ae83e1c4 files/digest-vino-2.16.0 238
 SHA256 9414b1c56731cdf06cbac1634a36cc9a6b7377be0dca62003dae62781d8047c6 files/digest-vino-2.16.0 238
+MD5 3ff9dd727e07186ba6d82bc647fb0213 files/digest-vino-2.16.0-r1 238
+RMD160 fb544c1bf736f75b2a6e88369fe3e0b5ae83e1c4 files/digest-vino-2.16.0-r1 238
+SHA256 9414b1c56731cdf06cbac1634a36cc9a6b7377be0dca62003dae62781d8047c6 files/digest-vino-2.16.0-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFs8xLugEuf3OQ0akRAlNDAKCHDajzphunMncrJ9sf2lYAxK7hkwCfaIkX
-B4fU/7rSkUfwpycVtlplBN4=
-=sN0E
+iD8DBQFFv7T3omPajV0RnrERAho6AKCDsgGjiETkO7cxma1X7qZ3wz2hHACcD2md
+L0D84EH9Wbosr21J/b3kb78=
+=dYl9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/files/digest-vino-2.16.0-r1 b/net-misc/vino/files/digest-vino-2.16.0-r1
new file mode 100644
index 000000000000..78f3c8779f63
--- /dev/null
+++ b/net-misc/vino/files/digest-vino-2.16.0-r1
@@ -0,0 +1,3 @@
+MD5 89937e6d6cd8f658d037da0a7cfd3f4e vino-2.16.0.tar.bz2 593224
+RMD160 047829b29e078ee46f3c3a16f25c88938e40d2c9 vino-2.16.0.tar.bz2 593224
+SHA256 bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369 vino-2.16.0.tar.bz2 593224
diff --git a/net-misc/vino/files/vino-2.16.0-keep-password.patch b/net-misc/vino/files/vino-2.16.0-keep-password.patch
new file mode 100644
index 000000000000..9afc879b046a
--- /dev/null
+++ b/net-misc/vino/files/vino-2.16.0-keep-password.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN vino-2.16.0.orig/server/vino-prefs.c vino-2.16.0/server/vino-prefs.c
+--- vino-2.16.0.orig/server/vino-prefs.c	2006-08-14 04:47:27.000000000 -0400
++++ vino-2.16.0/server/vino-prefs.c	2007-01-30 15:38:12.000000000 -0500
+@@ -306,7 +306,6 @@ vino_prefs_init (gboolean view_only)
+ 					       VINO_PREFS_VNC_PASSWORD,
+ 					       NULL);
+   dprintf (PREFS, "Encoded password: %s\n", vino_vnc_password ? vino_vnc_password : "(null)");
+-  g_free (vino_vnc_password);
+ 
+   vino_listeners [i] =
+     gconf_client_notify_add (vino_client,
diff --git a/net-misc/vino/vino-2.16.0-r1.ebuild b/net-misc/vino/vino-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..3729d3df09e3
--- /dev/null
+++ b/net-misc/vino/vino-2.16.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.16.0-r1.ebuild,v 1.1 2007/01/30 21:13:26 dang Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=1.9
+inherit eutils gnome2 autotools
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="avahi crypt gnutls jpeg zlib"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.5.2
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	|| ( x11-libs/libXtst virtual/x11 )
+	avahi? ( >=net-dns/avahi-0.6 )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
+	gnutls? ( >=net-libs/gnutls-1 )
+	jpeg? ( media-libs/jpeg )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi dbus; then
+		einfo "avahi support in vino requires USE=dbus in avahi"
+		die "Please rebuild net-dns/avahi with USE=dbus"
+	fi
+	G2CONF="$(use_with jpeg) $(use_enable gnutls) $(use_enable crypt gcrypt) \
+			$(use_with zlib) $(use_with zlib libz) $(use_enable avahi) \
+			--enable-session-support"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Don't forget server password.  Bug #162905
+	epatch "${FILESDIR}"/${P}-keep-password.patch
+
+	cp aclocal.m4 old_macros.m4
+	# rename some things so they get regenerated and we don't get a mismatch
+	sed -i -e 's:AM_AUTOMAKE_VERSION:AM_AUTOMAKE_VERSION2:' old_macros.m4
+	sed -i -e 's:AM_INIT_AUTOMAKE:AM_INIT_AUTOMAKE2:' old_macros.m4
+	sed -i -e 's:AM_SET_CURRENT_AUTOMAKE_VERSION:AM_SET_CURRENT_AUTOMAKE_VERSION2:' old_macros.m4
+	AT_M4DIR="." eautoreconf
+}