subversion/subversion.patch@300d43423c2e (annotated)
subversion/subversion.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@513 | 1 | Index: configure |
| michael@513 | 2 | --- configure.orig 2012-02-10 16:45:29.000000000 +0100 |
| michael@513 | 3 | +++ configure 2012-02-15 10:31:57.000000000 +0100 |
| michael@513 | 4 | @@ -5956,6 +5956,11 @@ |
| michael@513 | 5 | ac_sub_cache_file="$ac_dots$cache_file" ;; |
| michael@513 | 6 | esac |
| michael@513 | 7 | |
| michael@513 | 8 | + args="$args --prefix=$prefix/libexec/subversion/neon" |
| michael@513 | 9 | + if [ ".$with_ssl" = .yes ]; then |
| michael@513 | 10 | + args="$args --with-ssl" |
| michael@513 | 11 | + fi |
| michael@513 | 12 | + |
| michael@513 | 13 | # The eval makes quoting arguments work. |
| michael@513 | 14 | if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=$apr_config --with-apr-util=$apu_config |
| michael@513 | 15 | then : |
| michael@513 | 16 | Index: subversion/mod_dav_svn/repos.c |
| michael@513 | 17 | --- subversion/mod_dav_svn/repos.c.orig 2012-02-02 17:13:30.000000000 +0100 |
| michael@513 | 18 | +++ subversion/mod_dav_svn/repos.c 2012-02-15 10:31:57.000000000 +0100 |
| michael@513 | 19 | @@ -3507,6 +3507,7 @@ |
| michael@513 | 20 | */ |
| michael@513 | 21 | ap_fputs(output, bb, |
| michael@513 | 22 | " </ul>\n <hr noshade><em>Powered by " |
| michael@513 | 23 | + "<a href=\"http://www.openpkg.org/\">OpenPKG</a> " |
| michael@513 | 24 | "<a href=\"http://subversion.apache.org/\">" |
| michael@513 | 25 | "Apache Subversion" |
| michael@513 | 26 | "</a> version " SVN_VERSION "." |
| michael@513 | 27 | Index: subversion/svnserve/cyrus_auth.c |
| michael@513 | 28 | --- subversion/svnserve/cyrus_auth.c.orig 2011-06-23 18:43:25.000000000 +0200 |
| michael@513 | 29 | +++ subversion/svnserve/cyrus_auth.c 2012-02-15 10:31:57.000000000 +0100 |
| michael@513 | 30 | @@ -110,7 +110,7 @@ |
| michael@513 | 31 | status = svn_ra_svn__sasl_common_init(pool); |
| michael@513 | 32 | if (status) |
| michael@513 | 33 | return svn_error_wrap_apr(status, |
| michael@513 | 34 | - _("Could not initialize the SASL library")); |
| michael@513 | 35 | + _("Could not initialize the SASL library (svnserve: APR failure)")); |
| michael@513 | 36 | |
| michael@513 | 37 | /* The second parameter tells SASL to look for a configuration file |
| michael@513 | 38 | named subversion.conf. */ |
| michael@513 | 39 | @@ -120,7 +120,7 @@ |
| michael@513 | 40 | svn_error_t *err = svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, |
| michael@513 | 41 | sasl_errstring(result, NULL, NULL)); |
| michael@513 | 42 | return svn_error_quick_wrap(err, |
| michael@513 | 43 | - _("Could not initialize the SASL library")); |
| michael@513 | 44 | + _("Could not initialize the SASL library (svnserve)")); |
| michael@513 | 45 | } |
| michael@513 | 46 | return SVN_NO_ERROR; |
| michael@513 | 47 | } |
| michael@513 | 48 | Index: subversion/svnserve/main.c |
| michael@513 | 49 | --- subversion/svnserve/main.c.orig 2011-06-21 20:00:13.000000000 +0200 |
| michael@513 | 50 | +++ subversion/svnserve/main.c 2012-02-15 10:31:57.000000000 +0100 |
| michael@513 | 51 | @@ -59,6 +59,10 @@ |
| michael@513 | 52 | |
| michael@513 | 53 | #include "server.h" |
| michael@513 | 54 | |
| michael@513 | 55 | +#ifdef SVN_HAVE_SASL |
| michael@513 | 56 | +#include <syslog.h> |
| michael@513 | 57 | +#endif |
| michael@513 | 58 | + |
| michael@513 | 59 | /* The strategy for handling incoming connections. Some of these may be |
| michael@513 | 60 | unavailable due to platform limitations. */ |
| michael@513 | 61 | enum connection_handling_mode { |
| michael@513 | 62 | @@ -446,6 +450,7 @@ |
| michael@513 | 63 | |
| michael@513 | 64 | #ifdef SVN_HAVE_SASL |
| michael@513 | 65 | SVN_INT_ERR(cyrus_init(pool)); |
| michael@513 | 66 | + openlog("svnserve", LOG_NDELAY|LOG_PID, LOG_DAEMON); |
| michael@513 | 67 | #endif |
| michael@513 | 68 | |
| michael@513 | 69 | /* Check library versions */ |
