OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 21-Mar-2009 12:53:07 Branch: HEAD Handle: 2009032111530700 Modified files: openpkg-src/subversion subversion.patch subversion.spec Log: upgrading package: subversion 1.5.6 -> 1.6.0 Summary: Revision Changes Path 1.32 +36 -58 openpkg-src/subversion/subversion.patch 1.163 +8 -6 openpkg-src/subversion/subversion.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/subversion/subversion.patch ============================================================================ $ cvs diff -u -r1.31 -r1.32 subversion.patch --- openpkg-src/subversion/subversion.patch 25 Jan 2009 13:12:42 -0000 1.31 +++ openpkg-src/subversion/subversion.patch 21 Mar 2009 11:53:07 -0000 1.32 @@ -1,17 +1,17 @@ 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) +--- Makefile.in.orig 2009-02-16 17:10:48 +0100 ++++ Makefile.in 2009-03-21 10:13:09 +0100 +@@ -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 $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c -@@ -171,7 +171,7 @@ - LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) + 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) @@ -19,7 +19,7 @@ # 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 @@ +@@ -677,7 +677,7 @@ ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL @@ -28,28 +28,16 @@ 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 @@ +--- build-outputs.mk.orig 2009-03-19 19:34:53 +0100 ++++ build-outputs.mk 2009-03-21 12:00:02 +0100 +@@ -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/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 +-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) @@ -57,9 +45,9 @@ 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 @@ +--- configure.orig 2009-03-19 19:34:55 +0100 ++++ configure 2009-03-21 10:13:09 +0100 +@@ -5422,6 +5422,11 @@ ac_sub_cache_file="$ac_dots$cache_file" ;; esac @@ -71,21 +59,10 @@ # 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 @@ +--- 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-03-21 12:02:29 +0100 +@@ -25,18 +25,14 @@ fs_base fs_util fs_fs/)); @@ -94,6 +71,7 @@ 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@'; - @@ -105,9 +83,9 @@ chomp $apr_shlib_path_var; -@@ -43,14 +39,16 @@ - ABSTRACT => 'Perl bindings for Subversion', +@@ -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", @@ -124,7 +102,7 @@ `$swig -perl -ldflags`)], test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } ); -@@ -79,6 +77,7 @@ +@@ -81,6 +79,7 @@ MAKEFILE=> "Makefile.$_", NAME => "SVN::_".perlish($_), C => ["svn_$_.c"], @@ -133,8 +111,8 @@ } 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 +--- subversion/libsvn_ra_svn/cyrus_auth.c.orig 2008-12-20 02:05:18 +0100 ++++ subversion/libsvn_ra_svn/cyrus_auth.c 2009-03-21 10:13:09 +0100 @@ -165,10 +165,13 @@ static svn_error_t *sasl_init_cb(apr_pool_t *pool) @@ -153,9 +131,9 @@ } 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 @@ +--- subversion/mod_dav_svn/repos.c.orig 2009-02-16 21:35:25 +0100 ++++ subversion/mod_dav_svn/repos.c 2009-03-21 10:13:09 +0100 +@@ -3015,6 +3015,7 @@ if (gen_html) ap_fputs(output, bb, " </ul>\n <hr noshade><em>Powered by " @@ -164,9 +142,9 @@ "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 @@ +--- subversion/svnserve/cyrus_auth.c.orig 2008-08-29 17:43:09 +0200 ++++ subversion/svnserve/cyrus_auth.c 2009-03-21 10:13:09 +0100 +@@ -105,7 +105,7 @@ status = svn_ra_svn__sasl_common_init(pool); if (status) return svn_error_wrap_apr(status, @@ -175,7 +153,7 @@ /* The second parameter tells SASL to look for a configuration file named subversion.conf. */ -@@ -111,7 +111,7 @@ +@@ -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, @@ -185,8 +163,8 @@ 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 +--- subversion/svnserve/main.c.orig 2008-11-02 20:34:25 +0100 ++++ subversion/svnserve/main.c 2009-03-21 10:13:09 +0100 @@ -51,6 +51,10 @@ #include "server.h" @@ -198,7 +176,7 @@ /* The strategy for handling incoming connections. Some of these may be unavailable due to platform limitations. */ enum connection_handling_mode { -@@ -345,6 +349,7 @@ +@@ -389,6 +393,7 @@ #ifdef SVN_HAVE_SASL SVN_INT_ERR(cyrus_init(pool)); @@ . patch -p0 <<'@@ .' Index: openpkg-src/subversion/subversion.spec ============================================================================ $ cvs diff -u -r1.162 -r1.163 subversion.spec --- openpkg-src/subversion/subversion.spec 27 Feb 2009 20:01:32 -0000 1.162 +++ openpkg-src/subversion/subversion.spec 21 Mar 2009 11:53:07 -0000 1.163 @@ -22,8 +22,8 @@ ## # package version -%define V_dist 1.5.6 -%define V_opkg 1.5.6 +%define V_dist 1.6.0 +%define V_opkg 1.6.0 %define V_cvs2svn 2.1.1 %define V_svn2cvs 20080504 %define V_book_html 20081026 @@ -40,7 +40,7 @@ Group: SCM License: Apache/BSD Version: %{V_opkg} -Release: 20090227 +Release: 20090321 # package options %option with_fsl yes @@ -71,8 +71,8 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, make, libtool, sed, pkgconfig PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: diffutils, db, openssl, zlib, libiconv, expat -PreReq: diffutils, db, openssl, zlib, libiconv, expat +BuildPreReq: diffutils, db, openssl, zlib, libiconv, expat, sqlite +PreReq: diffutils, db, openssl, zlib, libiconv, expat, sqlite %if "%{with_fsl}" == "yes" BuildPreReq: fsl PreReq: fsl @@ -142,6 +142,7 @@ cp %{SOURCE svn2cvs.pl-%{V_svn2cvs}} svn2cvs.pl %patch -p0 rm -rf serf + mkdir db # substitute path from applied patch %{l_shtool} subst %{l_value -s -a} \ @@ -180,7 +181,8 @@ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ - --with-berkeley-db=%{l_prefix} \ + --with-sqlite=%{l_prefix} \ + --with-berkeley-db="db.h:%{l_prefix}/include:%{l_prefix}/lib:db" \ --with-dbm=db45 \ --with-ssl=openssl \ --with-zlib=%{l_prefix} \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
