For Subversion users who would like to test-drive Subversion 1.8 on OpenBSD-current, the diff below updates the port to 1.8.0-rc2.
Subversion 1.8 requires the port of serf I posted here: http://marc.info/?l=openbsd-ports&m=136878247320075&w=2 For details about Subversion 1.8, see http://subversion.apache.org/#news-20130516 If no show-stopper bugs are found, this will become the final 1.8.0 release within 4 weeks. I'd appreciate any test reports. I have the ability to commit bug fixes upstream so please report directly to me. I apologize to any ports@ readers who believe this post is off-topic. I got good results last time when I sent pre-releases of Subversion 1.7, which is why I'm repeating this effort. Getting tests from the OpenBSD community, which tends to produce quality bug reports, helps make new major Subversion releases a lot better. Note that the working copy format has changed, which means that working copies created with 1.7 will need to be upgraded to the 1.8 format with 'svn upgrade' before they can be ussed. There is no downgrade path for working copies. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/subversion/Makefile,v retrieving revision 1.121 diff -u -p -r1.121 Makefile --- Makefile 3 May 2013 07:46:12 -0000 1.121 +++ Makefile 17 May 2013 09:58:17 -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.7.9 +VERSION= 1.8.0-rc2 DISTNAME= subversion-${VERSION} PKGNAME-main= ${DISTNAME} FULLPKGNAME-perl= p5-SVN-${VERSION} @@ -21,10 +21,10 @@ FULLPKGPATH-ap2= devel/subversion,-ap2 FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION} FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring -SO_VERSION= 1.3 +SO_VERSION= 1.4 SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \ svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 \ - svn_ra_neon-1 svn_ra_local-1 svn_ra_neon-1 \ + svn_ra_serf-1 svn_ra_local-1 \ svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 SVN_EXT_LIBS= svn_swig_perl-1 svn_swig_py-1 svn_swig_ruby-1 \ svn_auth_gnome_keyring-1 @@ -63,15 +63,14 @@ MULTI_PACKAGES = -main -ap2 -perl -pytho MAINSPEC = ${PKGNAME}:devel/subversion,-main LIB_DEPENDS-main = ${LIB_DEPENDS} \ - net/neon>=0.26.2 \ + net/serf \ devel/apr \ devel/apr-util \ security/cyrus-sasl2 \ devel/libmagic -WANTLIB-main= ${WANTLIB} asn1 c crypto db gssapi krb5 ssl \ - neon>=26 apr-1 aprutil-1 sasl2>=2 sqlite3 \ - m proxy stdc++ +WANTLIB-main= ${WANTLIB} c crypto db ssl \ + serf-1 apr-1 aprutil-1 sasl2>=2 sqlite3 RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} TOOLS_HOOK_SCRIPTS= commit-access-control.cfg.example \ @@ -103,8 +102,8 @@ LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPEN WANTLIB-perl += ${_lib}>=${SO_VERSION} .endfor -WANTLIB-python= ${WANTLIB} apr-1 aprutil-1 asn1 crypto gssapi db \ - krb5 neon proxy sasl2 sqlite3 ssl ${MODPY_WANTLIB} +WANTLIB-python= ${WANTLIB} apr-1 aprutil-1 crypto db m \ + serf-1 sasl2 sqlite3 ssl util ${MODPY_WANTLIB} RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS} ${MODGETTEXT_LIB_DEPENDS} \ ${MAINSPEC} @@ -113,8 +112,8 @@ WANTLIB-python += ${_lib}>=${SO_VERSION} .endfor MODRUBY_REV= 1.8 -WANTLIB-ruby= ${WANTLIB} apr-1 aprutil-1 asn1 crypto gssapi db \ - krb5 m neon proxy sasl2 sqlite3 ssl ${MODRUBY_WANTLIB} +WANTLIB-ruby= ${WANTLIB} apr-1 aprutil-1 crypto db m \ + serf-1 sasl2 sqlite3 ssl ${MODRUBY_WANTLIB} RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS} LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS} \ ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC} @@ -124,8 +123,7 @@ WANTLIB-ruby += ${_lib}>=${SO_VERSION} WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 gcrypt gpg-error \ dbus-1>=7 glib-2.0 gnome-keyring>=6 pcre>=2 sqlite3 \ - svn_subr-1>=${SO_VERSION} ffi gmodule-2.0 gobject-2.0 \ - gthread-2.0 + svn_subr-1>=${SO_VERSION} ffi gmodule-2.0 gobject-2.0 LIB_DEPENDS-gnome-keyring= ${MAINSPEC} \ ${MODGETTEXT_LIB_DEPENDS} \ x11/gnome/libgnome-keyring @@ -167,14 +165,15 @@ CONFIGURE_ENV+= RUBY=ruby${MODRUBY_BINRE .if ${BUILD_PACKAGES:M-ap2} CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}/sbin/apxs2 \ - --disable-mod-activation + --disable-mod-activation \ + --with-apache-libexecdir=${LOCALBASE}/lib/apache2 BUILD_DEPENDS+= www/apache-httpd .else CONFIGURE_ARGS+=--without-apxs .endif TEST_DEPENDS=${MODPY_RUN_DEPENDS} -SUBST_VARS+= LOCALBASE SO_VERSION +SUBST_VARS+= LOCALBASE pre-patch: @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python @@ -213,7 +212,7 @@ post-build: @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} svnmucc @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ - ${MAKE_FLAGS} svnauthz-validate + ${MAKE_FLAGS} svnauthz @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} svn-populate-node-origins-index Index: distinfo =================================================================== RCS file: /cvs/ports/devel/subversion/distinfo,v retrieving revision 1.38 diff -u -p -r1.38 distinfo --- distinfo 3 May 2013 07:46:12 -0000 1.38 +++ distinfo 17 May 2013 08:50:20 -0000 @@ -1,2 +1,2 @@ -SHA256 (subversion-1.7.9.tar.bz2) = +EVMWF+Zr+12QjKlBI2bi/0KJamrjjOepp/hIExFPvQ= -SIZE (subversion-1.7.9.tar.bz2) = 6040347 +SHA256 (subversion-1.8.0-rc2.tar.bz2) = sDQ18TVUOXPyEBLwvGmqRM1NNrWaPOWgJ4aHomOfDP0= +SIZE (subversion-1.8.0-rc2.tar.bz2) = 6702154 Index: patches/patch-subversion_libsvn_subr_auth_c =================================================================== RCS file: patches/patch-subversion_libsvn_subr_auth_c diff -N patches/patch-subversion_libsvn_subr_auth_c --- patches/patch-subversion_libsvn_subr_auth_c 23 Oct 2011 09:51:59 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.4 2011/10/23 09:51:59 stsp Exp $ ---- subversion/libsvn_subr/auth.c.orig Tue Jun 7 16:45:59 2011 -+++ subversion/libsvn_subr/auth.c Sat Oct 22 10:40:13 2011 -@@ -399,7 +399,7 @@ svn_auth_get_platform_specific_provider - const char *library_label, *library_name; - const char *provider_function_name, *version_function_name; - library_name = apr_psprintf(pool, -- "libsvn_auth_%s-%d.so.0", -+ "libsvn_auth_%s-%d.so.${SO_VERSION}", - provider_name, - SVN_VER_MAJOR); - library_label = apr_psprintf(pool, "svn_%s", provider_name); Index: pkg/PFRAG.shared-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PFRAG.shared-main,v retrieving revision 1.2 diff -u -p -r1.2 PFRAG.shared-main --- pkg/PFRAG.shared-main 2 Nov 2008 20:43:49 -0000 1.2 +++ pkg/PFRAG.shared-main 17 May 2013 09:24:59 -0000 @@ -8,7 +8,7 @@ @lib lib/libsvn_fs_util-1.so.${LIBsvn_fs_util-1_VERSION} @lib lib/libsvn_ra-1.so.${LIBsvn_ra-1_VERSION} @lib lib/libsvn_ra_local-1.so.${LIBsvn_ra_local-1_VERSION} -@lib lib/libsvn_ra_neon-1.so.${LIBsvn_ra_neon-1_VERSION} +@lib lib/libsvn_ra_serf-1.so.${LIBsvn_ra_serf-1_VERSION} @lib lib/libsvn_ra_svn-1.so.${LIBsvn_ra_svn-1_VERSION} @lib lib/libsvn_repos-1.so.${LIBsvn_repos-1_VERSION} @lib lib/libsvn_subr-1.so.${LIBsvn_subr-1_VERSION} Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v retrieving revision 1.12 diff -u -p -r1.12 PLIST-main --- pkg/PLIST-main 28 Apr 2012 09:53:38 -0000 1.12 +++ pkg/PLIST-main 17 May 2013 09:29:02 -0000 @@ -7,10 +7,15 @@ @comment @bin bin/diff @comment @bin bin/diff3 @comment @bin bin/diff4 +@bin bin/fsfs-access-map +@bin bin/fsfs-reorg +@bin bin/fsfs-stats @bin bin/svn +@bin bin/svn-bench @bin bin/svn-populate-node-origins-index @bin bin/svn-rep-sharing-stats @bin bin/svnadmin +@bin bin/svnauthz @bin bin/svnauthz-validate @bin bin/svndumpfilter @bin bin/svnlook @@ -82,8 +87,8 @@ lib/libsvn_ra-1.a lib/libsvn_ra-1.la lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la -lib/libsvn_ra_neon-1.a -lib/libsvn_ra_neon-1.la +lib/libsvn_ra_serf-1.a +lib/libsvn_ra_serf-1.la lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_repos-1.a @@ -102,6 +107,7 @@ lib/libsvn_wc-1.la @man man/man1/svnadmin.1 @man man/man1/svndumpfilter.1 @man man/man1/svnlook.1 +@man man/man1/svnmucc.1 @man man/man1/svnrdump.1 @man man/man1/svnsync.1 @man man/man1/svnversion.1 @@ -176,6 +182,7 @@ share/examples/subversion/svnserve-sgid. share/examples/subversion/svnshell.py share/examples/subversion/svnshell.rb share/examples/subversion/testwrite.c +share/examples/subversion/walk-config-auth.py share/examples/subversion/xslt/ share/examples/subversion/xslt/svnindex.css share/examples/subversion/xslt/svnindex.xsl Index: pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-python --- pkg/PLIST-python 26 Feb 2010 18:21:09 -0000 1.8 +++ pkg/PLIST-python 17 May 2013 09:28:12 -0000 @@ -1,8 +1,8 @@ @comment $OpenBSD: PLIST-python,v 1.8 2010/02/26 18:21:09 espie Exp $ @pkgpath devel/subversion,-python,gnome_keyring -lib/libsvn_swig_py-1.a -lib/libsvn_swig_py-1.la -@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION} +lib/libsvn_swig_${MODPY_PY_PREFIX}1.a +lib/libsvn_swig_${MODPY_PY_PREFIX}1.la +@lib lib/libsvn_swig_${MODPY_PY_PREFIX}1.so.${LIBsvn_swig_py-1_VERSION} lib/python${MODPY_VERSION}/site-packages/libsvn/ lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc
