From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 17 14:50:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2FA87106564A for ; Thu, 17 May 2012 14:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 098028FC17 for ; Thu, 17 May 2012 14:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4HEo1RM011400 for ; Thu, 17 May 2012 14:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4HEo1PE011399; Thu, 17 May 2012 14:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 17 May 2012 14:50:01 GMT Resent-Message-Id: <201205171450.q4HEo1PE011399@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer Received: by hub.freebsd.org (Postfix, from userid 1234) id 4DEA9106567A; Thu, 17 May 2012 14:41:58 +0000 (UTC) Message-Id: <20120517144158.4DEA9106567A@hub.freebsd.org> Date: Thu, 17 May 2012 14:41:58 +0000 (UTC) From: Olli Hauer To: X-Send-Pr-Version: 3.113 Cc: lev@FreeBSD.org Subject: ports/168012: [patch] port devel/subversion update to 1.7.5 + fix pkg-plist (PR167564) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2012 14:50:02 -0000 >Number: 168012 >Category: ports >Synopsis: [patch] port devel/subversion update to 1.7.5 + fix pkg-plist (PR167564) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 17 14:50:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: - update subversion to 1.7.5 - fix pkg-plist issue (PR167564) - use libtool to install svnauthz-validate - add ugly hack to remove unwanted files from ${DATADIR} - add option to run subversion testsuite Note: The testsuite will fail completly until PR156076 will be committed. Even with a fixed py-sqlite testsuite will fail since some tests are not bullet prove written but gives a good overview. (Maybe remove OPTION knob and run test with make -DWITH_TEST) PR167564 can be closed after commit the patch Changelog: ========== Version 1.7.5 (17 May 2012, from /branches/1.7.x) http://svn.apache.org/repos/asf/subversion/tags/1.7.5 User-visible changes: - Client- and server-side bugfixes: * http: report deleted-revision upon delete during update (r1327474) - Client-side bugfixes: * avoid potential segfault when canonicalizing properties (r1296369) * improve memory and file-handle management with externals (issue #4130) * serf: convert assertions to "MERGE failed" errors (r1302417) * fix undefined behaviour during multi-segment reverse merges (issue #4144) * fix potential use of already freed memory during diff operation (r1311935) * improve performance of scan for the working copy root (r1306334) * cmdline: fix segfault during 'svn diff' argument processing (r1311702) * fix regression from 1.6 in update with --depth option (issue #4136) * propset: avoid undefined behaviour in error path (r1325361) * reset sqlite statements, partly for sqlite-3.7.11 compat (r1328846, et al) * fix assertion during 'svn diff -r BASE:HEAD ^/trunk' (issue #4161) * notify upon 'update' just removing locks on files (r1329876) * neon: fix potential use of freed memory during commits (r1329388) * 'status --xml' doesn't show repository deletes correctly (issue #4167) * fix assert on svn:externals with drive letter on Windows (issue #4073) * fix 'svn update --depth=empty' against 1.4 servers (issue #4046) * handle missing svn:date reported by svnserve gracefully (r1306111) * fix merges which first add a subtree and then delete it (issue #4166) * fix a regression with checkout of file externals (issue #4087) * don't add spurious mergeinfo to subtrees in edge-case merge (issue #4169) * improve performance of status on large working copies (issue #4178) - Server-side bugfixes: * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129) * mod_dav_svn: raise an error on MERGE of non-existent resource (r1298343) * mod_dav_svn: support compiling/running under httpd-2.4 (r1232267) * mod_dav_svn: forbid BDB repositories under httpd's event MPM (issue #4157) - Other tool improvements and bugfixes: * emacs support: updates to dsvn.el and vc-svn.el (r1200896, et al) Developer-visible changes: - General: * windows example distribution scripts: include svnrdump (r1295007) * fix running the test suite with jsvn (r1335555) - Bindings: * swig-py tests: avoid FAILs on APR hash order (r1296137, r1292248) * swig-rb tests: avoid FAILs on APR hash order (r1310535, r1310594) * swig-pl: Improved perl detection in gen-make.py (r1291797, r1291810) >How-To-Repeat: >Fix: --- patch_subversion.txt begins here --- Index: subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.144 diff -u -r1.144 Makefile --- subversion/Makefile 2 Apr 2012 15:16:52 -0000 1.144 +++ subversion/Makefile 17 May 2012 13:56:27 -0000 @@ -33,7 +33,8 @@ STATIC "Build static version (no shared libs)" off \ GNOME_KEYRING "Build with GNOME Keyring auth support" off \ KDE_KWALLET "Build with KDE KWallet auth support" off \ - BOOK "Install the Subversion Book" off + BOOK "Install the Subversion Book" off \ + TEST "Run subversion test suite" off # ASVN "Build and install Archive SVN (asvn)" off \ .include "Makefile.common" @@ -83,6 +84,11 @@ PLIST_SUB+= BOOK="@comment " .endif +# testsuite will fail until PR156076 is committed +.if defined(WITH_TEST) +TEST_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 +.endif + #.if defined(WITH_ASVN) #RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install #PLIST_SUB+= ASVN="" @@ -210,18 +216,11 @@ fi .endif -post-build: -.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT) - cd ${WRKSRC}/tools/server-side/mod_dontdothat && \ - ${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c -.endif -# subversion 1.7+ -- it is not optional -#.if defined(WITH_SVNAUTHZ_VALIDATE) -# # place binary in ${WRKDIR}, else we install it twice -# cd ${WRKSRC}/tools/server-side && \ -# ${CC} svnauthz-validate.c -o ../../svnauthz-validate -I${WRKSRC}/subversion/include -I${APR_INCLUDE_DIR} \ -# -L${WRKSRC}/subversion/libsvn_repos/.libs -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_repos-1 -lsvn_subr-1 -#.endif +# takes a long time, and will fail but gives maintainer a good oversight +.if defined(WITH_TEST) +test: + make check -C ${WRKSRC} +.endif pre-install: .if defined(WITH_MOD_DAV_SVN) @@ -235,17 +234,17 @@ ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so .if defined(WITH_MOD_DONTDOTHAT) - cd ${WRKSRC}/tools/server-side/mod_dontdothat && \ - ${APXS} -i -n dontdothat mod_dontdothat.la ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so .endif .endif .if defined(WITH_SVNAUTHZ_VALIDATE) - ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin .endif @${MKDIR} ${DATADIR} cd ${WRKSRC}/tools ; \ - ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' -cf - * | ${TAR} -C ${DATADIR} -xf - + ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf - +# ugly hack to remove libtool scripts ... + @${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f @${CHMOD} -R a-st,o+rX ${DATADIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} Index: subversion/Makefile.common =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile.common,v retrieving revision 1.61 diff -u -r1.61 Makefile.common --- subversion/Makefile.common 2 Apr 2012 15:16:52 -0000 1.61 +++ subversion/Makefile.common 17 May 2012 13:56:27 -0000 @@ -5,8 +5,8 @@ # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.61 2012/04/02 15:16:52 lev Exp $ PORTNAME= subversion -PORTVERSION= 1.7.4 -PORTREVISION?= 1 +PORTVERSION= 1.7.5 +#PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ ${MASTER_SITE_LOCAL:S/$/:book/} @@ -68,6 +68,10 @@ PLIST_SUB+= BDB="@comment " .endif +.if defined(WITH_MOD_DONTDOTHAT) && defined(WITHOUT_MOD_DAV_SVN) +IGNORE= to build mod_dontdothat option mod_dav_svn is required +.endif + .if defined(WITH_MOD_DAV_SVN) WITH_APACHE= yes CONFIGURE_ARGS+=--with-apxs=${APXS} Index: subversion/distinfo =================================================================== RCS file: /home/pcvs/ports/devel/subversion/distinfo,v retrieving revision 1.86 diff -u -r1.86 distinfo --- subversion/distinfo 2 Apr 2012 15:16:52 -0000 1.86 +++ subversion/distinfo 17 May 2012 13:56:27 -0000 @@ -1,5 +1,5 @@ -SHA256 (subversion17/subversion-1.7.4.tar.bz2) = c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f -SIZE (subversion17/subversion-1.7.4.tar.bz2) = 5978020 +SHA256 (subversion17/subversion-1.7.5.tar.bz2) = cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec +SIZE (subversion17/subversion-1.7.5.tar.bz2) = 6002955 SHA256 (subversion17/svn-book-html-r4259.tar.bz2) = f02b64ad255b507325a960586225d721e086ec6f2a1843214202814e7fee3ac3 SIZE (subversion17/svn-book-html-r4259.tar.bz2) = 467637 SHA256 (subversion17/svn-book-r4259.pdf) = c091c598b2964f9692f3b3ffb7585c14f7d4e70793dd7e0fb862e30d9a98d289 Index: subversion/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/subversion/pkg-plist,v retrieving revision 1.46 diff -u -r1.46 pkg-plist --- subversion/pkg-plist 1 Apr 2012 18:45:05 -0000 1.46 +++ subversion/pkg-plist 17 May 2012 13:56:27 -0000 @@ -229,7 +229,6 @@ %%DATADIR%%/client-side/svn-graph.pl %%DATADIR%%/client-side/svn-ssl-fingerprints.sh %%DATADIR%%/client-side/svn-viewspec.py -%%DATADIR%%/client-side/svnmucc/svnmucc %%DATADIR%%/client-side/svnmucc/svnmucc.c %%DATADIR%%/client-side/svnmucc/svnmucc-test.py %%DATADIR%%/client-side/wcfind @@ -272,7 +271,6 @@ %%DATADIR%%/dev/svn-entries.el %%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/svnqlite3-dump -%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict %%DATADIR%%/dev/svnraisetreeconflict/main.c %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/unix-build/Makefile.svn @@ -289,11 +287,8 @@ %%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/dev/windows-build/Makefile %%DATADIR%%/dev/windows-build/README -%%DATADIR%%/diff/diff %%DATADIR%%/diff/diff.c -%%DATADIR%%/diff/diff3 %%DATADIR%%/diff/diff3.c -%%DATADIR%%/diff/diff4 %%DATADIR%%/diff/diff4.c %%DATADIR%%/dist/backport.pl %%DATADIR%%/dist/checksums.py @@ -353,16 +348,11 @@ %%DATADIR%%/po/po-update.sh %%DATADIR%%/server-side/mod_dontdothat/README %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c -%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.la -%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.slo %%DATADIR%%/server-side/fsfs-reshard.py %%DATADIR%%/server-side/svn-backup-dumps.py -%%DATADIR%%/server-side/svn-populate-node-origins-index %%DATADIR%%/server-side/svn-populate-node-origins-index.c -%%DATADIR%%/server-side/svn-rep-sharing-stats %%DATADIR%%/server-side/svn-rep-sharing-stats.c %%DATADIR%%/server-side/svn_server_log_parse.py -%%DATADIR%%/server-side/svnauthz-validate %%DATADIR%%/server-side/svnauthz-validate.c %%DATADIR%%/server-side/test_svn_server_log_parse.py %%DATADIR%%/xslt/svnindex.css @@ -371,7 +361,7 @@ %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so -%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so %%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dontdothat libexec/%%APACHEDIR%%/mod_dontdothat.so %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html --- patch_subversion.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: