You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
95 lines
3.6 KiB
95 lines
3.6 KiB
Index: subversion/libsvn_ra_svn/cyrus_auth.c |
|
--- subversion/libsvn_ra_svn/cyrus_auth.c.orig 2009-08-17 20:34:52 +0200 |
|
+++ subversion/libsvn_ra_svn/cyrus_auth.c 2009-10-22 08:55:31 +0200 |
|
@@ -165,10 +165,13 @@ |
|
|
|
static svn_error_t *sasl_init_cb(apr_pool_t *pool) |
|
{ |
|
- if (svn_ra_svn__sasl_common_init(pool) != APR_SUCCESS |
|
- || sasl_client_init(NULL) != SASL_OK) |
|
+ int result; |
|
+ if (svn_ra_svn__sasl_common_init(pool) != APR_SUCCESS) |
|
+ return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, |
|
+ _("Could not initialize the SASL library (APR failure)")); |
|
+ if ((result = sasl_client_init(NULL)) != SASL_OK) |
|
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, |
|
- _("Could not initialize the SASL library")); |
|
+ sasl_errstring(result, NULL, NULL)); |
|
return SVN_NO_ERROR; |
|
} |
|
|
|
Index: subversion/mod_dav_svn/repos.c |
|
--- subversion/mod_dav_svn/repos.c.orig 2009-10-14 20:05:15 +0200 |
|
+++ subversion/mod_dav_svn/repos.c 2009-10-22 09:00:32 +0200 |
|
@@ -3108,6 +3108,7 @@ |
|
*/ |
|
ap_fputs(output, bb, |
|
" </ul>\n <hr noshade><em>Powered by " |
|
+ "<a href=\"http://www.openpkg.org/\">OpenPKG</a> " |
|
"<a href=\"http://subversion.tigris.org/\">Subversion" |
|
"</a> version " SVN_VERSION "." |
|
"</em>\n</body></html>"); |
|
Index: subversion/svnserve/cyrus_auth.c |
|
--- subversion/svnserve/cyrus_auth.c.orig 2009-08-17 20:34:52 +0200 |
|
+++ subversion/svnserve/cyrus_auth.c 2009-10-22 08:55:31 +0200 |
|
@@ -105,7 +105,7 @@ |
|
status = svn_ra_svn__sasl_common_init(pool); |
|
if (status) |
|
return svn_error_wrap_apr(status, |
|
- _("Could not initialize the SASL library")); |
|
+ _("Could not initialize the SASL library (svnserve: APR failure)")); |
|
|
|
/* The second parameter tells SASL to look for a configuration file |
|
named subversion.conf. */ |
|
@@ -115,7 +115,7 @@ |
|
svn_error_t *err = svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, |
|
sasl_errstring(result, NULL, NULL)); |
|
return svn_error_quick_wrap(err, |
|
- _("Could not initialize the SASL library")); |
|
+ _("Could not initialize the SASL library (svnserve)")); |
|
} |
|
return SVN_NO_ERROR; |
|
} |
|
Index: subversion/svnserve/main.c |
|
--- subversion/svnserve/main.c.orig 2008-11-02 20:34:25 +0100 |
|
+++ subversion/svnserve/main.c 2009-10-22 08:55:31 +0200 |
|
@@ -51,6 +51,10 @@ |
|
|
|
#include "server.h" |
|
|
|
+#ifdef SVN_HAVE_SASL |
|
+#include <syslog.h> |
|
+#endif |
|
+ |
|
/* The strategy for handling incoming connections. Some of these may be |
|
unavailable due to platform limitations. */ |
|
enum connection_handling_mode { |
|
@@ -389,6 +393,7 @@ |
|
|
|
#ifdef SVN_HAVE_SASL |
|
SVN_INT_ERR(cyrus_init(pool)); |
|
+ openlog("svnserve", LOG_NDELAY|LOG_PID, LOG_DAEMON); |
|
#endif |
|
|
|
/* Check library versions */ |
|
Index: neon/src/ne_openssl.c |
|
--- neon/src/ne_openssl.c.orig 2010-01-20 21:40:56.000000000 +0100 |
|
+++ neon/src/ne_openssl.c 2010-04-03 21:05:23.000000000 +0200 |
|
@@ -604,6 +604,17 @@ |
|
ne_free(ctx); |
|
} |
|
|
|
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x10000000L |
|
+/* OpenSSL 1.0 removed SSL_SESSION_cmp for no apparent reason - hoping |
|
+ * it is reasonable to assume that comparing the session IDs is |
|
+ * sufficient. */ |
|
+static int SSL_SESSION_cmp(SSL_SESSION *a, SSL_SESSION *b) |
|
+{ |
|
+ return a->session_id_length == b->session_id_length |
|
+ && memcmp(a->session_id, b->session_id, a->session_id_length) == 0; |
|
+} |
|
+#endif |
|
+ |
|
/* For internal use only. */ |
|
int ne__negotiate_ssl(ne_session *sess) |
|
{
|
|
|