Index: Makefile.in --- Makefile.in.orig 2009-02-16 17:10:48 +0100 +++ Makefile.in 2009-10-22 08:55:31 +0200 @@ -172,7 +172,7 @@ LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done` # special compilation for files destined for mod_dav_svn -COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c +COMPILE_APACHE_MOD = @APXS@ -c -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" $(CPPFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c) COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c @@ -188,7 +188,7 @@ LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) # 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) +LINK_APACHE_MOD = @APXS@ -c -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" $(LDFLAGS) $(APACHE_LDFLAGS) # Compilation of SWIG-generated C source code COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ @@ -677,7 +677,7 @@ ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ $(SWIG_PL_DIR)/native/Makefile Index: build-outputs.mk --- build-outputs.mk.orig 2009-10-15 18:25:52 +0200 +++ build-outputs.mk 2009-10-22 08:55:31 +0200 @@ -373,10 +373,10 @@ cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(LT_NO_UNDEFINED) $(mod_authz_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) mod_dav_svn_PATH = subversion/mod_dav_svn -mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/reports/dated-rev.lo subversion/mod_dav_svn/reports/deleted-rev.lo subversion/mod_dav_svn/reports/file-revs.lo subversion/mod_dav_svn/reports/get-location-segments.lo subversion/mod_dav_svn/reports/get-locations.lo subversion/mod_dav_svn/reports/get-locks.lo subversion/mod_dav_svn/reports/log.lo subversion/mod_dav_svn/reports/mergeinfo.lo subversion/mod_dav_svn/reports/replay.lo subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la +mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/reports/dated-rev.lo subversion/mod_dav_svn/reports/deleted-rev.lo subversion/mod_dav_svn/reports/file-revs.lo subversion/mod_dav_svn/reports/get-location-segments.lo subversion/mod_dav_svn/reports/get-locations.lo subversion/mod_dav_svn/reports/get-locks.lo subversion/mod_dav_svn/reports/log.lo subversion/mod_dav_svn/reports/mergeinfo.lo subversion/mod_dav_svn/reports/replay.lo subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_fs_base/libsvn_fs_base-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la mod_dav_svn_OBJECTS = activity.lo authz.lo deadprops.lo liveprops.lo lock.lo merge.lo mirror.lo mod_dav_svn.lo reports/dated-rev.lo reports/deleted-rev.lo reports/file-revs.lo reports/get-location-segments.lo reports/get-locations.lo reports/get-locks.lo reports/log.lo reports/mergeinfo.lo reports/replay.lo reports/update.lo repos.lo util.lo version.lo subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS) - cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) + cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_fs_base/libsvn_fs_base-1.la ../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../subversion/libsvn_fs_util/libsvn_fs_util-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) opt_test_PATH = subversion/tests/libsvn_subr opt_test_DEPS = subversion/tests/libsvn_subr/opt-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la Index: configure --- configure.orig 2009-10-15 18:25:54 +0200 +++ configure 2009-10-22 08:55:31 +0200 @@ -5496,6 +5496,11 @@ ac_sub_cache_file="$ac_dots$cache_file" ;; esac + args="$args --prefix=$prefix/libexec/subversion/neon" + if [ ".$with_ssl" = .yes ]; then + args="$args --with-ssl" + fi + # The eval makes quoting arguments work. if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args then : Index: subversion/bindings/swig/perl/native/Makefile.PL.in --- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2009-02-16 17:10:48 +0100 +++ subversion/bindings/swig/perl/native/Makefile.PL.in 2009-10-22 08:55:31 +0200 @@ -25,18 +25,14 @@ fs_base fs_util fs_fs/)); -my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/); +my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta client subr ra_local ra_neon ra_svn fs_base fs_fs fs_util wc/); my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@'; my $cppflags = '@CPPFLAGS@'; my $cflags = '@CFLAGS@'; my $apr_cflags = '@SVN_APR_INCLUDES@'; my $apu_cflags = '@SVN_APRUTIL_INCLUDES@'; - -# According to the log of r7937, the flags guarded by the conditional break -# the build on FreeBSD if not conditionalized. -my $apr_ldflags = '@SVN_APR_EXPORT_LIBS@' - if $^O eq 'darwin' or $^O eq 'cygwin'; +my $apr_ldflags = '@SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ -lneon -lssl -lcrypto -lxml2 -liconv -lz -lm'; chomp $apr_shlib_path_var; @@ -45,14 +41,16 @@ DEFINE => $cppflags, CCFLAGS => $cflags, INC => join(' ',$apr_cflags, $apu_cflags, + " -I$top_builddir/neon/src", " -I$swig_srcdir/perl/libsvn_swig_perl", " -I$svnlib_srcdir/include", " -I$svnlib_builddir", " -I$swig_srcdir -g"), OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, + LIBS => [join(' ', "-L@l_prefix@/lib", + "-L$top_builddir/neon/src/.libs", (map {$_ = abs_path($_); "-L$_"} @ldpaths), - @ldmodules, '-lsvn_swig_perl-1', + '-lsvn_swig_perl-1', @ldmodules, @ldmodules, @ldmodules, @ldmodules, @ldmodules, @ldmodules, '-lsvn_swig_perl-1', $apr_ldflags, `$swig -perl -ldflags`)], test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } ); @@ -81,6 +79,7 @@ MAKEFILE=> "Makefile.$_", NAME => "SVN::_".perlish($_), C => ["svn_$_.c"], + OBJECT => "svn_$_.o core.o" ); } 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, " \n
Powered by " + "OpenPKG " "Subversion" " version " SVN_VERSION "." "\n"); 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 +#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 */