Import 1.8.5 and refresh patches

17 files changed, 50 insertions, 97 deletions

diff --git a/debian/changelog b/debian/changelog
index ba1ccb1..3abac2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-subversion (1.8.0-1) UNRELEASED; urgency=low
+subversion (1.8.5-1) UNRELEASED; urgency=low
 
   * New upstream release.  Rediff patches:
     - Remove apr-abi1 (applied upstream), rename apr-abi2 to apr-abi
     - Remove loosen-sqlite-version-check (shouldn't be needed)
     - Remove java-osgi-metadata (applied upstream)
     - svnmucc prompts for a changelog if none is provided. (Closes: #507430)
+    - Remove fix-bdb-version-detection, upstream uses "apu-config --dbm-libs"
+    - Remove ruby-test-wc (applied upstream)
 
  -- Peter Samuelson <peter@p12n.org>  Fri, 03 May 2013 20:55:31 -0500
 
diff --git a/debian/patches/apache_module_dependency b/debian/patches/apache_module_dependency
index 7e98efc..36be1b8 100644
--- a/debian/patches/apache_module_dependency
+++ b/debian/patches/apache_module_dependency
@@ -53,7 +53,7 @@ dependencies, mod_authz_svn is loaded first.
  
  #include <httpd.h>
  #include <http_config.h>
-@@ -65,6 +65,13 @@
+@@ -67,6 +67,13 @@
    const char *force_username_case;
  } authz_svn_config_rec;
  
@@ -67,7 +67,7 @@ dependencies, mod_authz_svn is loaded first.
  /*
   * Configuration
   */
-@@ -800,6 +807,16 @@
+@@ -937,6 +944,16 @@
    return OK;
  }
  
@@ -84,7 +84,7 @@ dependencies, mod_authz_svn is loaded first.
  /*
   * Module flesh
   */
-@@ -821,6 +838,9 @@
+@@ -958,6 +975,9 @@
                         AUTHZ_SVN__SUBREQ_BYPASS_PROV_NAME,
                         AUTHZ_SVN__SUBREQ_BYPASS_PROV_VER,
                         (void*)subreq_bypass);
@@ -96,7 +96,7 @@ dependencies, mod_authz_svn is loaded first.
  module AP_MODULE_DECLARE_DATA authz_svn_module =
 --- a/subversion/mod_dav_svn/mod_dav_svn.c
 +++ b/subversion/mod_dav_svn/mod_dav_svn.c
-@@ -1128,6 +1128,9 @@
+@@ -1325,6 +1325,9 @@
  static void
  register_hooks(apr_pool_t *pconf)
  {
diff --git a/debian/patches/build-fixes b/debian/patches/build-fixes
index af19360..0e31687 100644
--- a/debian/patches/build-fixes
+++ b/debian/patches/build-fixes
@@ -29,7 +29,7 @@ Fix some build problems:
                     % " ".join(checkout_locations))
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -300,14 +300,14 @@
+@@ -301,14 +301,14 @@
  
  # The path to generated and complementary source files for the SWIG
  # bindings.
@@ -49,7 +49,7 @@ Fix some build problems:
  
  ### Automate JAR creation using Makefile generator's javahl-java.jar
  ### property.  Enhance generator to support JAR installation.
-@@ -794,8 +794,7 @@
+@@ -795,8 +795,7 @@
  	fi
  	for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \
  	do \
@@ -59,7 +59,7 @@ Fix some build problems:
  	done
  	if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \
  	  cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \
-@@ -829,7 +828,7 @@
+@@ -830,7 +829,7 @@
  	fi
  	for d in $(SWIG_PY_DIR) $(SWIG_PY_DIR)/libsvn_swig_py; \
  	do \
@@ -68,7 +68,7 @@ Fix some build problems:
  	done
  	find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
  
-@@ -859,8 +858,7 @@
+@@ -860,8 +859,7 @@
  	fi
  	for d in $(SWIG_RB_DIR) $(SWIG_RB_DIR)/libsvn_swig_ruby; \
  	do \
@@ -103,7 +103,7 @@ Fix some build problems:
      for fname in self.includes:
 --- a/configure.ac
 +++ b/configure.ac
