[pkgsrc/trunk]: pkgsrc/devel Add patch from

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f67fef62402
branches:  trunk
changeset: 530296:2f67fef62402
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jun 21 21:06:33 2007 +0000

description:
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.

diffstat:

 devel/subversion-base/Makefile    |   3 +-
 devel/subversion/distinfo         |   5 ++-
 devel/subversion/patches/patch-aa |  45 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)

diffs (76 lines):

diff -r 26e7deb92095 -r 2f67fef62402 devel/subversion-base/Makefile
--- a/devel/subversion-base/Makefile    Thu Jun 21 19:41:38 2007 +0000
+++ b/devel/subversion-base/Makefile    Thu Jun 21 21:06:33 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2007/06/10 06:20:42 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2007/06/21 21:06:33 wiz Exp $
 
 PKGNAME=       subversion-base-${SVNVER}
+PKGREVISION=   1
 COMMENT=       Version control system, base programs and libraries
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
diff -r 26e7deb92095 -r 2f67fef62402 devel/subversion/distinfo
--- a/devel/subversion/distinfo Thu Jun 21 19:41:38 2007 +0000
+++ b/devel/subversion/distinfo Thu Jun 21 21:06:33 2007 +0000
@@ -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 -r 26e7deb92095 -r 2f67fef62402 devel/subversion/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/subversion/patches/patch-aa Thu Jun 21 21:06:33 2007 +0000
@@ -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);