diff -Nru vino-3.3.3/debian/changelog vino-3.3.3/debian/changelog --- vino-3.3.3/debian/changelog 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/changelog 2012-01-26 15:26:57.000000000 +0000 @@ -1,3 +1,12 @@ +vino (3.3.3-0ubuntu2) precise; urgency=low + + * debian/patches/05_use-system-miniupnpc.patch: + - update to the current libminiupnpc abi, the previous version was still + using the source .h copies and the functions prototypes and code were + different from the runtime (lp: #840696, #841384, #854512, #903879). + + -- Sebastien Bacher Thu, 26 Jan 2012 16:26:41 +0100 + vino (3.3.3-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru vino-3.3.3/debian/control vino-3.3.3/debian/control --- vino-3.3.3/debian/control 2011-12-20 06:04:33.000000000 +0000 +++ vino-3.3.3/debian/control 2012-01-26 15:26:59.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jordi Mallach , Michael Biebl , Sjoerd Simons +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Michael Biebl , Sjoerd Simons Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), gnome-common, diff -Nru vino-3.3.3/debian/patches/02_server_sm-disable.patch vino-3.3.3/debian/patches/02_server_sm-disable.patch --- vino-3.3.3/debian/patches/02_server_sm-disable.patch 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/patches/02_server_sm-disable.patch 2012-01-26 15:26:57.000000000 +0000 @@ -1,7 +1,7 @@ -Index: vino-3.2.0/server/vino-server.desktop.in.in +Index: vino-3.3.3/server/vino-server.desktop.in.in =================================================================== ---- vino-3.2.0.orig/server/vino-server.desktop.in.in 2011-07-14 20:20:13.000000000 +0200 -+++ vino-3.2.0/server/vino-server.desktop.in.in 2011-09-28 16:08:38.995185112 +0200 +--- vino-3.3.3.orig/server/vino-server.desktop.in.in 2011-07-14 20:20:13.000000000 +0200 ++++ vino-3.3.3/server/vino-server.desktop.in.in 2012-01-26 16:19:46.208307892 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] _Name=Desktop Sharing diff -Nru vino-3.3.3/debian/patches/05_use-system-miniupnpc.patch vino-3.3.3/debian/patches/05_use-system-miniupnpc.patch --- vino-3.3.3/debian/patches/05_use-system-miniupnpc.patch 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/patches/05_use-system-miniupnpc.patch 2012-01-26 15:26:57.000000000 +0000 @@ -3,10 +3,10 @@ https://trac.transmissionbt.com/ticket/4323 for similar code Author: Jeremy Bicha Forwarded: no -Index: vino-3.2.2/Makefile.am +Index: vino-3.3.3/Makefile.am =================================================================== ---- vino-3.2.2.orig/Makefile.am 2011-10-24 17:36:19.000000000 +0200 -+++ vino-3.2.2/Makefile.am 2011-11-15 21:50:01.974331566 +0100 +--- vino-3.3.3.orig/Makefile.am 2011-10-24 17:36:19.000000000 +0200 ++++ vino-3.3.3/Makefile.am 2012-01-26 16:19:47.196307898 +0100 @@ -39,29 +39,6 @@ server/smclient/eggdesktopfile.c \ server/smclient/eggdesktopfile.h @@ -75,10 +75,10 @@ \ ChangeLog.pre-git \ intltool-extract.in \ -Index: vino-3.2.2/configure.ac +Index: vino-3.3.3/configure.ac =================================================================== ---- vino-3.2.2.orig/configure.ac 2011-11-14 18:31:38.000000000 +0100 -+++ vino-3.2.2/configure.ac 2011-11-15 21:50:01.978331565 +0100 +--- vino-3.3.3.orig/configure.ac 2011-12-19 19:59:42.000000000 +0100 ++++ vino-3.3.3/configure.ac 2012-01-26 16:19:47.200307898 +0100 @@ -322,6 +322,13 @@ [AC_MSG_ERROR([IPv6 support requested but not found])])]) AC_MSG_RESULT([$have_ipv6]) @@ -93,3 +93,91 @@ # GNOME libraries GTK_VERSION=3.0.0 GLIB_VERSION=2.17.0 +Index: vino-3.3.3/server/vino-upnp.c +=================================================================== +--- vino-3.3.3.orig/server/vino-upnp.c 2011-10-24 17:36:19.000000000 +0200 ++++ vino-3.3.3/server/vino-upnp.c 2012-01-26 16:19:47.200307898 +0100 +@@ -27,8 +27,8 @@ + #endif + + #include +-#include "miniupnp/miniupnpc.h" +-#include "miniupnp/upnpcommands.h" ++#include ++#include + + #ifdef VINO_HAVE_NETWORKMANAGER + #include +@@ -75,6 +75,7 @@ + { + struct UPNPDev * devlist; + int res; ++ int upnperror = 0; + + if (upnp->priv->have_igd) + return TRUE; +@@ -82,7 +83,7 @@ + clean_upnp_data (upnp); + + dprintf (UPNP, "UPnP: Doing the discovery... "); +- devlist = upnpDiscover (2000, NULL, NULL, 0); ++ devlist = upnpDiscover (2000, NULL, NULL, 0, 0, &upnperror); + if (!devlist) + { + dprintf (UPNP, "nothing found, aborting."); +@@ -207,7 +208,7 @@ + return NULL; + + UPNP_GetExternalIPAddress (upnp->priv->urls->controlURL, +- upnp->priv->data->servicetype, ++ upnp->priv->data->first.servicetype, + ip); + if (ip[0]) + if (strcmp (ip, "0.0.0.0") == 0) +@@ -238,11 +239,14 @@ + ext_port = g_strdup_printf ("%d", local_port); + dprintf (UPNP, "UPnP: Trying to forward port %d...: ", local_port); + UPNP_GetSpecificPortMappingEntry (upnp->priv->urls->controlURL, +- upnp->priv->data->servicetype, ++ upnp->priv->data->first.servicetype, + ext_port, + "TCP", + int_client_tmp, +- int_port_tmp); ++ int_port_tmp, ++ NULL, ++ NULL, ++ NULL); + if ( (strcmp (int_client_tmp, upnp->priv->lanaddr) == 0) && (strcmp (int_port_tmp, ext_port) == 0) ) + { + dprintf (UPNP, "UPnP: Found a previous redirect\n"); +@@ -274,12 +278,14 @@ + g_get_host_name ()); + + err = UPNP_AddPortMapping (upnp->priv->urls->controlURL, +- upnp->priv->data->servicetype, ++ upnp->priv->data->first.servicetype, + ext_port, + int_port, + upnp->priv->lanaddr, + desc, +- "TCP"); ++ "TCP", ++ NULL, ++ NULL); + if (err == 0) + { + upnp->priv->port = local_port; +@@ -312,9 +318,10 @@ + + port = g_strdup_printf ("%d", upnp->priv->port); + err = UPNP_DeletePortMapping (upnp->priv->urls->controlURL, +- upnp->priv->data->servicetype, ++ upnp->priv->data->first.servicetype, + port, +- "TCP"); ++ "TCP", ++ NULL); + if (err == 0) + dprintf (UPNP, "UPnP: Removed forwarded port %d\n", upnp->priv->port); + else diff -Nru vino-3.3.3/debian/patches/06_use-ubuntu-help.patch vino-3.3.3/debian/patches/06_use-ubuntu-help.patch --- vino-3.3.3/debian/patches/06_use-ubuntu-help.patch 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/patches/06_use-ubuntu-help.patch 2012-01-26 15:26:57.000000000 +0000 @@ -1,9 +1,9 @@ Description: Use Ubuntu system help instead of GNOME's Forwarded: Not needed -Index: vino-3.1.92/server/vino-status-icon.c +Index: vino-3.3.3/server/vino-status-icon.c =================================================================== ---- vino-3.1.92.orig/server/vino-status-icon.c 2011-09-07 14:42:36.000000000 -0400 -+++ vino-3.1.92/server/vino-status-icon.c 2011-09-19 14:07:30.347955973 -0400 +--- vino-3.3.3.orig/server/vino-status-icon.c 2011-11-22 17:34:33.000000000 +0100 ++++ vino-3.3.3/server/vino-status-icon.c 2012-01-26 16:19:48.128307904 +0100 @@ -227,7 +227,7 @@ screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon)); @@ -13,10 +13,10 @@ GDK_CURRENT_TIME, &error)) { -Index: vino-3.1.92/server/vino-status-tube-icon.c +Index: vino-3.3.3/server/vino-status-tube-icon.c =================================================================== ---- vino-3.1.92.orig/server/vino-status-tube-icon.c 2011-09-07 14:42:36.000000000 -0400 -+++ vino-3.1.92/server/vino-status-tube-icon.c 2011-09-19 14:07:30.347955973 -0400 +--- vino-3.3.3.orig/server/vino-status-tube-icon.c 2011-09-07 20:42:36.000000000 +0200 ++++ vino-3.3.3/server/vino-status-tube-icon.c 2012-01-26 16:19:48.128307904 +0100 @@ -194,7 +194,7 @@ GError *error = NULL; @@ -26,10 +26,10 @@ GDK_CURRENT_TIME, &error)) { vino_util_show_error (_("Error displaying help"), error->message, NULL); -Index: vino-3.1.92/capplet/vino-preferences.c +Index: vino-3.3.3/capplet/vino-preferences.c =================================================================== ---- vino-3.1.92.orig/capplet/vino-preferences.c 2011-09-19 14:08:06.078008377 -0400 -+++ vino-3.1.92/capplet/vino-preferences.c 2011-09-19 14:08:20.218029114 -0400 +--- vino-3.3.3.orig/capplet/vino-preferences.c 2011-09-07 20:42:36.000000000 +0200 ++++ vino-3.3.3/capplet/vino-preferences.c 2012-01-26 16:19:48.128307904 +0100 @@ -232,7 +232,7 @@ case GTK_RESPONSE_HELP: screen = gtk_widget_get_screen (widget); diff -Nru vino-3.3.3/debian/patches/11_hurd_maxhostnamelen.patch vino-3.3.3/debian/patches/11_hurd_maxhostnamelen.patch --- vino-3.3.3/debian/patches/11_hurd_maxhostnamelen.patch 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/patches/11_hurd_maxhostnamelen.patch 2012-01-26 15:26:57.000000000 +0000 @@ -1,5 +1,7 @@ ---- 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 +Index: vino-3.3.3/server/miniupnp/miniupnpc.c +=================================================================== +--- vino-3.3.3.orig/server/miniupnp/miniupnpc.c 2011-10-24 17:36:19.000000000 +0200 ++++ vino-3.3.3/server/miniupnp/miniupnpc.c 2012-01-26 16:19:48.972307910 +0100 @@ -13,7 +13,6 @@ #include #define snprintf _snprintf @@ -8,7 +10,7 @@ #else #include #include -@@ -132,7 +131,7 @@ int simpleUPnPcommand(int s, const char +@@ -132,7 +131,7 @@ char * buffer, int * bufsize) { struct sockaddr_in dest; @@ -17,7 +19,7 @@ unsigned short port = 0; char * path; char soapact[128]; -@@ -206,7 +205,7 @@ int simpleUPnPcommand(int s, const char +@@ -206,7 +205,7 @@ strncpy(p, ">\r\n", soapbody + sizeof(soapbody) - p); } @@ -26,7 +28,7 @@ if(s<0) { s = socket(PF_INET, SOCK_STREAM, 0); -@@ -214,6 +213,7 @@ int simpleUPnPcommand(int s, const char +@@ -214,6 +213,7 @@ { PRINT_SOCKET_ERROR("socket"); *bufsize = 0; @@ -34,7 +36,7 @@ return -1; } dest.sin_family = AF_INET; -@@ -224,11 +224,13 @@ int simpleUPnPcommand(int s, const char +@@ -224,11 +224,13 @@ PRINT_SOCKET_ERROR("connect"); closesocket(s); *bufsize = 0; @@ -48,8 +50,10 @@ if(n<=0) { #ifdef DEBUG printf("Error sending SOAP request\n"); ---- 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 +Index: vino-3.3.3/server/miniupnp/miniwget.c +=================================================================== +--- vino-3.3.3.orig/server/miniupnp/miniwget.c 2011-10-24 17:36:19.000000000 +0200 ++++ vino-3.3.3/server/miniupnp/miniwget.c 2012-01-26 16:19:48.972307910 +0100 @@ -12,7 +12,6 @@ #ifdef WIN32 #include @@ -58,7 +62,7 @@ #define MIN(x,y) (((x)<(y))?(x):(y)) #define snprintf _snprintf #define herror -@@ -148,14 +147,14 @@ miniwget2(const char * url, const char * +@@ -148,14 +147,14 @@ /* parseURL() * arguments : * url : source string not modified @@ -75,7 +79,7 @@ { char * p1, *p2, *p3; p1 = strstr(url, "://"); -@@ -169,15 +168,18 @@ int parseURL(const char * url, char * ho +@@ -169,15 +168,18 @@ p3 = strchr(p1, '/'); if(!p3) return 0; @@ -97,7 +101,7 @@ *port = 0; p2++; while( (*p2 >= '0') && (*p2 <= '9')) -@@ -196,11 +198,14 @@ void * miniwget(const char * url, int * +@@ -196,11 +198,14 @@ unsigned short port; char * path; /* protocol://host:port/chemin */ @@ -115,7 +119,7 @@ } void * miniwget_getaddr(const char * url, int * size, char * addr, int addrlen) -@@ -208,12 +213,15 @@ void * miniwget_getaddr(const char * url +@@ -208,12 +213,15 @@ unsigned short port; char * path; /* protocol://host:port/chemin */ @@ -134,9 +138,11 @@ + return ret; } ---- 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 +Index: vino-3.3.3/server/miniupnp/miniwget.h +=================================================================== +--- vino-3.3.3.orig/server/miniupnp/miniwget.h 2011-10-24 17:36:19.000000000 +0200 ++++ vino-3.3.3/server/miniupnp/miniwget.h 2012-01-26 16:19:48.972307910 +0100 +@@ -18,7 +18,7 @@ LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int); diff -Nru vino-3.3.3/debian/patches/nodisplay_autostart.patch vino-3.3.3/debian/patches/nodisplay_autostart.patch --- vino-3.3.3/debian/patches/nodisplay_autostart.patch 2011-12-20 06:04:30.000000000 +0000 +++ vino-3.3.3/debian/patches/nodisplay_autostart.patch 2012-01-26 15:26:57.000000000 +0000 @@ -3,10 +3,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/803917 Forwarded: not-needed -Index: vino-3.1.2/server/vino-server.desktop.in.in +Index: vino-3.3.3/server/vino-server.desktop.in.in =================================================================== ---- vino-3.1.2.orig/server/vino-server.desktop.in.in 2011-07-01 10:28:41.019363215 +0100 -+++ vino-3.1.2/server/vino-server.desktop.in.in 2011-07-01 10:28:59.467363411 +0100 +--- vino-3.3.3.orig/server/vino-server.desktop.in.in 2012-01-26 16:19:46.208307892 +0100 ++++ vino-3.3.3/server/vino-server.desktop.in.in 2012-01-26 16:19:49.680307915 +0100 @@ -9,3 +9,4 @@ AutostartCondition=GSettings org.gnome.Vino enabled X-GNOME-Autostart-Phase=Applications