--- vino-2.28.2.orig/debian/watch +++ vino-2.28.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/vino/([\d\.]+)[02468]/vino-([\d\.]+)\.tar\.gz --- vino-2.28.2.orig/debian/control +++ vino-2.28.2/debian/control @@ -0,0 +1,56 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: vino +Section: gnome +Priority: optional +Maintainer: Debian GNOME Maintainers +Uploaders: Emilio Pozuelo Monfort , Josselin Mouette , Sebastian Dröge +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + gnome-pkg-tools (>= 0.10), + intltool (>= 0.35.0), + libgtk2.0-dev (>= 2.16.0), + libglib2.0-dev (>= 2.17.0), + libdbus-glib-1-dev, + libdbus-1-dev (>= 1.2.3), + libsoup2.4-dev (>= 2.24.0), + libgnomeui-dev (>= 2.6.1.1-4), + libgconf2-dev, + libnotify-dev (>= 0.4.4), + libnotify-dev-gtk2.10, + network-manager-dev (>= 0.7) [linux-any], + libgnome-keyring-dev, + libpango1.0-dev, + libxt-dev, + libx11-dev, + libgnutls-dev (>= 1.0.0), + libgcrypt11-dev (>= 1.1.90), + libxdamage-dev, + libxfixes-dev, + libxext-dev, + libxtst-dev, + libavahi-client-dev (>= 0.6), + libavahi-glib-dev (>= 0.6), + libjpeg-dev, + zlib1g-dev, + libunique-dev (>= 1.0.0), + libtelepathy-glib-dev (>= 0.7.31) +Standards-Version: 3.9.0 +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vino +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vino + +Package: vino +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: gvfs +Suggests: vinagre, + gnome-user-guide | gnome2-user-guide (>= 2.8.1) +Description: VNC server for GNOME + VNC is a protocol that allows remote display of a user's desktop. This + package provides a VNC server that integrates with GNOME, allowing you + to export your running desktop to another computer for remote use or + diagnosis. --- vino-2.28.2.orig/debian/copyright +++ vino-2.28.2/debian/copyright @@ -0,0 +1,138 @@ +This package was debianized by Matthew Garrett on +Tue, 1 Jun 2004 03:41:45 +0100. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/vino/ + +Upstream Authors: + Mark McLoughlin + Calum Benson + Federico Mena Quintero + Sebastien Estienne + Shaya Potter + Steven Zhang + Srirama Sharma + Jonh Wendell + + +Copyright: + + Copyright (c) 1987, 1994 X Consortium + Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge + Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. + Copyright (C) 2000-2002 Constantin Kaplinsky. All Rights Reserved. + Copyright (C) 2000 - Eazel, Inc. + Copyright (C) 2000 heXoNet Support GmbH, D-66424 Homburg. + Copyright (C) 2000 Tridia Corporation. All Rights Reserved. + Copyright (c) 2001 James "Wez" Weatherall, Johannes E. Schindelin + Copyright (c) 2002-2003 Karl J. Runge + Copyright (C) 2002-2004 Marco Pesenti Gritti + Copyright (C) 2002 RealVNC Ltd. All Rights Reserved. + Copyright (C) 2003, 2008 Sun Microsystems, Inc. + Copyright (C) 2004-2006 William Jon McCann + Copyright (C) 2004 Christian Persch + Copyright (C) 2004 Novell, Inc. + Copyright (C) 2004 Red Hat, Inc. + Copyright (C) 2005-2006 Christian Hammond + Copyright (c) 2005-2008 Thomas Bernard + Copyright (C) 2005 Ethium, Inc. + Copyright (C) 2005 - Paolo Maggi + Copyright (C) 2006-2009 Jonh Wendell. + Copyright (C) 2008 Jorge Pereira + + +License: + + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file '/usr/share/common-licenses/GPL-2' + + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + +On Debian systems, the complete text of the GNU Lesser General Public +License can be found in the file '/usr/share/common-licenses/LGPL-2.1' + + + * vino-message-box.c is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * vino-message-box.c is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + +On Debian systems, the complete text of the GNU General Public +License can be found in the file '/usr/share/common-licenses/GPL-3' + + + +server/libvncserver/rfb/keysym.h is licensed under the following terms: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +server/miniupnp/bsdqueue.h and server/miniupnp/minixml.c are licensed +under the BSD license. The full text of the license can be found in +/usr/share/common-licenses/BSD --- vino-2.28.2.orig/debian/docs +++ vino-2.28.2/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- vino-2.28.2.orig/debian/control.in +++ vino-2.28.2/debian/control.in @@ -0,0 +1,51 @@ +Source: vino +Section: gnome +Priority: optional +Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + gnome-pkg-tools (>= 0.10), + intltool (>= 0.35.0), + libgtk2.0-dev (>= 2.16.0), + libglib2.0-dev (>= 2.17.0), + libdbus-glib-1-dev, + libdbus-1-dev (>= 1.2.3), + libsoup2.4-dev (>= 2.24.0), + libgnomeui-dev (>= 2.6.1.1-4), + libgconf2-dev, + libnotify-dev (>= 0.4.4), + libnotify-dev-gtk2.10, + network-manager-dev (>= 0.7) [linux-any], + libgnome-keyring-dev, + libpango1.0-dev, + libxt-dev, + libx11-dev, + libgnutls-dev (>= 1.0.0), + libgcrypt11-dev (>= 1.1.90), + libxdamage-dev, + libxfixes-dev, + libxext-dev, + libxtst-dev, + libavahi-client-dev (>= 0.6), + libavahi-glib-dev (>= 0.6), + libjpeg-dev, + zlib1g-dev, + libunique-dev (>= 1.0.0), + libtelepathy-glib-dev (>= 0.7.31) +Standards-Version: 3.9.0 +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vino +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vino + +Package: vino +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: gvfs +Suggests: vinagre, + gnome-user-guide | gnome2-user-guide (>= 2.8.1) +Description: VNC server for GNOME + VNC is a protocol that allows remote display of a user's desktop. This + package provides a VNC server that integrates with GNOME, allowing you + to export your running desktop to another computer for remote use or + diagnosis. --- vino-2.28.2.orig/debian/changelog +++ vino-2.28.2/debian/changelog @@ -0,0 +1,349 @@ +vino (2.28.2-2) unstable; urgency=low + + [ Josselin Mouette ] + * Drop type-handling usage. Closes: #587865. + * Bump standards version accordingly. + + [ Jordi Mallach ] + * Set the GNOME team as primary maintainer. + + [ Josselin Mouette ] + * 11_hurd_maxhostnamelen.patch: updated to not just crash dumbly. + Closes: #600704, #570615. + + -- Josselin Mouette Sat, 06 Nov 2010 22:37:41 +0100 + +vino (2.28.2-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/patches/11_hurd_maxhostnamelen.patch: + - Fix build on GNU/Hurd by malloc'ing enough memory for the hostname + rather than using MAXHOSTNAMELEN, which is undefined on some OS'es. + + [ Sebastian Dröge ] + * Ack NMU 2.28.1-2.1. + * New upstream bugfix release: + * debian/control.in: + + Update Standards-Version to 3.8.4. + + -- Sebastian Dröge Wed, 14 Apr 2010 07:09:10 +0200 + +vino (2.28.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/01_ipv6-fix.patch: New, use two listening sockets + (one for IPv4, one for IPv6) and disable use of ipv4-mapped IPv6 + addresses. (Closes: #561440) + + -- Thorsten Glaser Sat, 23 Jan 2010 13:01:31 +0000 + +vino (2.28.1-2) unstable; urgency=low + + * Only require NM on Linux architectures. + * Pass configure argument to store the server password in the keyring. + + -- Josselin Mouette Fri, 20 Nov 2009 11:24:03 +0100 + +vino (2.28.1-1) unstable; urgency=low + + * New upstream release. + + -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 20:45:56 +0200 + +vino (2.28.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * Important update to build-dependencies, adds NM support. + + [ Emilio Pozuelo Monfort ] + * New upstream release. + - debian/control.in: + + Bump libgtk2.0-dev build dependency to >= 2.16.0. + + Build depend on libtelepathy-glib-dev for Telepathy Tubes support. + + Remove libglade2-dev build dependency, vino uses GtkBuilder now. + * Standards-Version is 3.8.3, no changes needed. + * debian/rules: + - Remove unneeded clean rule, those files are cleaned by the upstream + Makefiles now. + + -- Emilio Pozuelo Monfort Mon, 21 Sep 2009 21:19:16 +0200 + +vino (2.26.2-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * New upstream release. + * debian/patches/01_localonly_ipv4.patch: removed, fixed upstream. + * Update build-dependencies. + * Standards-Version is 3.8.1, no changes needed. + * debian/copyright: rewritten + * Update Vcs-Browser and Vcs-Svn to point to the unstable branch. + * Install the autostart file in /usr/share/gnome/autostart. + + -- Josselin Mouette Thu, 11 Jun 2009 00:04:45 +0200 + +vino (2.24.1-3) unstable; urgency=low + + * 02_server_sm-disable.patch: new patch. Do not register the server to + the session, otherwise it will be loaded even though it is not + necessary. Closes: #518862. + + -- Josselin Mouette Thu, 09 Apr 2009 18:43:32 +0200 + +vino (2.24.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Thu, 05 Mar 2009 15:28:24 +0100 + +vino (2.24.1-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * New upstream release + - Update build dependencies. + - Enable libunique support. Build depend on libunique-dev. + * debian/watch: Only track stable releases. Don't uupdate. + * debian/control: + - Update Standards-Version to 3.8.0. + - Add Vcs-* fields. + * debian/patches, debian/rules: + - Remove patch system, there are no patches to apply. + + [ Josselin Mouette ] + * Recommend gvfs for gtk_show_uri. + * Use simple-patchsys. + * 01_localonly_ipv4.patch: patch from Andreas Henriksson to work with + IPv4 when only local connections are accepted. Closes: #480863. + + -- Josselin Mouette Wed, 10 Dec 2008 18:35:27 +0100 + +vino (2.22.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 27 May 2008 09:06:36 +0200 + +vino (2.22.1-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * Suggest vinagre instead of tsclient. + + [ Sebastian Dröge ] + * New upstream bugfix release. + + -- Sebastian Dröge Mon, 07 Apr 2008 14:56:19 +0200 + +vino (2.22.0-1) unstable; urgency=low + + * New upstream stable release: + + debian/control.in: + - Updated Standards-Version to 3.7.3, no additional changes needed. + - Update build dependencies. + + -- Sebastian Dröge Sat, 15 Mar 2008 11:54:09 +0100 + +vino (2.20.1-1) unstable; urgency=low + + * New upstream release, with translation updates only. + + -- Sebastian Dröge Thu, 25 Oct 2007 13:55:08 +0200 + +vino (2.20.0-1) unstable; urgency=low + + [ Loic Minier ] + * Disable GNOME Keyring support as per discussion in GNOME #344839; + closes: #421222. + + [ Josselin Mouette ] + * Remove outdated README.Debian. + * Disable session support as it is now included in gnome-session. + * Remove postinst, useless as vino doesn't use bonobo anymore. + + [ Sebastian Dröge ] + * New upstream release: + + debian/control.in: + - Raise build dependency for libnotify-dev. + + -- Sebastian Dröge Mon, 17 Sep 2007 16:05:33 +0200 + +vino (2.18.1-2) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + + -- Loic Minier Mon, 16 Apr 2007 13:40:03 +0200 + +vino (2.18.1-1) experimental; urgency=low + + * Drop TCP wrappers LDFLAGS and CFLAGS, not supported upstream anymore. + * New upstream release. + + -- Loic Minier Mon, 09 Apr 2007 17:46:55 +0200 + +vino (2.18.0-1) experimental; urgency=low + + * New upstream major stable release. + - Bump up build-deps to libglib2.0-dev >= 2.12.0, libgtk2.0-dev >= 2.10.0. + - Add build-deps: libdbus-glib-1-dev, libnotify-dev (>= 0.4.3), + libnotify-dev-gtk2.10 (vino uses + notify_notification_new_with_status_icon()), libgnome-keyring-dev. + - Pass --enable-libnotify and --enable-gnome-keyring to configure. + - Drop patch 01_fix_password_free, merged upstream. + - Drop patch 10_fix-corre-encoding, merged upstream. + - Drop relibtoolizing patch, upstream used a Debian libtool. + * Fix watch file to track all stable branches. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Add http:// to URL in copyright. + * Bump up Debhelper compatibility level to 5. + * Drop useless debian/dirs. + * Add -z defs to LDFLAGS. + + -- Loic Minier Sun, 08 Apr 2007 11:00:10 +0200 + +vino (2.16.0-5) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Bump insufficient build-dep: cdbs (>= 0.4.41) for LDFLAGS. + + -- Loic Minier Wed, 10 Jan 2007 11:03:00 +0100 + +vino (2.16.0-4) unstable; urgency=low + + * Enable session support, thanks Vincent Bernat (closes: #267118). + + -- Josselin Mouette Thu, 28 Dec 2006 11:02:52 +0100 + +vino (2.16.0-3) unstable; urgency=medium + + * New patch, 01_fix_password_free, fixes password authentication in some + cases; taken from Ubuntu #65795; from a CVS fix; thanks Sander Roobol; + closes: #400108, #401346. + * Build with tcp wrappers support; closes: #384060. + - Build-depend on libwrap0-dev. + - Link with -lwrap. + - Define USE_LIBWRAP for cpp. + + -- Loic Minier Wed, 6 Dec 2006 09:57:31 +0100 + +vino (2.16.0-2) unstable; urgency=medium + + * New patch, 10_fix-corre-encoding, to fix an issue with the CoRRE encoding + saying its only sending a single rectangle, but sending lots more; thanks + Detlef Schmicker; from upstream CVS; closes: #395994. + + -- Loic Minier Sun, 29 Oct 2006 22:20:58 +0100 + +vino (2.16.0-1) unstable; urgency=low + + * New upstream release. + - Relibtoolize and rename relibtoolizing patch to 70_relibtoolize. + - Drop patch 01_no_client_on_hold_loop, merged upstream. + + -- Loic Minier Wed, 25 Oct 2006 12:10:27 +0200 + +vino (2.13.5-3) unstable; urgency=low + + * Suggest gnome-user-guide | gnome2-user-guide, thanks Noèl Köthe. + (Closes: #382044) + * Bump up Standards-Version to 3.7.2. + + -- Loic Minier Tue, 8 Aug 2006 16:49:44 +0200 + +vino (2.13.5-2) unstable; urgency=low + + * debian/patches/01_no_client_on_hold_loop.patch: + - patch by Gary Coady + - The IO socket for clients on hold should not be included in the + GTK main loop. Ubuntu: #31037 + * debian/rules: + - build with LDFLAGS="-Wl,-O1 -Wl,--as-needed" + + -- Sebastien Bacher Sun, 9 Jul 2006 12:43:19 +0200 + +vino (2.13.5-1) unstable; urgency=low + + [ Jordi Mallach ] + * New upstream release. + * debian/control.in: add avahi and libxdamage to Build-Depends + (closes: #341581). + * debian/rules: enable avahi support. + * debian/watch: added. + + [ J.H.M. Dassen (Ray) ] + * [patches/00_relibtoolise.patch] New, do away with unneeded direct + dependencies. + + -- Jordi Mallach Thu, 30 Mar 2006 00:28:57 +0200 + +vino (2.12.0-1) unstable; urgency=low + + * New upstream version. + - should help problems with shift key (closes: #316977). + * debian/control.in: Suggest tsclient. + + -- Jordi Mallach Mon, 24 Oct 2005 12:01:39 +0200 + +vino (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/vino.postinst: fix bashism (closes: #301000). + * ACK Non-maintainer upload, thanks djpig! (closes: #299308) + + -- Jordi Mallach Tue, 7 Jun 2005 22:31:38 +0200 + +vino (2.10.0-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - set myself as primary maintainer. + - build-depend on cdbs and update debhelper to the minimum required + version. + * debian/rules: move to cdbs. + + -- Jordi Mallach Mon, 9 May 2005 16:07:57 +0200 + +vino (2.8.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Recompile to get rid of libhowl0 dependency (Closes: #299308) + + -- Frank Lichtenheld Fri, 18 Mar 2005 22:57:04 +0100 + +vino (2.8.1-1) unstable; urgency=low + + * New upstream version + * Add suggests on gnome2-user-guide - the vino docs are in there + + -- Matthew Garrett Tue, 30 Nov 2004 14:32:48 +0000 + +vino (2.7.91-1) unstable; urgency=medium + + * New upstream version + * Tightened build-depends (closes: #263662) + + -- Matthew Garrett Thu, 19 Aug 2004 16:24:55 +0100 + +vino (0.14-4) unstable; urgency=low + + * Add libxtst-dev to the build-depends (closes: #259705) + + -- Matthew Garrett Fri, 16 Jul 2004 11:53:03 +0100 + +vino (0.14-3) unstable; urgency=low + + * Build against packages that actually exist. Je suis un cretin. + (closes #259041) + + -- Matthew Garrett Tue, 13 Jul 2004 12:25:37 +0100 + +vino (0.14-2) unstable; urgency=low + + * Avoid conflicting icon names (closes: #257943) + + -- Matthew Garrett Tue, 10 Jul 2004 19:26:58 +0100 + +vino (0.14-1) unstable; urgency=low + + * Initial Release (closes: #231269) + + -- Matthew Garrett Tue, 1 Jun 2004 03:41:45 +0100 --- vino-2.28.2.orig/debian/compat +++ vino-2.28.2/debian/compat @@ -0,0 +1 @@ +5 --- vino-2.28.2.orig/debian/rules +++ vino-2.28.2/debian/rules @@ -0,0 +1,23 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-avahi \ + --enable-ipv6 \ + --enable-libnotify \ + --enable-gnome-keyring=yes + +# drop unneeded ELF deps +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +binary-install/vino:: + # Move the autostart file to /usr/share/gnome/autostart + mkdir -p debian/vino/usr/share/gnome/autostart + mv debian/vino/etc/xdg/autostart/vino-server.desktop \ + debian/vino/usr/share/gnome/autostart + cd debian/vino && rmdir -p etc/xdg/autostart --- vino-2.28.2.orig/debian/patches/01_ipv6-fix.patch +++ vino-2.28.2/debian/patches/01_ipv6-fix.patch @@ -0,0 +1,69 @@ +--- server/libvncserver/sockets.c.orig 2009-05-12 11:39:33.000000000 +0000 ++++ server/libvncserver/sockets.c 2010-01-23 13:00:12.000000000 +0000 +@@ -578,6 +578,7 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre + if(netIface == NULL || strlen(netIface) == 0) + { + #ifdef ENABLE_IPV6 ++ int sock6 = -1; + struct sockaddr_in6 s6; + + memset(&s6, 0, sizeof(s6)); +@@ -585,10 +586,10 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre + s6.sin6_port = htons(port); + s6.sin6_addr = in6addr_any; + +- sock = NewSocketListenTCP ((struct sockaddr*)&s6, sizeof(s6)); +- rfbLog("Listening IPv{4,6}://*:%d\n", port); ++ sock6 = NewSocketListenTCP ((struct sockaddr*)&s6, sizeof(s6)); ++ rfbLog("Listening IPv6://[::]:%d\n", port); + #endif +- if(sock < 0) { ++ + struct sockaddr_in s4; + + memset(&s4, 0, sizeof(s4)); +@@ -598,15 +599,23 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre + + sock = NewSocketListenTCP ((struct sockaddr*)&s4, sizeof(s4)); + rfbLog("Listening IPv4://0.0.0.0:%d\n", port); +- } + ++#ifdef ENABLE_IPV6 ++ if(sock6 > 0) { ++ psock[*ptot] = sock6; ++ *ptot += 1; ++ } ++#endif + if(sock > 0) { +- psock[0] = sock; +- *ptot = 1; +- return TRUE; ++ psock[*ptot] = sock; ++ *ptot += 1; + } + +- rfbLog("Problems in NewSocketListenTCP(), sock=%d\n", sock); ++ if (*ptot) ++ return TRUE; ++ ++ /* no need to log sock/sock6, both are -1 here */ ++ rfbLog("Problems in NewSocketListenTCP()\n"); + return FALSE; + } + +@@ -676,6 +685,15 @@ NewSocketListenTCP(struct sockaddr *addr + return -1; + } + ++#ifdef ENABLE_IPV6 ++ if (addr->sa_family == AF_INET6) { ++#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) ++ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&one, sizeof(one)); ++ /* we cannot really check for errors here */ ++#endif ++ } ++#endif ++ + if (bind(sock, addr, len) < 0) { + close(sock); + return -1; --- vino-2.28.2.orig/debian/patches/02_server_sm-disable.patch +++ vino-2.28.2/debian/patches/02_server_sm-disable.patch @@ -0,0 +1,11 @@ +--- server/vino-server.desktop.in.in.orig 2009-03-23 22:17:35.647373307 +0100 ++++ 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 --- vino-2.28.2.orig/debian/patches/11_hurd_maxhostnamelen.patch +++ vino-2.28.2/debian/patches/11_hurd_maxhostnamelen.patch @@ -0,0 +1,150 @@ +diff -pruN vino-2.28.1.orig/server/miniupnp/miniupnpc.c vino-2.28.1/server/miniupnp/miniupnpc.c +--- vino-2.28.1.orig/server/miniupnp/miniupnpc.c 2009-04-18 15:22:24.000000000 +0200 ++++ vino-2.28.1/server/miniupnp/miniupnpc.c 2010-11-06 22:53:47.045834645 +0100 +@@ -13,7 +13,6 @@ + #include + #define snprintf _snprintf + #define strncasecmp memicmp +-#define MAXHOSTNAMELEN 64 + #else + #include + #include +@@ -132,7 +131,7 @@ int simpleUPnPcommand(int s, const char + char * buffer, int * bufsize) + { + struct sockaddr_in dest; +- char hostname[MAXHOSTNAMELEN+1]; ++ char *hostname; + unsigned short port = 0; + char * path; + char soapact[128]; +@@ -206,7 +205,7 @@ int simpleUPnPcommand(int s, const char + strncpy(p, ">\r\n", + soapbody + sizeof(soapbody) - p); + } +- if(!parseURL(url, hostname, &port, &path)) return -1; ++ if(!parseURL(url, &hostname, &port, &path)) return -1; + if(s<0) + { + s = socket(PF_INET, SOCK_STREAM, 0); +@@ -214,6 +213,7 @@ int simpleUPnPcommand(int s, const char + { + PRINT_SOCKET_ERROR("socket"); + *bufsize = 0; ++ free (hostname); + return -1; + } + dest.sin_family = AF_INET; +@@ -224,11 +224,13 @@ int simpleUPnPcommand(int s, const char + PRINT_SOCKET_ERROR("connect"); + closesocket(s); + *bufsize = 0; ++ free (hostname); + return -1; + } + } + + n = soapPostSubmit(s, path, hostname, port, soapact, soapbody); ++ free (hostname); + if(n<=0) { + #ifdef DEBUG + printf("Error sending SOAP request\n"); +diff -pruN vino-2.28.1.orig/server/miniupnp/miniwget.c vino-2.28.1/server/miniupnp/miniwget.c +--- vino-2.28.1.orig/server/miniupnp/miniwget.c 2009-04-18 15:22:24.000000000 +0200 ++++ vino-2.28.1/server/miniupnp/miniwget.c 2010-11-06 22:58:12.869836079 +0100 +@@ -12,7 +12,6 @@ + #ifdef WIN32 + #include + #include +-#define MAXHOSTNAMELEN 64 + #define MIN(x,y) (((x)<(y))?(x):(y)) + #define snprintf _snprintf + #define herror +@@ -148,14 +147,14 @@ miniwget2(const char * url, const char * + /* parseURL() + * arguments : + * url : source string not modified +- * hostname : hostname destination string (size of MAXHOSTNAMELEN+1) ++ * hostname : hostname destination string (must be freed by the caller if there was no error) + * port : port (destination) + * path : pointer to the path part of the URL + * + * Return values : + * 0 - Failure + * 1 - Success */ +-int parseURL(const char * url, char * hostname, unsigned short * port, char * * path) ++int parseURL(const char * url, char ** hostname, unsigned short * port, char * * path) + { + char * p1, *p2, *p3; + p1 = strstr(url, "://"); +@@ -169,15 +168,18 @@ int parseURL(const char * url, char * ho + p3 = strchr(p1, '/'); + if(!p3) + return 0; +- memset(hostname, 0, MAXHOSTNAMELEN + 1); + if(!p2 || (p2>p3)) + { +- strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p3-p1))); ++ *hostname = malloc ((int)(p3-p1) + 1); ++ strncpy(*hostname, p1, (int)(p3-p1)); ++ (*hostname)[(int)(p3-p1)] = '\0'; + *port = 80; + } + else + { +- strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1))); ++ *hostname = malloc ((int)(p2-p1) + 1); ++ strncpy(*hostname, p1, (int)(p2-p1)); ++ (*hostname)[(int)(p2-p1)] = '\0'; + *port = 0; + p2++; + while( (*p2 >= '0') && (*p2 <= '9')) +@@ -196,11 +198,14 @@ void * miniwget(const char * url, int * + unsigned short port; + char * path; + /* protocol://host:port/chemin */ +- char hostname[MAXHOSTNAMELEN+1]; ++ char *hostname; ++ void *ret; + *size = 0; +- if(!parseURL(url, hostname, &port, &path)) ++ if(!parseURL(url, &hostname, &port, &path)) + return NULL; +- return miniwget2(url, hostname, port, path, size, 0, 0); ++ ret = miniwget2(url, hostname, port, path, size, 0, 0); ++ free (hostname); ++ return ret; + } + + void * miniwget_getaddr(const char * url, int * size, char * addr, int addrlen) +@@ -208,12 +213,15 @@ void * miniwget_getaddr(const char * url + unsigned short port; + char * path; + /* protocol://host:port/chemin */ +- char hostname[MAXHOSTNAMELEN+1]; ++ char *hostname; ++ void *ret; + *size = 0; + if(addr) + addr[0] = '\0'; +- if(!parseURL(url, hostname, &port, &path)) ++ if(!parseURL(url, &hostname, &port, &path)) + return NULL; +- return miniwget2(url, hostname, port, path, size, addr, addrlen); ++ ret = miniwget2(url, hostname, port, path, size, addr, addrlen); ++ free (hostname); ++ return ret; + } + +diff -pruN vino-2.28.1.orig/server/miniupnp/miniwget.h vino-2.28.1/server/miniupnp/miniwget.h +--- vino-2.28.1.orig/server/miniupnp/miniwget.h 2009-04-18 15:22:24.000000000 +0200 ++++ vino-2.28.1/server/miniupnp/miniwget.h 2010-11-06 22:54:21.026344248 +0100 +@@ -18,7 +18,7 @@ LIBSPEC void * miniwget(const char *, in + + LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int); + +-int parseURL(const char *, char *, unsigned short *, char * *); ++int parseURL(const char *, char **, unsigned short *, char * *); + + #ifdef __cplusplus + }