-@@ -687,6 +687,7 @@
+@@ -688,6 +688,7 @@
  fi
  
  AH_BOTTOM([
@@ -111,14 +111,14 @@ Fix some build problems:
  /* Indicate to translators that string X should be translated.  Do not look
     up the translation at run time; just expand to X.  This macro is suitable
     for use where a constant string is required at compile time. */
-@@ -1497,6 +1498,11 @@
+@@ -1503,6 +1504,11 @@
                     [Defined to the config.guess name of the build target])
  
  AC_OUTPUT
 +if test "$abs_srcdir" != "$abs_builddir"
 +then
 +  AC_MSG_NOTICE([Creating build directories])
-+  (cd "$abs_srcdir"; find subversion tools contrib -type d) | xargs $MKDIR
++  (cd "$abs_srcdir"; find subversion tools -type d) | xargs $MKDIR
 +fi
  
  # ==== Print final messages to user ==========================================
@@ -182,7 +182,7 @@ Fix some build problems:
    /* If we got a complete report, close the edit.  Otherwise, abort it. */
 --- a/subversion/libsvn_ra_serf/util.c
 +++ b/subversion/libsvn_ra_serf/util.c
-@@ -785,12 +785,6 @@
+@@ -862,12 +862,6 @@
  
            return svn_ra_serf__wrap_err(status, _("Error running context"));
          }
diff --git a/debian/patches/fix-bdb-version-detection b/debian/patches/fix-bdb-version-detection
deleted file mode 100644
index 8683cf0..0000000
--- a/debian/patches/fix-bdb-version-detection
+++ /dev/null
@@ -1,21 +0,0 @@
-berkeley-db.m4: Avoid bdb version detection; just link to libaprutil instead
-
-In Debian, apu-config --libs does not print dependent libraries (see
-#378105).  svn relies on this to detect the BDB version.  Work around
-this by linking to -laprutil1 instead, which will indirectly link to
-libdb.
-
-I don't think this can be sent upstream, as it won't work when
-compiling aprutil in-tree.  But I'm not certain.
-
---- a/build/ac-macros/berkeley-db.m4
-+++ b/build/ac-macros/berkeley-db.m4
-@@ -183,7 +183,7 @@
-     SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
- 
-     CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS" 
--    LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"
-+    LIBS="`$apu_config --ldflags --link-ld` $SVN_DB_LIBS $LIBS"
- 
-     if test -n "$svn_berkeley_db_header"; then
-       SVN_DB_HEADER="#include <$svn_berkeley_db_header>"
diff --git a/debian/patches/java-build b/debian/patches/java-build
index eb0e48a..eca8117 100644
--- a/debian/patches/java-build
+++ b/debian/patches/java-build
@@ -4,7 +4,7 @@ Patch is originally from Nobuhiro Iwamatsu, bug #561516.
 
 --- a/build/generator/templates/build-outputs.mk.ezt
 +++ b/build/generator/templates/build-outputs.mk.ezt
-@@ -99,7 +99,8 @@
+@@ -102,7 +102,8 @@
  [if-any target.headers][target.varname]_CLASS_FILENAMES =[for target.header_class_filenames] [target.header_class_filenames][end]
  [target.varname]_CLASSES =[for target.header_classes] [target.header_classes][end]
  $([target.varname]_HEADERS): $([target.varname]_CLASS_FILENAMES)
diff --git a/debian/patches/last-changed-date-charset b/debian/patches/last-changed-date-charset
index 02b2f5f..d4a518c 100644
--- a/debian/patches/last-changed-date-charset
+++ b/debian/patches/last-changed-date-charset
@@ -5,7 +5,7 @@ Not accepted upstream: http://svn.haxx.se/dev/archive-2006-04/0730.shtml
 
 --- a/subversion/libsvn_subr/subst.c
 +++ b/subversion/libsvn_subr/subst.c
-@@ -200,8 +200,12 @@
+@@ -209,8 +209,12 @@
            break;
          case 'D': /* long format of date of this revision */
            if (date)
@@ -18,5 +18,5 @@ Not accepted upstream: http://svn.haxx.se/dev/archive-2006-04/0730.shtml
 +              svn_stringbuf_appendcstr(value, date_keyword);
 +            }
            break;
-         case 'r': /* number of this revision */
-           if (rev)
+         case 'P': /* relative path of this file */
+           if (repos_root_url && *repos_root_url != '\0' && url && *url != '\0')
diff --git a/debian/patches/no-extra-libs b/debian/patches/no-extra-libs
index 41f3d59..708ade3 100644
--- a/debian/patches/no-extra-libs
+++ b/debian/patches/no-extra-libs
@@ -5,7 +5,7 @@ libexpat2, libxml2, zlib1g.
 
 --- a/build/ac-macros/apr.m4
 +++ b/build/ac-macros/apr.m4
-@@ -99,9 +99,9 @@
+@@ -94,9 +94,9 @@
        AC_MSG_ERROR([apr-config --link-ld --libs failed])
      fi
    else
@@ -19,7 +19,7 @@ libexpat2, libxml2, zlib1g.
    SVN_APR_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APR_LIBS)`"
 --- a/build/ac-macros/aprutil.m4
 +++ b/build/ac-macros/aprutil.m4
-@@ -103,9 +103,9 @@
+@@ -98,9 +98,9 @@
        AC_MSG_ERROR([apu-config --link-ld --libs failed])
      fi
    else
diff --git a/debian/patches/python-builds b/debian/patches/python-builds
index ff5a4e6..0286aef 100644
--- a/debian/patches/python-builds
+++ b/debian/patches/python-builds
@@ -6,7 +6,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -132,6 +132,7 @@
+@@ -133,6 +133,7 @@
  APACHE_LDFLAGS = @APACHE_LDFLAGS@
  
  SWIG = @SWIG@
@@ -26,7 +26,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
  
      if test "$ac_cv_python_includes" = "none"; then
        AC_MSG_WARN([python bindings cannot be built without distutils module])
-@@ -282,6 +283,7 @@
+@@ -289,6 +290,7 @@
        AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
    fi
    AC_SUBST(SWIG)
@@ -36,7 +36,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
    AC_SUBST(SWIG_PY_LINK)
 --- a/build.conf
 +++ b/build.conf
-@@ -417,7 +417,7 @@
+@@ -427,7 +427,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = core.i
@@ -45,7 +45,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_diff libsvn_subr apr
  description = Subversion core library bindings
  include-runtime = yes
-@@ -426,7 +426,7 @@
+@@ -436,7 +436,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_client.i
@@ -54,7 +54,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_client libsvn_subr apr
  nonlibs = swig_core
  description = Subversion client library bindings
-@@ -435,7 +435,7 @@
+@@ -445,7 +445,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_delta.i
@@ -63,7 +63,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_delta libsvn_subr apr
  nonlibs = swig_core
  description = Subversion delta library bindings
-@@ -444,7 +444,7 @@
+@@ -454,7 +454,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_diff.i
@@ -72,7 +72,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_diff libsvn_subr apr
  nonlibs = swig_core
  description = Subversion diff library bindings
-@@ -453,7 +453,7 @@
+@@ -463,7 +463,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_fs.i
@@ -81,7 +81,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_fs libsvn_subr apr
  nonlibs = swig_core
  description = Subversion FS library bindings
-@@ -462,7 +462,7 @@
+@@ -472,7 +472,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_ra.i
@@ -90,7 +90,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_ra libsvn_subr apr
  nonlibs = swig_core
  description = Subversion RA library bindings
-@@ -471,7 +471,7 @@
+@@ -481,7 +481,7 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_repos.i
@@ -99,7 +99,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
         libsvn_repos libsvn_subr apr
  nonlibs = swig_core
  description = Subversion repository library bindings
-@@ -480,13 +480,13 @@
+@@ -490,13 +490,13 @@
  type = swig
  path = subversion/bindings/swig
  sources = svn_wc.i
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates
index 75b1e7c..5e7f71a 100644
--- a/debian/patches/repos-templates
+++ b/debian/patches/repos-templates
@@ -5,7 +5,7 @@ hooks, not just use them in place.
 
 --- a/subversion/libsvn_repos/repos.c
 +++ b/subversion/libsvn_repos/repos.c
-@@ -275,7 +275,7 @@
+@@ -276,7 +276,7 @@
  
  #define PREWRITTEN_HOOKS_TEXT                                                 \
    "# For more examples and pre-written hooks, see those in"                NL \
@@ -14,7 +14,7 @@ hooks, not just use them in place.
    "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and"        NL \
    "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/"          NL
  
-@@ -354,8 +354,11 @@
+@@ -361,8 +361,11 @@
  "REPOS=\"$1\""                                                               NL
  "USER=\"$2\""                                                                NL
  ""                                                                           NL
@@ -28,7 +28,7 @@ hooks, not just use them in place.
  ""                                                                           NL
  "# All checks passed, so allow the commit."                                  NL
  "exit 0"                                                                     NL;
-@@ -442,10 +445,13 @@
+@@ -451,10 +454,13 @@
  "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\"                                   NL
  "   grep \"[a-zA-Z0-9]\" > /dev/null || exit 1"                              NL
  ""                                                                           NL
@@ -44,16 +44,16 @@ hooks, not just use them in place.
  ""                                                                           NL
  "# All checks passed, so allow the commit."                                  NL
  "exit 0"                                                                     NL;
-@@ -756,7 +762,7 @@
- "REPOS=\"$1\""                                                               NL
+@@ -775,7 +781,7 @@
  "REV=\"$2\""                                                                 NL
+ "TXN_NAME=\"$3\""                                                            NL
                                                                               NL
 -"mailer.py commit \"$REPOS\" \"$REV\" /path/to/mailer.conf"                  NL;
 +"\"$REPOS\"/hooks/mailer.py commit \"$REPOS\" $REV \"$REPOS\"/mailer.conf"   NL;
  
  #undef SCRIPT_NAME
  
-@@ -817,7 +823,8 @@
+@@ -838,7 +844,8 @@
  "USER=\"$2\""                                                                NL
  ""                                                                           NL
  "# Send email to interested parties, let them know a lock was created:"      NL
@@ -63,7 +63,7 @@ hooks, not just use them in place.
  
  #undef SCRIPT_NAME
  
-@@ -876,7 +883,8 @@
+@@ -899,7 +906,8 @@
  "USER=\"$2\""                                                                NL
  ""                                                                           NL
  "# Send email to interested parties, let them know a lock was removed:"      NL
@@ -73,7 +73,7 @@ hooks, not just use them in place.
  
  #undef SCRIPT_NAME
  
-@@ -941,8 +949,8 @@
+@@ -966,8 +974,8 @@
  "PROPNAME=\"$4\""                                                            NL
  "ACTION=\"$5\""                                                              NL
  ""                                                                           NL
diff --git a/debian/patches/rpath b/debian/patches/rpath
index f6b23db..9ae2155 100644
--- a/debian/patches/rpath
+++ b/debian/patches/rpath
@@ -8,7 +8,7 @@ patch by David Kimdon <dwhedon@debian.org>.  The basic theory is:
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -201,10 +201,10 @@
+@@ -202,10 +202,10 @@
  # special compilation for files destined for cxxhl
  COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
  
@@ -23,7 +23,7 @@ patch by David Kimdon <dwhedon@debian.org>.  The basic theory is:
  
  # special link rule for mod_dav_svn
  LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
-@@ -760,7 +760,9 @@
+@@ -761,7 +761,9 @@
  	./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
diff --git a/debian/patches/ruby-no-strict-aliasing b/debian/patches/ruby-no-strict-aliasing
index e170cd8..f8766b0 100644
--- a/debian/patches/ruby-no-strict-aliasing
+++ b/debian/patches/ruby-no-strict-aliasing
@@ -4,7 +4,7 @@ be real bugs with real consequences.
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -138,7 +138,7 @@
+@@ -139,7 +139,7 @@
  SWIG_PY_LIBS = @SWIG_PY_LIBS@
  SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
  SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
diff --git a/debian/patches/ruby-test-svnserve-race b/debian/patches/ruby-test-svnserve-race
index c8a4d1b..fea92e2 100644
--- a/debian/patches/ruby-test-svnserve-race
+++ b/debian/patches/ruby-test-svnserve-race
@@ -12,10 +12,10 @@ Michlmayr.
  require "fileutils"
  require "pathname"
 +require "socket"
- require "./svn/util"
- require "tmpdir"
  
-@@ -253,11 +254,7 @@
+ # Tale of a hack...
+ #
+@@ -287,11 +288,7 @@
                 "-d", "--foreground")
          }
          pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
@@ -28,7 +28,7 @@ Michlmayr.
            # svnserve started successfully.  Note port number and cease
            # startup attempts.
            @svnserve_port = port
-@@ -323,4 +320,25 @@
+@@ -357,4 +354,25 @@
      include Svnserve
      extend SetupEnvironment
    end
diff --git a/debian/patches/ruby-test-wc b/debian/patches/ruby-test-wc
deleted file mode 100644
index 98f2258..0000000
--- a/debian/patches/ruby-test-wc
+++ /dev/null
@@ -1,26 +0,0 @@
-Recent APR 1.4 includes some hash order randomization for security
-purposes.  This broke the Subversion testsuites in various ways.  Most
-of them were fixed in 1.7 already but this one hasn't been.  It is from
-upstream trunk, r1327373.
-
-
---- a/subversion/bindings/swig/ruby/test/test_wc.rb
-+++ b/subversion/bindings/swig/ruby/test/test_wc.rb
-@@ -326,12 +326,16 @@
-         ignored_errors = []
-         callbacks.ignored_errors = ignored_errors
-         access.walk_entries(@wc_path, callbacks)
-+        sorted_ignored_errors = ignored_errors.sort_by {|path, err| path}
-+        sorted_ignored_errors = sorted_ignored_errors.collect! do |path, err| 
-+          [path, err.class]
-+        end
-         assert_equal([
-                       [@wc_path, Svn::Error::Cancelled],
-                       [path1, Svn::Error::Cancelled],
-                       [path2, Svn::Error::Cancelled],
-                      ],
--                     ignored_errors.collect {|path, err| [path, err.class]})
-+                     sorted_ignored_errors)
-       end
-     end
-   end
diff --git a/debian/patches/ruby-typemap-digest b/debian/patches/ruby-typemap-digest
index f57d1a4..b2f2d39 100644
--- a/debian/patches/ruby-typemap-digest
+++ b/debian/patches/ruby-typemap-digest
@@ -17,7 +17,7 @@ Sent upstream: http://svn.haxx.se/dev/archive-2006-09/0536.shtml
 
 --- a/subversion/bindings/swig/include/svn_types.swg
 +++ b/subversion/bindings/swig/include/svn_types.swg
-@@ -1072,7 +1072,7 @@
+@@ -1093,7 +1093,7 @@
  #ifdef SWIGRUBY
  %typemap(argout) unsigned char digest[ANY] {
    char *digest_string = (char *)svn_md5_digest_to_cstring($1, _global_pool);
diff --git a/debian/patches/series b/debian/patches/series
index 2f4f174..5c3414d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,9 +11,7 @@ ruby-typemap-digest
 ssh-no-controlmaster
 svnshell
 apr-abi
-fix-bdb-version-detection
 python-builds
 examples-compile-instructions
 apache_module_dependency
 workaround_EINVAL_on_kfreebsd
-ruby-test-wc
diff --git a/debian/patches/ssh-no-controlmaster b/debian/patches/ssh-no-controlmaster
index 633425f..3b31fd5 100644
--- a/debian/patches/ssh-no-controlmaster
+++ b/debian/patches/ssh-no-controlmaster
@@ -16,7 +16,7 @@ connection sharing, but only if a ControlMaster is already present.
 
 --- a/subversion/libsvn_subr/config_file.c
 +++ b/subversion/libsvn_subr/config_file.c
-@@ -1027,7 +1027,7 @@
+@@ -1134,7 +1134,7 @@
          "### passed to the tunnel agent as <user>@<hostname>.)  If the"      NL
          "### built-in ssh scheme were not predefined, it could be defined"   NL
          "### as:"                                                            NL
@@ -27,7 +27,7 @@ connection sharing, but only if a ControlMaster is already present.
          "# rsh = rsh"                                                        NL
 --- a/subversion/libsvn_ra_svn/client.c
 +++ b/subversion/libsvn_ra_svn/client.c
-@@ -391,7 +391,7 @@
+@@ -395,7 +395,7 @@
         * versions have it too. If the user is using some other ssh
         * implementation that doesn't accept it, they can override it
         * in the [tunnels] section of the config. */
diff --git a/debian/patches/workaround_EINVAL_on_kfreebsd b/debian/patches/workaround_EINVAL_on_kfreebsd
index 7ffcda0..5321f83 100644
--- a/debian/patches/workaround_EINVAL_on_kfreebsd
+++ b/debian/patches/workaround_EINVAL_on_kfreebsd
@@ -1,6 +1,6 @@
 --- a/subversion/bindings/swig/ruby/test/util.rb
 +++ b/subversion/bindings/swig/ruby/test/util.rb
-@@ -332,6 +332,8 @@
+@@ -369,6 +369,8 @@
  	TCPSocket.new(@svnserve_host, port).close
        rescue Errno::ECONNREFUSED
  	sleep(n < 10 ? 0.2 : 0.5)