openpkg-packages/subversion/subversion.patch

Index: Makefile.in
--- Makefile.in.orig	2008-08-26 19:27:56 +0200
+++ Makefile.in	2009-01-25 14:10:31 +0100
@@ -156,7 +156,7 @@
 LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 
 # 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 $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
@@ -171,7 +171,7 @@
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(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 $@
@@ -639,7 +639,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: apr-util/crypto/getuuid.c
--- apr-util/crypto/getuuid.c.orig	2008-12-19 20:16:33 +0100
+++ apr-util/crypto/getuuid.c	2009-01-25 14:10:31 +0100
@@ -131,7 +131,7 @@
 
     /* crap. this isn't crypto quality, but it will be Good Enough */
 
-    get_system_time(&time_now);
+    time_now = apr_time_now();
     srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
 
     return rand() & 0x0FFFF;
Index: build-outputs.mk
--- build-outputs.mk.orig	2008-12-19 20:16:59 +0100
+++ build-outputs.mk	2009-01-25 14:10:31 +0100
@@ -330,10 +330,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/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/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/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	2008-12-19 20:17:01 +0100
+++ configure	2009-01-25 14:10:31 +0100
@@ -5092,6 +5092,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: neon/src/ne_auth.c
--- neon/src/ne_auth.c.orig	2008-12-19 20:16:34 +0100
+++ neon/src/ne_auth.c	2009-01-25 14:10:31 +0100
@@ -645,6 +645,7 @@
         
         if (ne_uri_parse(token, &rel) == 0) {
             /* Resolve relative to the Request-URI. */
+            base.path = "/";
             ne_uri_resolve(&base, &rel, &absolute);
 
             base.path = absolute.path;
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2008-03-22 00:44:46 +0100
+++ subversion/bindings/swig/perl/native/Makefile.PL.in	2009-01-25 14:10:31 +0100
@@ -25,17 +25,13 @@
                                                                       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 $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;
 
@@ -43,14 +39,16 @@
     ABSTRACT => 'Perl bindings for Subversion',
     DEFINE => $cppflags,
     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" }
 );
@@ -79,6 +77,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	2008-12-19 15:51:10 +0100
+++ subversion/libsvn_ra_svn/cyrus_auth.c	2009-01-25 14:10:31 +0100
@@ -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	2008-04-04 11:13:09 +0200
+++ subversion/mod_dav_svn/repos.c	2009-01-25 14:10:31 +0100
@@ -2882,6 +2882,7 @@
       if (gen_html)
         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	2008-03-07 05:09:46 +0100
+++ subversion/svnserve/cyrus_auth.c	2009-01-25 14:10:31 +0100
@@ -101,7 +101,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. */
@@ -111,7 +111,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-03-01 04:15:19 +0100
+++ subversion/svnserve/main.c	2009-01-25 14:10:31 +0100
@@ -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 {
@@ -345,6 +349,7 @@
 
 #ifdef SVN_HAVE_SASL
   SVN_INT_ERR(cyrus_init(pool));
+  openlog("svnserve", LOG_NDELAY|LOG_PID, LOG_DAEMON);
 #endif
 
   /* Check library versions */