Correct some botched patches. We don't need to patch inetaddr.c, and

be sure to pass the correct length to connect().


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3929 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 12 insertions, 92 deletions

diff --git a/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c b/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c
deleted file mode 100644
index c22864699..000000000
--- a/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- cddb-slave2/inetaddr.c.orig	Sat Mar 12 02:38:12 2005
-+++ cddb-slave2/inetaddr.c	Sat Mar 12 02:39:15 2005
-@@ -1908,6 +1908,9 @@ gnet_inetaddr_get_interface_to (const GI
-   int sockfd;
- #ifdef ENABLE_IPV6
-   struct sockaddr_in6 myaddr6;
-+#define SS_LEN ss_len
-+#else
-+#define SS_LEN sa_len
- #endif
-   struct sockaddr_in myaddr;
-   socklen_t len;
-@@ -1927,7 +1930,7 @@ gnet_inetaddr_get_interface_to (const GI
- 	return NULL;
-       }
- 
--      if (connect (sockfd, (struct sockaddr *)&(addr->sa), sizeof (addr->sa)) == -1)
-+      if (connect (sockfd, (struct sockaddr *)&(addr->sa), addr->sa.SS_LEN) == -1)
- 	{
- 	  GNET_CLOSE_SOCKET (sockfd);
- 	  g_free (iface);
-@@ -1953,7 +1956,7 @@ gnet_inetaddr_get_interface_to (const GI
-       return NULL;
-     }
- 
--    if (connect (sockfd, (struct sockaddr *)&addr->sa, sizeof(addr->sa)) == -1)
-+    if (connect (sockfd, (struct sockaddr *)&addr->sa, addr->sa.SS_LEN) == -1)
-       {
- 	GNET_CLOSE_SOCKET(sockfd);
- 	g_free (iface);
diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
index 9dfa415ef..f316b7f01 100644
--- a/audio/gnome-media/files/patch-cddb-slave2_tcp.c
+++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
@@ -1,30 +1,20 @@
---- cddb-slave2/tcp.c.orig	Sat Mar 12 02:32:52 2005
-+++ cddb-slave2/tcp.c	Sat Mar 12 02:39:55 2005
-@@ -171,6 +171,9 @@ gnet_tcp_socket_new_async (const GInetAd
-   struct sockaddr_in6* 	sa_in6;
-   struct sockaddr_in6 	sa6;
-   int ifindex;
-+#define SS_LEN ss_len
-+#else
-+#define SS_LEN sa_len
- #endif
-   struct sockaddr_in* 	sa_in;
-   struct sockaddr	sa;
-@@ -265,7 +268,7 @@ gnet_tcp_socket_new_async (const GInetAd
+--- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
  		continue;
  
  	      sa_in6->sin6_scope_id = ifindex;
 -	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
-+	      con = connect (s->sockfd, (struct sockaddr *)&sa6, s->sa.SS_LEN);
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
  	      if (con == 0 || errno == EINPROGRESS)
  				break;
  
-@@ -283,7 +286,7 @@ gnet_tcp_socket_new_async (const GInetAd
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
        memcpy(&sa, &addr->sa, sizeof(sa));
        sa_in = (struct sockaddr_in *) &sa;
        sa_in->sin_family = AF_INET;
 -      con = connect(s->sockfd, &sa, sizeof(s->sa));
-+      con = connect(s->sockfd, &sa, s->sa.SS_LEN);
++      con = connect(s->sockfd, &sa, sizeof(sa));
      }
  
    /* Connect (but non-blocking!) */
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c b/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c
deleted file mode 100644
index c22864699..000000000
--- a/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- cddb-slave2/inetaddr.c.orig	Sat Mar 12 02:38:12 2005
-+++ cddb-slave2/inetaddr.c	Sat Mar 12 02:39:15 2005
-@@ -1908,6 +1908,9 @@ gnet_inetaddr_get_interface_to (const GI
-   int sockfd;
- #ifdef ENABLE_IPV6
-   struct sockaddr_in6 myaddr6;
-+#define SS_LEN ss_len
-+#else
-+#define SS_LEN sa_len
- #endif
-   struct sockaddr_in myaddr;
-   socklen_t len;
-@@ -1927,7 +1930,7 @@ gnet_inetaddr_get_interface_to (const GI
- 	return NULL;
-       }
- 
--      if (connect (sockfd, (struct sockaddr *)&(addr->sa), sizeof (addr->sa)) == -1)
-+      if (connect (sockfd, (struct sockaddr *)&(addr->sa), addr->sa.SS_LEN) == -1)
- 	{
- 	  GNET_CLOSE_SOCKET (sockfd);
- 	  g_free (iface);
-@@ -1953,7 +1956,7 @@ gnet_inetaddr_get_interface_to (const GI
-       return NULL;
-     }
- 
--    if (connect (sockfd, (struct sockaddr *)&addr->sa, sizeof(addr->sa)) == -1)
-+    if (connect (sockfd, (struct sockaddr *)&addr->sa, addr->sa.SS_LEN) == -1)
-       {
- 	GNET_CLOSE_SOCKET(sockfd);
- 	g_free (iface);
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
index 9dfa415ef..f316b7f01 100644
--- a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
@@ -1,30 +1,20 @@
---- cddb-slave2/tcp.c.orig	Sat Mar 12 02:32:52 2005
-+++ cddb-slave2/tcp.c	Sat Mar 12 02:39:55 2005
-@@ -171,6 +171,9 @@ gnet_tcp_socket_new_async (const GInetAd
-   struct sockaddr_in6* 	sa_in6;
-   struct sockaddr_in6 	sa6;
-   int ifindex;
-+#define SS_LEN ss_len
-+#else
-+#define SS_LEN sa_len
- #endif
-   struct sockaddr_in* 	sa_in;
-   struct sockaddr	sa;
-@@ -265,7 +268,7 @@ gnet_tcp_socket_new_async (const GInetAd
+--- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
  		continue;
  
  	      sa_in6->sin6_scope_id = ifindex;
 -	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
-+	      con = connect (s->sockfd, (struct sockaddr *)&sa6, s->sa.SS_LEN);
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
  	      if (con == 0 || errno == EINPROGRESS)
  				break;
  
-@@ -283,7 +286,7 @@ gnet_tcp_socket_new_async (const GInetAd
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
        memcpy(&sa, &addr->sa, sizeof(sa));
        sa_in = (struct sockaddr_in *) &sa;
        sa_in->sin_family = AF_INET;
 -      con = connect(s->sockfd, &sa, sizeof(s->sa));
-+      con = connect(s->sockfd, &sa, s->sa.SS_LEN);
++      con = connect(s->sockfd, &sa, sizeof(sa));
      }
  
    /* Connect (but non-blocking!) */