Hi, update to Subversion 1.6.5, please test / ok.
== upstream changelog == Version 1.6.5 (21 Aug 2009, from /branches/1.6.x) http://svn.collab.net/repos/svn/tags/1.6.5 User-visible changes: * fix mod_dav_svn directory view links to preserve peg revisions (r38201) * do not error on Windows when ALLUSERPROFILE dir nonexistent (r38053, -5, -7) * properly escape lock comments over ra_neon (r38101, -2) * allow syncing copies of '/' over ra_neon and ra_serf (issue #3438) * make 'svnlook diff' show empty added or deleted files (r38458) * fix building with Apache 2.4 (r36720) * fix possible data loss on ext4 and GPFS filesystems (issue #3442) * resolve symlinks when checking for ~/.subversion (r36023) * don't let svn+ssh SIGKILL ssh processes (issue #2580) * allow PLAIN and LOGIN mechanisms with SASL in svnserve (r38205) * fix peg revision parsing in filenames like 'dir/@file.txt' (issue #3416) * fix detection of Apache <2.0.56 (r38290, -3, -4) * don't pretend to do tree conflict resolution (r38799, -801, -805) * fix data corruption when syncing from svnserve to mod_dav_svn (r38686, -7) * fix GNOME Keyring with '--non-interactive' option (r38222, -3, -61, -410) * fixed: false "File '...' already exists" error during commit (issue #3119) Developer-visible changes: * avoid referencing uninitialized variables (r38388) * plug a couple of error leaks (r38572) * improve windows test output (r38616, -7, -9, -49) == end upstream changelog == Also: * Native make now works fine so don't use gmake. * Disable storing of plaintext passwords for all servers in the system-wide 'servers' config file, instead of disabling storage of all kinds of passwords in the system-wide 'config' config file. The new store-plaintext-passwords=no option, which has existed since 1.6.0, overrides a yes/no prompt which subversion now usually presents before storing passwords in plaintext. gnome-keyring stores passwords encrypted. * Update the main DESCR to reflect current reality. * Add a patch which fixes a broken regression test in the ruby bindings which accidentally slipped into 1.6.5 release. * Put the gnome-keyring subpackage into REGRESS_DEPENDS to make auth-test pass (it loads DSOs at runtime and can't find them if the gnome-keyring subpackage isn't installed). Stefan Index: Makefile =================================================================== RCS file: /cvs/ports/devel/subversion/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- Makefile 11 Aug 2009 08:14:42 -0000 1.61 +++ Makefile 20 Aug 2009 18:51:56 -0000 @@ -7,7 +7,7 @@ COMMENT-ruby= ruby interface to subvers COMMENT-ap2= apache2 subversion modules COMMENT-gnome-keyring= gnome-keyring support for subversion -VERSION= 1.6.4 +VERSION= 1.6.5 DISTNAME= subversion-${VERSION} PKGNAME= ${DISTNAME} PKGNAME-main= ${DISTNAME} @@ -143,8 +143,6 @@ WANTLIB-main+= pthread CFLAGS+= -pthread .endif -# BSD make cannot build target autogen-swig to regenerate bindings -USE_GMAKE= Yes MAKE_FLAGS= MAKE=${MAKE_PROGRAM} USE_LIBTOOL= Yes AUTOCONF_VERSION=2.62 @@ -167,10 +165,6 @@ CONFIGURE_ARGS+=--with-apxs=${LOCALBASE} CONFIGURE_ARGS+=--without-apxs .endif -.if !${FLAVOR:L:Mno_gnome-keyring} -CONFIGURE_ARGS+=--with-gnome-keyring -.endif - REGRESS_DEPENDS=::lang/python/${MODPY_VERSION} MODPY_VERSION?= 2.5 SUBST_VARS+= LOCALBASE SO_VERSION @@ -184,6 +178,11 @@ pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh +.if !${FLAVOR:L:Mno_gnome-keyring} +CONFIGURE_ARGS+=--with-gnome-keyring +REGRESS_DEPENDS+=:${PKGNAME-gnome-keyring}:devel/subversion,-gnome-keyring +.endif + .if !${FLAVOR:L:Mno_bindings} REGRESS_DEPENDS+= :${PKGNAME-python}:devel/subversion,-python \ :${PKGNAME-ruby}:devel/subversion,-ruby @@ -233,8 +232,8 @@ post-install: ${ALL_FAKE_FLAGS} install-swig-rb .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/ - ${INSTALL_DATA} ${FILESDIR}/config \ - ${PREFIX}/share/examples/subversion/config + ${INSTALL_DATA} ${FILESDIR}/servers \ + ${PREFIX}/share/examples/subversion/servers ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/client-side ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/server-side ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts Index: distinfo =================================================================== RCS file: /cvs/ports/devel/subversion/distinfo,v retrieving revision 1.20 diff -u -p -r1.20 distinfo --- distinfo 7 Aug 2009 22:13:36 -0000 1.20 +++ distinfo 20 Aug 2009 12:50:49 -0000 @@ -1,5 +1,5 @@ -MD5 (subversion-1.6.4.tar.bz2) = EeP6g4yaVYytw3jygHVy4g== -RMD160 (subversion-1.6.4.tar.bz2) = R+SV0STAoBbUSiZUXqVW3bMPE/s= -SHA1 (subversion-1.6.4.tar.bz2) = 0EOvxHmtmFsjq+gOlAcpuZ1Os8Q= -SHA256 (subversion-1.6.4.tar.bz2) = fJv25nN8hP43ByBsDKfh4WPPanQXIon4UJNvu8CvDlI= -SIZE (subversion-1.6.4.tar.bz2) = 5484272 +MD5 (subversion-1.6.5.tar.bz2) = GlOg5yvuC/gU9NqDqbamNg== +RMD160 (subversion-1.6.5.tar.bz2) = 6y2tkt4EQ1Lb4W4PnIHK3NXc0X4= +SHA1 (subversion-1.6.5.tar.bz2) = xXXF+s+XLlAQSa1Hqb4Fxc8ig4g= +SHA256 (subversion-1.6.5.tar.bz2) = ZDMb2kWemEuNNptEnuyJ2qLzzSiBhvHSqa2AEbrdTa0= +SIZE (subversion-1.6.5.tar.bz2) = 5491251 Index: files/config =================================================================== RCS file: files/config diff -N files/config --- files/config 15 Feb 2007 10:25:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -# $OpenBSD: config,v 1.1 2007/02/15 10:25:17 dlg Exp $ - -[auth] -store-passwords=no Index: files/servers =================================================================== RCS file: files/servers diff -N files/servers --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/servers 20 Aug 2009 17:16:05 -0000 @@ -0,0 +1,4 @@ +# $OpenBSD$ + +[global] +store-plaintext-passwords=no Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/devel/subversion/patches/patch-configure_ac,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure_ac --- patches/patch-configure_ac 7 Aug 2009 22:13:36 -0000 1.3 +++ patches/patch-configure_ac 20 Aug 2009 12:52:31 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/08/07 22:13:36 steven Exp $ ---- configure.ac.orig Mon Jun 8 18:33:29 2009 -+++ configure.ac Thu Aug 6 17:10:17 2009 +--- configure.ac.orig Tue Aug 18 20:07:47 2009 ++++ configure.ac Thu Aug 20 13:51:18 2009 @@ -6,7 +6,7 @@ AC_PREREQ(2.58) dnl Get the version of Subversion, using m4's esyscmd() command to do this dnl at m4-time, since AC_INIT() requires it then. @@ -19,21 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/ # ==== Libraries, for which we may have source to build ====================== -@@ -448,10 +448,13 @@ if test "$enable_nls" = "yes"; then - enable_nls="no" - ]) - if test "$enable_nls" = "no"; then -+ # Destroy the cached result so we can test again -+ unset ac_cv_search_bindtextdomain - # On some systems, libintl needs libiconv to link properly, - # so try again with -liconv. - AC_SEARCH_LIBS(bindtextdomain, [intl], - [ -+ enable_nls="yes" - # This is here so that -liconv ends up in LIBS - # if it worked with -liconv. - AC_CHECK_LIB(iconv, libiconv_open) -@@ -762,7 +765,7 @@ AS_HELP_STRING([--enable-gprof], +@@ -765,7 +765,7 @@ AS_HELP_STRING([--enable-gprof], # Python: Used for testsuite, and bindings Index: patches/patch-subversion_bindings_swig_ruby_test_test_client_rb =================================================================== RCS file: patches/patch-subversion_bindings_swig_ruby_test_test_client_rb diff -N patches/patch-subversion_bindings_swig_ruby_test_test_client_rb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-subversion_bindings_swig_ruby_test_test_client_rb 20 Aug 2009 17:33:33 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +Fixes a failing regression test which 1.6.5 ended up shipping with. + +--- subversion/bindings/swig/ruby/test/test_client.rb.orig Thu Aug 20 18:32:24 2009 ++++ subversion/bindings/swig/ruby/test/test_client.rb Thu Aug 20 18:32:45 2009 +@@ -1013,7 +1013,7 @@ class SvnClientTest < Test::Unit::TestCase + yield(ctx, branch, rev3, rev4, trunk) + ctx.revert(trunk, false) + ctx.resolve(:path=>trunk_path, +- :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MINE_FULL) ++ :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MERGED) + rev5 = ctx.commit(@wc_path).revision + assert(File.exist?(trunk_path)) + ctx.up(@wc_path) Index: pkg/DESCR-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/DESCR-main,v retrieving revision 1.3 diff -u -p -r1.3 DESCR-main --- pkg/DESCR-main 15 Apr 2007 07:40:27 -0000 1.3 +++ pkg/DESCR-main 20 Aug 2009 17:37:18 -0000 @@ -7,17 +7,15 @@ of your data, or examine the history of In this regard, many people think of a version control system as a sort of time machine. -Due to known problems with Berkeley db on macppc you can only create -filesystem (fsfs) based repositories. No problems exist when subversion -is only used as a client, however. - Note that you need to install the following subpackages to gain the appropriate functionality: -perl Perl bindings to Subversion -python Python bindings to Subversion -ruby Ruby bindings to Subversion -ap2 Apache httpd 2 modules for Subversion + -gnome-keyring Support for the gnome-keyring password store -Also note that authentication credential caching is disabled by default -by setting "store-passwords" to "no" in ${SYSCONFDIR}/subversion/config. -This is a different default behaviour to a standard subversion install. +Also note that plaintext-password caching is disabled by default +by setting "store-plaintext-passwords" to "no" in ${SYSCONFDIR}/subversion/servers. +This is a different default behaviour to a standard subversion install, +which would ask the user before storing passwords in plaintext. Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v retrieving revision 1.5 diff -u -p -r1.5 PLIST-main --- pkg/PLIST-main 28 Apr 2009 23:43:57 -0000 1.5 +++ pkg/PLIST-main 20 Aug 2009 17:23:37 -0000 @@ -136,8 +136,8 @@ share/examples/subversion/client-side/sv share/examples/subversion/client-side/svn2cl/svn2html.xsl share/examples/subversion/client-side/svn_apply_autoprops.py share/examples/subversion/client-side/svn_export_empty_files.py -share/examples/subversion/config -...@sample ${SYSCONFDIR}/subversion/config +share/examples/subversion/servers +...@sample ${SYSCONFDIR}/subversion/servers share/examples/subversion/dumpprops.py share/examples/subversion/get-location-segments.py share/examples/subversion/getfile.py
