Ticket #16597: patch-keychain.diff

./build/generator/gen_make.py

@@ -187 +187 @@
       opts = self.swig.opts[objname.lang]
       if not self.release_mode:
         self.ofile.write('$(top_builddir)/%s: %s\n' % (objname, deps) +
-          '\t$(SWIG) $(SWIG_INCLUDES) %s ' % opts +
+          '\t$(SWIG) $(SWIG_DEFINES) $(SWIG_INCLUDES) %s ' % opts +
           '-o $@ $(top_srcdir)/%s\n' % source
         )
 

./subversion/bindings/javahl/native/SVNClient.cpp

@@ -1125 +1125 @@
     /* The main disk-caching auth providers, for both
      * 'username/password' creds and 'username' creds.  */
     svn_auth_provider_object_t *provider;
+#ifdef DARWIN
+    svn_client_get_keychain_simple_provider (&provider, pool);
+    APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
+#endif
 #ifdef WIN32
     svn_client_get_windows_simple_provider(&provider, pool);
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;

./subversion/include/svn_client.h

@@ -150 +150 @@
 svn_client_get_simple_provider(svn_auth_provider_object_t **provider,
                                apr_pool_t *pool);
 
+#if defined(DARWIN) || defined(DOXYGEN)
+
+/**
+ * Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_simple_t that gets/sets information from the user's
+ * ~/.subversion configuration directory.  Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_simple_provider(), except that the
+ * password is stored in the Mac OS KeyChain.
+ *
+ * @since New in 1.4
+ * @note This function is only available on Mac OS 10.2 and higher.
+ */
+void
+svn_client_get_keychain_simple_provider(svn_auth_provider_object_t **provider,
+                                      apr_pool_t *pool);
+
+#endif /* DARWIN || DOXYGEN */
 
 #if (defined(WIN32) && !defined(__MINGW32__)) || defined(DOXYGEN)
 /**

./subversion/libsvn_client/compat_providers.c

@@ -57 +57 @@
   svn_auth_get_simple_provider(provider, pool);
 }
 
+#if defined(DARWIN)
+void
+svn_client_get_keychain_simple_provider(svn_auth_provider_object_t **provider,
+                                       apr_pool_t *pool)
+{
+  svn_auth_get_keychain_simple_provider(provider, pool);
+}
+#endif /* DARWIN */
+
 #if defined(WIN32) && !defined(__MINGW32__)
 void
 svn_client_get_windows_simple_provider(svn_auth_provider_object_t **provider,