From bae7efb510ef131e83c865bde458e551a2369686 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 21 Jun 2007 21:06:33 +0000
Subject: Add patch from
 http://subversion.tigris.org/issues/show_bug.cgi?id=2382 to iterate over
 hosts' addresses instead of failing when one of them is not reachable.

Bump PKGREVISION.
---
 devel/subversion/distinfo         |  5 +++--
 devel/subversion/patches/patch-aa | 45 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 devel/subversion/patches/patch-aa

(limited to 'devel/subversion')

diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 2cf93279eee..ad926054e07 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.59 2007/06/08 22:49:27 epg Exp $
+$NetBSD: distinfo,v 1.60 2007/06/21 21:06:33 wiz Exp $
 
 SHA1 (subversion-1.4.4.tar.gz) = 38818624cf3cb6c36dfaf8388cbe7ebb4fa6d319
 RMD160 (subversion-1.4.4.tar.gz) = e92691f457fb07d5bdb7e4bce9d68daa5282d518
-Size (subversion-1.4.3.tar.gz) = 6317457 bytes
+Size (subversion-1.4.4.tar.gz) = 6317457 bytes
+SHA1 (patch-aa) = d61e0ec3c4587173c19011351b55d4d416891429
 SHA1 (patch-ad) = 419c65ed318f4d6a7ab7dc8b0972b0e3824e6daf
 SHA1 (patch-ag) = c1e41bbb0e6a0ae5015cb24fe3db7ce67931d6b8
 SHA1 (patch-ah) = c41c68a8ad82a2e5f6c3e2568589da5b819946b4
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
new file mode 100644
index 00000000000..e327d23452a
--- /dev/null
+++ b/devel/subversion/patches/patch-aa
@@ -0,0 +1,45 @@
+$NetBSD: patch-aa,v 1.13 2007/06/21 21:06:33 wiz Exp $
+
+From http://subversion.tigris.org/issues/show_bug.cgi?id=2382
+
+--- subversion/libsvn_ra_svn/client.c.orig	2006-08-18 22:54:14.000000000 +0000
++++ subversion/libsvn_ra_svn/client.c
+@@ -127,18 +127,30 @@ static svn_error_t *make_connection(cons
+     return svn_error_createf(status, NULL, _("Unknown hostname '%s'"),
+                              hostname);
+ 
+-  /* Create the socket. */
++  /* Iterate through the returned list of addresses attempting to
++   * connect to each in turn. */
++  do
++    {
++      /* Create the socket. */
+ #ifdef MAX_SECS_TO_LINGER
+-  /* ### old APR interface */
+-  status = apr_socket_create(sock, sa->family, SOCK_STREAM, pool);
++      /* ### old APR interface */
++      status = apr_socket_create(sock, sa->family, SOCK_STREAM, pool);
+ #else
+-  status = apr_socket_create(sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, 
+-                             pool);
++      status = apr_socket_create(sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, 
++                                 pool);
+ #endif
+-  if (status)
+-    return svn_error_wrap_apr(status, _("Can't create socket"));
++      
++      if (status == APR_SUCCESS)
++        {
++          status = apr_socket_connect(*sock, sa);
++          if (status != APR_SUCCESS) 
++            apr_socket_close(*sock);
++        }
++
++      sa = sa->next;
++    }
++  while (status != APR_SUCCESS && sa);
+ 
+-  status = apr_socket_connect(*sock, sa);
+   if (status)
+     return svn_error_wrap_apr(status, _("Can't connect to host '%s'"),
+                               hostname);
-- 
cgit v1.2.3