r25517 - /desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov  6 22:16:44 2010
New Revision: 25517

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25517
Log:
Fix some more issues with the hurd patch

Modified:
    desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch

Modified: desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch?rev=25517&op=diff
==============================================================================
--- desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch [utf-8] (original)
+++ desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch [utf-8] Sat Nov  6 22:16:44 2010
@@ -1,6 +1,6 @@
-diff -pruN --exclude '*~' vino-2.28.2.orig/server/miniupnp/miniupnpc.c vino-2.28.2/server/miniupnp/miniupnpc.c
---- vino-2.28.2.orig/server/miniupnp/miniupnpc.c	2009-04-18 15:22:24.000000000 +0200
-+++ vino-2.28.2/server/miniupnp/miniupnpc.c	2010-10-30 11:02:44.175262881 +0200
+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 <io.h>
  #define snprintf _snprintf
@@ -45,13 +45,13 @@
  	}
  
  	n = soapPostSubmit(s, path, hostname, port, soapact, soapbody);
-+	free (hostname)
++	free (hostname);
  	if(n<=0) {
  #ifdef DEBUG
  		printf("Error sending SOAP request\n");
-diff -pruN --exclude '*~' vino-2.28.2.orig/server/miniupnp/miniwget.c vino-2.28.2/server/miniupnp/miniwget.c
---- vino-2.28.2.orig/server/miniupnp/miniwget.c	2009-04-18 15:22:24.000000000 +0200
-+++ vino-2.28.2/server/miniupnp/miniwget.c	2010-10-30 10:48:03.299261556 +0200
+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 <winsock2.h>
@@ -86,7 +86,7 @@
  	{
 -		strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p3-p1)));
 +		*hostname = malloc ((int)(p3-p1) + 1);
-+		strncpy(hostname, p1, (int)(p3-p1));
++		strncpy(*hostname, p1, (int)(p3-p1));
 +		(*hostname)[(int)(p3-p1)] = '\0';
  		*port = 80;
  	}
@@ -94,7 +94,7 @@
  	{
 -		strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
 +		*hostname = malloc ((int)(p2-p1) + 1);
-+		strncpy(hostname, p1, (int)(p2-p1));
++		strncpy(*hostname, p1, (int)(p2-p1));
 +		(*hostname)[(int)(p2-p1)] = '\0';
  		*port = 0;
  		p2++;
@@ -136,3 +136,15 @@
 +	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
+ }