Version 1.1.2

(20 December 2004, from /branches/1.1.x)
http://svn.collab.net/repos/svn/tags/1.1.2

 User-visible-changes:
  - Client:
    * fixed: 'svn switch' interruption can break working copy (issue #1826)
    * fixed: 'svn switch' memleak over ra_dav (issue #2106)
    * fixed: 'svn blame' algorithm bug (r11527)
    * fixed: invoke external diff/diff3 with local-style paths (r11689)
    * fixed: 'svn status' handling of missing subdirs (r11936)
    * fixed: 'svn ls -v' encoding bug (r11740)
    * fixed: 'svn ls "file with space"' bug (r12273, r12393)
    * fixed: 'svn merge' should URI-encode copyfrom URLs (issue #1905)
    * fixed: 'svn merge' deletion output formatting (r12100, r12111, r12114)
    * fixed: 'svnversion --version .' crash (r11438)
    * fixed: UNC paths on Cygwin (issue #2108)
    * fixed: win98 iconv bug -- uninitialized variable (issue #2091)
    * improved 'svn status' performance:
        - do fewer check_path calls (r11592)
        - 'svn status file' shouldn't recursively lock tree (r11439, r11669)
    * translation updates for localized client messages.

  - Server:
    * fixed: 'svnadmin load' race condition (r12327)
    * fixed: fsfs memleak in commit finalization (r11706)
    * fixed: fsfs memleak in inefficient directory removal (r11701)
    * fixed: fsfs commits use insert-only perms on db/revs/ (r11665)
    * fixed: fsfs creates lockfile at creation time, not at 1st commit (r12172)
    * fixed: svndumpfilter mislabeling output as version 3 (issue #2142)
    * fixed: 'svnserve -h' encoding bug (part of issue #1997)
    * fixed: prevent cross-repository copies (r12003)
    * fixed: increase log-region max size in default DB_CONFIG (issue #2159)

  - Both:
    * fixed: 'svn switch' quietly corrupting working copy (issue #2124)
    * fixed: canonicalize paths sent by ra_svn/svnserve (issue #2119)
    * fixed: memleak into UTF8 translation routines (r11689)

 Developer-visible-changes:
 * add support for BerkeleyDB 4.3
 * add support for any apr/apr-util 1.X
 * disallow incompatible SWIG versions (r12450)
 * fixed: slight API/ABI incompatibility between 1.0.9 and 1.1.x (r12102)
 * fixed: perl bindings pool usage & object refcounts (r11451, r11630)
 * fixed: perl bindings pool usage and potential memleak (r12397)
 * fixed: javahl crash trying to fetch nonexistent property (r12184)
 * fixed: javahl build can fail due to missing dirs (issue #2032)
 * fixed: RPM build breakage (issue #2111)
 * fixed: i18n issues for windows installer (r11685)
 * allow build system to update single .po file (r11763)

3 files changed, 699 insertions, 6 deletions

diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 4b89c222efe..9eee35b7f37 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.25 2004/10/23 06:11:09 epg Exp $
+# $NetBSD: Makefile.version,v 1.26 2005/01/05 02:04:01 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		1.1.1
+SVNVER=		1.1.2
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 1c78a1f599a..44186ce270d 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2004/11/27 02:35:52 epg Exp $
+$NetBSD: distinfo,v 1.39 2005/01/05 02:04:01 epg Exp $
 
-SHA1 (subversion-1.1.1.tar.gz) = b9afbcc211673ce2a1bf9778b6fa519f740e7ebd
-Size (subversion-1.1.1.tar.gz) = 8101813 bytes
-SHA1 (patch-aa) = 593ff1e235cc918e533f75f2d56fb575adcc7f6d
+SHA1 (subversion-1.1.2.tar.gz) = 3abfb7efb76e5fadea217196905461e441e5b36e
+Size (subversion-1.1.2.tar.gz) = 8106853 bytes
 SHA1 (patch-ad) = 4b3551b4f24823690f1e75eea9d62f1db78b6dc5
 SHA1 (patch-ag) = 98cb7d71ff843c0fbdc0a3a57c96d1c1d6cdc47a
 SHA1 (patch-ah) = 95347e442d72516d74258254892712fa3387d5c9
 SHA1 (patch-ai) = 4515b108ca67f6100cf89eb42def2c3c234c63a4
+SHA1 (patch-aj) = a585176fc87127bd3de579b5a4216918ab8825eb
diff --git a/devel/subversion/patches/patch-aj b/devel/subversion/patches/patch-aj
new file mode 100644
index 00000000000..4fbf5f0f84d
--- /dev/null
+++ b/devel/subversion/patches/patch-aj
@@ -0,0 +1,693 @@
+$NetBSD: patch-aj,v 1.1 2005/01/05 02:04:01 epg Exp $
+
+==== Patch <11x> level 1
+Source: [No source]
+Target: 65390229-12b7-0310-b90b-f21a5aa7ec8e:/branches/1.1.x:12471
+        (http://svn.collab.net/repos/svn)
+Log:
+ r12144:  clkao | 2004-12-04T15:13:55.095399Z
+ * Pass pool to methods in Perl for close_baton.
+ * Use a hash to cache SWIG_TypeQuery results.
+ 
+   * libsvn_swig_perl/swigutil_pl.c:
+     (close_baton): Pass pool to methods in Perl.
+       Use svn_swig_pl_callback_thunk.
+ 
+     (_swig_perl_type_query): New.
+     (_SWIG_TYPE): New.
+  
+     Change callers of SWIG_TypeQuery to use _swig_perl_type_query.
+
+=== subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
+==================================================================
+--- subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c  (revision 12471)
++++ subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c  (patch 11x level 1)
+@@ -31,6 +31,32 @@
+ 
+ #include "swigutil_pl.h"
+ 
++/* cache SWIG_TypeQuery results in a perl hash */
++static HV *type_cache = NULL;
++
++#define _SWIG_TYPE(name) _swig_perl_type_query(name, sizeof (name)-1)
++#define POOLINFO         _SWIG_TYPE("apr_pool_t *")
++
++static swig_type_info *_swig_perl_type_query (const char *typename, U32 klen)
++{
++    SV **type_info;
++    swig_type_info *tinfo;
++
++    if (!type_cache)
++        type_cache = newHV ();
++
++    if (klen == 0)
++        klen = strlen (typename);
++
++    if ((type_info = hv_fetch(type_cache, typename, klen, 0)))
++        return (swig_type_info *) (SvIV (*type_info));
++
++    tinfo = SWIG_TypeQuery(typename);
++    hv_store(type_cache, typename, klen, newSViv ((IV)tinfo), 0);
++
++    return tinfo;
++}
++
+ /* element convertors for perl -> c */
+ typedef void *(*pl_element_converter_t)(SV *value, void *ctx, 
+                                         apr_pool_t *pool);
+@@ -97,7 +123,7 @@
+                                              const char *typename,
+                                              apr_pool_t *pool)
+ {
+-    swig_type_info *tinfo = SWIG_TypeQuery(typename);
++    swig_type_info *tinfo = _swig_perl_type_query(typename, 0);
+     return svn_swig_pl_objs_to_hash (source, tinfo, pool);
+ }
+ 
+@@ -297,7 +323,7 @@
+ 	case 'S': /* swig object */
+ 	    o = va_arg (ap, void *);
+ 	    t = va_arg (ap, swig_type_info *);
+-  
++
+ 	    obj = sv_newmortal ();
+ 	    SWIG_MakePtr (obj, o, t, 0);
+ 	    XPUSHs(obj);
+@@ -411,37 +437,24 @@
+     return newb;
+ }
+ 
+-static svn_error_t * close_baton(void *baton, const char *method)
++static svn_error_t * close_baton(void *baton, const char *method, apr_pool_t *pool)
+ {
+     item_baton *ib = baton;
+-    dSP ;
+ 
+-    ENTER ;
+-    SAVETMPS ;
++    if (ib->baton) {
++        SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
++                                             (void *)method, NULL,
++                                             "OOS", ib->editor, ib->baton,
++                                             pool, POOLINFO));
++        SvREFCNT_dec(ib->baton);
++    }
++    else {
++        SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
++                                             (void *)method, NULL,
++                                             "OS", ib->editor, pool, POOLINFO));
++    }
+ 
+-    PUSHMARK(SP) ;
+-    XPUSHs(ib->editor);
+-
+-    if (ib->baton)
+-	XPUSHs(ib->baton);
+-
+-    PUTBACK;
+-
+-    call_method(method, G_DISCARD);
+-
+-    /* check result? */
+-
+     SvREFCNT_dec(ib->editor);
+-    if (ib->baton)
+-	SvREFCNT_dec(ib->baton);
+-
+-#ifdef SVN_DEBUG
+-    ib->editor = ib->baton = NULL;
+-#endif
+-
+-    FREETMPS ;
+-    LEAVE ;
+-
+     return SVN_NO_ERROR;
+ }
+ 
+@@ -464,13 +477,12 @@
+                                      void **root_baton)
+ {
+     item_baton *ib = edit_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+     SV *result;
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"open_root", &result,
+ 				         "OrS", ib->editor, base_revision,
+-				         dir_pool, poolinfo));
++				         dir_pool, POOLINFO));
+ 
+     *root_baton = make_baton(dir_pool, ib->editor, result);
+     return SVN_NO_ERROR;
+@@ -482,12 +494,11 @@
+                                         apr_pool_t *pool)
+ {
+     item_baton *ib = parent_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"delete_entry", NULL,
+ 				         "OsrOS", ib->editor, path, revision,
+-				         ib->baton, pool, poolinfo));
++				         ib->baton, pool, POOLINFO));
+     return SVN_NO_ERROR;
+ }
+ 
+@@ -499,14 +510,13 @@
+                                          void **child_baton)
+ {
+     item_baton *ib = parent_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+     SV *result;
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"add_directory", &result,
+ 				         "OsOsrS", ib->editor, path, ib->baton,
+ 				         copyfrom_path, copyfrom_revision, 
+-				         dir_pool, poolinfo));
++				         dir_pool, POOLINFO));
+     *child_baton = make_baton(dir_pool, ib->editor, result);
+     return SVN_NO_ERROR;
+ }
+@@ -519,12 +529,11 @@
+ {
+     item_baton *ib = parent_baton;
+     SV *result;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"open_directory", &result,
+ 				         "OsOrS", ib->editor, path, ib->baton,
+-				         base_revision, dir_pool, poolinfo));
++				         base_revision, dir_pool, POOLINFO));
+ 
+     *child_baton = make_baton(dir_pool, ib->editor, result);
+ 
+@@ -537,13 +546,12 @@
+                                            apr_pool_t *pool)
+ {
+     item_baton *ib = dir_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"change_dir_prop", NULL,
+ 				         "OOssS", ib->editor, ib->baton, name,
+ 				         value ? value->data : NULL,
+-				         pool, poolinfo));
++				         pool, POOLINFO));
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -551,7 +559,7 @@
+ static svn_error_t * thunk_close_directory(void *dir_baton,
+                                            apr_pool_t *pool)
+ {
+-    return close_baton(dir_baton, "close_directory");
++    return close_baton(dir_baton, "close_directory", pool);
+ }
+ 
+ static svn_error_t * thunk_absent_directory(const char *path,
+@@ -559,12 +567,11 @@
+ 					    apr_pool_t *pool)
+ {
+     item_baton *ib = parent_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 	   			         (void *)"absent_directory", NULL,
+ 				         "OsOS", ib->editor, path, ib->baton,
+-				         pool, poolinfo));
++				         pool, POOLINFO));
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -578,13 +585,12 @@
+ {
+     item_baton *ib = parent_baton;
+     SV *result;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"add_file", &result,
+ 				         "OsOsrS", ib->editor, path, ib->baton,
+ 				         copyfrom_path, copyfrom_revision,
+-				         file_pool, poolinfo));
++				         file_pool, POOLINFO));
+ 
+     *file_baton = make_baton(file_pool, ib->editor, result);
+     return SVN_NO_ERROR;
+@@ -597,13 +603,12 @@
+                                      void **file_baton)
+ {
+     item_baton *ib = parent_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+     SV *result;
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"open_file", &result,
+ 				         "OsOrS", ib->editor, path, ib->baton,
+-				         base_revision, file_pool, poolinfo));
++				         base_revision, file_pool, POOLINFO));
+ 
+     *file_baton = make_baton(file_pool, ib->editor, result);
+     return SVN_NO_ERROR;
+@@ -621,7 +626,7 @@
+         SvREFCNT_dec(handler);
+     }
+     else {
+-	swig_type_info *tinfo = SWIG_TypeQuery("svn_txdelta_window_t *");
++	swig_type_info *tinfo = _SWIG_TYPE("svn_txdelta_window_t *");
+ 	SVN_ERR (svn_swig_pl_callback_thunk (CALL_SV, handler,
+ 				             NULL, "S", window, tinfo));
+     }
+@@ -637,18 +642,17 @@
+                       void **h_baton)
+ {
+     item_baton *ib = file_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+     SV *result;
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"apply_textdelta", &result,
+ 				         "OOsS", ib->editor, ib->baton,
+-					 base_checksum, pool, poolinfo));
++					 base_checksum, pool, POOLINFO));
+     if (SvOK(result)) {
+ 	if (SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV) {
+ 	    swig_type_info *handler_info = 
+-              SWIG_TypeQuery("svn_txdelta_window_handler_t");
+-            swig_type_info *void_info = SWIG_TypeQuery("void *");
++              _SWIG_TYPE("svn_txdelta_window_handler_t");
++            swig_type_info *void_info = _SWIG_TYPE("void *");
+ 	    AV *array = (AV *)SvRV(result);
+ 
+ 	    if (SWIG_ConvertPtr(*av_fetch (array, 0, 0),
+@@ -680,13 +684,12 @@
+                                             apr_pool_t *pool)
+ {
+     item_baton *ib = file_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"change_file_prop", NULL,
+ 				         "OOssS", ib->editor, ib->baton, name,
+ 				         value ? value->data : NULL,
+-				         pool, poolinfo));
++				         pool, POOLINFO));
+   
+     return SVN_NO_ERROR;
+ }
+@@ -696,20 +699,15 @@
+                                       apr_pool_t *pool)
+ {
+     item_baton *ib = file_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"close_file", NULL, "OOsS",
+ 				         ib->editor, ib->baton, text_checksum,
+-				         pool, poolinfo));
++				         pool, POOLINFO));
+ 
+     SvREFCNT_dec(ib->editor);
+     SvREFCNT_dec(ib->baton);
+ 
+-#ifdef SVN_DEBUG
+-    ib->editor = ib->baton = NULL;
+-#endif
+-
+     return SVN_NO_ERROR;
+ }
+ 
+@@ -718,12 +716,11 @@
+ 				       apr_pool_t *pool)
+ {
+     item_baton *ib = parent_baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
+ 				         (void *)"absent_file", NULL,
+ 				         "OsOS", ib->editor, path, ib->baton,
+-				         pool, poolinfo));
++				         pool, POOLINFO));
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -731,13 +728,13 @@
+ static svn_error_t * thunk_close_edit(void *edit_baton,
+                                       apr_pool_t *pool)
+ {
+-    return close_baton(edit_baton, "close_edit");
++    return close_baton(edit_baton, "close_edit", pool);
+ }
+ 
+ static svn_error_t * thunk_abort_edit(void *edit_baton,
+                                       apr_pool_t *pool)
+ {
+-    return close_baton(edit_baton, "abort_edit");
++    return close_baton(edit_baton, "abort_edit", pool);
+ }
+ 
+ void svn_delta_make_editor(svn_delta_editor_t **editor,
+@@ -777,8 +774,7 @@
+ 					    apr_pool_t *pool)
+ {
+     SV *receiver = baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+-    swig_type_info *tinfo = SWIG_TypeQuery("svn_log_changed_path_t *");
++    swig_type_info *tinfo = _SWIG_TYPE("svn_log_changed_path_t *");
+ 
+     if (!SvOK(receiver))
+ 	return SVN_NO_ERROR;
+@@ -788,7 +784,7 @@
+ 			        "OrsssS", (changed_paths) ?
+ 			        svn_swig_pl_convert_hash(changed_paths, tinfo)
+ 			        : &PL_sv_undef,
+-			        rev, author, date, msg, pool, poolinfo);
++			        rev, author, date, msg, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -799,14 +795,13 @@
+                                             apr_pool_t *pool)
+ {
+     SV *func = baton;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 
+     if (!SvOK(func))
+ 	return SVN_NO_ERROR;
+ 
+     svn_swig_pl_callback_thunk (CALL_SV,
+ 			        func, NULL,
+-			        "srS", path, revision, pool, poolinfo);
++			        "srS", path, revision, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -818,15 +813,14 @@
+                                            apr_pool_t *pool)
+ {
+     SV *func = baton, *result;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+-    swig_type_info *rootinfo = SWIG_TypeQuery("svn_fs_root_t *");
+ 
+     if (!SvOK(func))
+ 	return SVN_NO_ERROR;
+ 
+     svn_swig_pl_callback_thunk (CALL_SV,
+ 			        func, &result,
+-			        "SsS", root, rootinfo, path, pool, poolinfo);
++			        "SsS", root, _SWIG_TYPE("svn_fs_root_t *"),
++                                path, pool, POOLINFO);
+ 
+     *allowed = SvIV (result);
+     SvREFCNT_dec (result);
+@@ -855,7 +849,7 @@
+ 					 apr_pool_t *pool)
+ {
+     SV *result;
+-    swig_type_info *tinfo = SWIG_TypeQuery("apr_file_t *");
++    swig_type_info *tinfo = _SWIG_TYPE("apr_file_t *");
+ 
+     svn_swig_pl_callback_thunk (CALL_METHOD, (void *)"open_tmp_file",
+ 			        &result, "OS", callback_baton, pool, POOLINFO);
+@@ -902,7 +896,6 @@
+ 				   SV *perl_callbacks,
+ 				   apr_pool_t *pool)
+ {
+-    swig_type_info *tinfo = SWIG_TypeQuery("svn_auth_baton_t *");
+     SV *auth_baton;
+ 
+     *cb = apr_pcalloc (pool, sizeof(**cb));
+@@ -915,7 +908,7 @@
+     auth_baton = *hv_fetch((HV *)SvRV(perl_callbacks), "auth", 4, 0);
+ 
+     if (SWIG_ConvertPtr(auth_baton, 
+-                        (void **)&(*cb)->auth_baton, tinfo,0) < 0) {
++                        (void **)&(*cb)->auth_baton, _SWIG_TYPE("svn_auth_baton_t *"),0) < 0) {
+ 	croak("Unable to convert from SWIG Type");
+     }
+     *c_baton = perl_callbacks;
+@@ -930,9 +923,6 @@
+                                              svn_boolean_t may_save,
+                                              apr_pool_t *pool)
+ {
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+-    swig_type_info *credinfo = SWIG_TypeQuery ("svn_auth_cred_simple_t *");
+-
+     /* Be nice and allocate the memory for the cred structure before passing it
+      * off to the perl space */
+     *cred = apr_pcalloc (pool, sizeof (**cred));
+@@ -941,8 +931,8 @@
+     }
+     svn_swig_pl_callback_thunk (CALL_SV,
+                                 baton, NULL,
+-                                "SssbS", *cred, credinfo,
+-                                realm, username, may_save, pool, poolinfo);
++                                "SssbS", *cred, _SWIG_TYPE ("svn_auth_cred_simple_t *"),
++                                realm, username, may_save, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -953,9 +943,6 @@
+                                                svn_boolean_t may_save,
+                                                apr_pool_t *pool)
+ {
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+-    swig_type_info *credinfo = SWIG_TypeQuery ("svn_auth_cred_username_t *");
+-
+     /* Be nice and allocate the memory for the cred structure before passing it
+      * off to the perl space */
+     *cred = apr_pcalloc (pool, sizeof (**cred));
+@@ -964,8 +951,8 @@
+     }
+     svn_swig_pl_callback_thunk (CALL_SV,
+                                 baton, NULL,
+-                                "SsbS", *cred, credinfo,
+-                                realm, may_save, pool, poolinfo);
++                                "SsbS", *cred, _SWIG_TYPE("svn_auth_cred_username_t *"),
++                                realm, may_save, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -979,12 +966,6 @@
+                               svn_boolean_t may_save,
+                               apr_pool_t *pool)
+ {
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+-    swig_type_info *credinfo = SWIG_TypeQuery (
+-                                 "svn_auth_cred_ssl_server_trust_t *");
+-    swig_type_info *cert_info_info = SWIG_TypeQuery (
+-                                 "svn_auth_ssl_server_cert_info_t *");
+-
+     /* Be nice and allocate the memory for the cred structure before passing it
+      * off to the perl space */
+     *cred = apr_pcalloc (pool, sizeof (**cred));
+@@ -993,10 +974,10 @@
+     }
+     svn_swig_pl_callback_thunk (CALL_SV,
+                                 baton, NULL,
+-                                "SsiSbS", *cred, credinfo,
++                                "SsiSbS", *cred, _SWIG_TYPE ("svn_auth_cred_ssl_server_trust_t *"),
+                                 realm, failures, 
+-                                cert_info, cert_info_info,
+-                                may_save, pool, poolinfo);
++                                cert_info, _SWIG_TYPE ("svn_auth_ssl_server_cert_info_t *"),
++                                may_save, pool, POOLINFO);
+ 
+     /* Allow the perl callback to indicate failure by setting all vars to 0 
+      * or by simply doing nothing.  While still allowing them to indicate
+@@ -1017,10 +998,6 @@
+                 svn_boolean_t may_save,
+                 apr_pool_t *pool)
+ {
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+-    swig_type_info *credinfo = SWIG_TypeQuery (
+-                                 "svn_auth_cred_ssl_client_cert_t *");
+-    
+     /* Be nice and allocate the memory for the cred structure before passing it
+      * off to the perl space */
+     *cred = apr_pcalloc (pool, sizeof (**cred));
+@@ -1029,8 +1006,8 @@
+     }
+     svn_swig_pl_callback_thunk (CALL_SV,
+                                 baton, NULL,
+-                                "SsbS", *cred, credinfo,
+-                                realm, may_save, pool, poolinfo);
++                                "SsbS", *cred, _SWIG_TYPE ("svn_auth_cred_ssl_client_cert_t *"),
++                                realm, may_save, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -1042,10 +1019,6 @@
+                                      svn_boolean_t may_save,
+                                      apr_pool_t *pool)
+ {
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+-    swig_type_info *credinfo = SWIG_TypeQuery (
+-                                 "svn_auth_cred_ssl_client_cert_pw_t *");
+-
+     /* Be nice and allocate the memory for the cred structure before passing it
+      * off to the perl space */
+     *cred = apr_pcalloc (pool, sizeof (**cred));
+@@ -1054,8 +1027,8 @@
+     }
+     svn_swig_pl_callback_thunk (CALL_SV,
+                                 baton, NULL,
+-                                "SsbS", *cred, credinfo,
+-                                realm, may_save, pool, poolinfo);
++                                "SsbS", *cred, _SWIG_TYPE ("svn_auth_cred_ssl_client_cert_pw_t *"),
++                                realm, may_save, pool, POOLINFO);
+ 
+     return SVN_NO_ERROR;
+ }
+@@ -1093,9 +1066,6 @@
+     SV *log_msg_sv;
+     SV *tmp_file_sv;
+     SV *commit_items_sv;
+-    swig_type_info *commit_itemsinfo = SWIG_TypeQuery 
+-	                                ("svn_client_commit_item_t *");
+-    swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
+ 
+     if (!SvOK((SV *)baton)) {
+         *log_msg = apr_pstrdup (pool, "");
+@@ -1105,13 +1075,13 @@
+     
+     log_msg_sv = newRV_noinc (sv_newmortal ());
+     tmp_file_sv = newRV_noinc (sv_newmortal ());
+-    commit_items_sv = svn_swig_pl_convert_array (commit_items, 
+-			                         commit_itemsinfo);
++    commit_items_sv = svn_swig_pl_convert_array
++      (commit_items, _SWIG_TYPE("svn_client_commit_item_t *"));
+ 
+     svn_swig_pl_callback_thunk (CALL_SV,
+ 	                        baton, &result,
+ 				"OOOS", log_msg_sv, tmp_file_sv,
+-				commit_items_sv, pool, poolinfo);
++				commit_items_sv, pool, POOLINFO);
+ 
+     if (!SvOK(SvRV(log_msg_sv))) {
+         /* client returned undef to us */
+@@ -1134,7 +1104,7 @@
+     }
+ 
+     if (sv_derived_from (result, "_p_svn_error_t")) {
+-        swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
++        swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
+ 	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+             SvREFCNT_dec(result);
+ 	    croak("Unable to convert from SWIG Type");
+@@ -1156,7 +1126,7 @@
+     svn_swig_pl_callback_thunk(CALL_SV, cancel_baton, &result, "");
+ 
+     if (sv_derived_from(result,"_p_svn_error_t")) { 
+-        swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
++        swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
+ 	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+ 	    SvREFCNT_dec(result);
+ 	    croak("Unable to convert from SWIG Type");
+@@ -1179,7 +1149,7 @@
+                              const char *path,
+                              svn_wc_status_t *status)
+ {
+-  swig_type_info *statusinfo = SWIG_TypeQuery ("svn_wc_status_t *");
++  swig_type_info *statusinfo = _SWIG_TYPE ("svn_wc_status_t *");
+ 
+   if (!SvOK ((SV *)baton)) {
+     return;
+@@ -1201,14 +1171,13 @@
+ {
+     SV *result;
+     svn_error_t *ret_val = SVN_NO_ERROR;
+-    swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+  
+     svn_swig_pl_callback_thunk (CALL_SV, baton, &result, "LrsssS",
+ 		                line_no, revision, author, date, line,
+-				pool, poolinfo);
++				pool, POOLINFO);
+ 
+     if (sv_derived_from (result, "_p_svn_error_t")) {
+-        swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
++        swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
+ 	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+             SvREFCNT_dec(result);
+ 	    croak("Unable to convert from SWIG Type");
+@@ -1251,12 +1220,11 @@
+     apr_pool_t *pool;
+ 
+     if (obj && sv_isobject (obj)) {
+-	swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
+ 	if (sv_derived_from (obj, "SVN::Pool")) {
+ 	    obj = SvRV(obj);
+ 	}
+ 	if (sv_derived_from(obj, "_p_apr_pool_t")) {
+-	    SWIG_ConvertPtr(obj, (void **)&pool, poolinfo, 0);
++	    SWIG_ConvertPtr(obj, (void **)&pool, POOLINFO, 0);
+ 	    return pool;
+ 	}
+     }
+@@ -1344,7 +1312,6 @@
+ 
+ svn_error_t *svn_swig_pl_make_stream (svn_stream_t **stream, SV *obj)
+ {
+-    swig_type_info *tinfo = SWIG_TypeQuery("svn_stream_t *");
+     IO *io;
+     int simple_type = 1;
+ 
+@@ -1361,7 +1328,7 @@
+             simple_type = 0;
+ 
+         if (simple_type) {
+-            SWIG_ConvertPtr(obj, (void **)stream, tinfo, 0);
++            SWIG_ConvertPtr(obj, (void **)stream, _SWIG_TYPE("svn_stream_t *"), 0);
+             return SVN_NO_ERROR;
+         }
+     }
+@@ -1389,11 +1356,10 @@
+ 
+ SV *svn_swig_pl_from_stream (svn_stream_t *stream)
+ {
+-    swig_type_info *tinfo = SWIG_TypeQuery("svn_stream_t *");
+     SV *ret;
+ 
+     svn_swig_pl_callback_thunk (CALL_METHOD, (void *)"new", &ret, "sS",
+-			        "SVN::Stream", stream, tinfo);
++			        "SVN::Stream", stream, _SWIG_TYPE("svn_stream_t *"));
+ 
+     return sv_2mortal (ret);
+ }
+
+==== BEGIN SVK PATCH BLOCK ====
+Version: svk 0.26 (freebsd)
+
+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
+==== END SVK PATCH BLOCK ====