Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Apr 2009 01:17:25 +0200 (CEST)
From:      olli hauer <ohauer@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ohauer@gmx.de
Subject:   ports/133619: [patch] devel/subversion: update to 1.6.1
Message-ID:  <20090411231726.48986CB74@u18-124.dsl.vianetworks.de>
Resent-Message-ID: <200904112320.n3BNK2k9088867@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         133619
>Category:       ports
>Synopsis:       [patch] devel/subversion: update to 1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 11 23:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer
>Release:        FreeBSD 7.1-RELEASE-p4 i386
>Organization:
>Environment:



>Description:
- update subversion to 1.6.1 (I have also send a patch for update neon to 0.28.4)
- stop build if mod_dontdothat is choosen but mod_dav_svn not, since it is not implied


CHANGES:
===================================================
Version 1.6.1
(10 Apr 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.1

 User-visible changes:
  * recommend Neon 0.28.4. (r36388)
  * improve performance of 'svn merge --ignore-ancestry' (r36256)
  * improve 'svn merge' performance with subtree mergeinfo (r36444)
  * correctly proxy LOCK and UNLOCK requests (r36159)
  * prevent a crash when updating old working copies (r36751)
  * don't let svnmerge.py delete a nonexistent property (r36086, -767, -769)
  * don't fail when upgrading pre-1.2 repositories (r36851, -7)
  * allow escaping of separator characters in autoprops (r36763, -84)
  * improve tempfile creation robustness on Windows (r36442, -3)
  * fix change-svn-wc-format.py for 1.6.x working copies (r36874, -5)
  * improve configure's detection of Berkeley DB (r36741, -2)
  * don't allow foreign merges to add foreign mergeinfo (issue #3383)
  * improve performance of 'svn update' on large files (r36389, et. al.)
  * fixed: error leak and potential crash (r36860)
  * fixed: parent directory handling on Windows (r36049, -50, -51, -131)
  * fixed: unintialized memory errors (r36252, -3)
  * fixed: potential working copy corruption (r36714)
  * fixed: working copy upgrade error (r36302)
  * fixed: pointer dereference error (r36783)
  * fixed: error diff'ing large data with ignored whitespace (r36816)
  * fixed: potential hang in ra_serf (r36913)
  * fixed: problem with merge and non-inheritable mergeinfo (r36879)
  * fixed: repeated merging of conflicted properties fails (issue #3250)
  * fixed: excluding an absent directory segfaults (issue #3391)

 Developer-visible changes:
  * ensure svn_subst_translate_cstring2() properly flushes data (r36747)
  * make serf report a base checksum to apply_textdelta (r36890)
  * syntax updates for strict C89 compilers (r36799)
  * update RPM scripts for RHEL4 (r36834)
  * allow tests to be run with Python 2.6.1 on Windows (r36149, -50, -51, -56)
  * allow building JavaHL with Visual Studio 2008 (r36954)
  * stop setting default translation domain in JavaHL (r36955)
  * fixed: warning with Python 2.6 and ctypes bindings (r36559)
  * fixed: undefined references to svn_fs_path_change2_create() (r36823)


>How-To-Repeat:

>Fix:


--- patch_subversion_1.6.1.txt begins here ---
--- Makefile
+++ Makefile
@@ -72,6 +72,10 @@
 SCRIPTS_DATA=
 
 pre-everything::
+.if defined(WITH_MOD_DONTDOTHAT) && !defined(WITH_MOD_DAV_SVN)
+	@${ECHO_CMD} "It doesn't make sense to build mod_dontdothat without mod_dav_svn module"
+	@${FALSE}
+.endif
 	@${ECHO_MSG} ""
 .if defined(WITH_NEON)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
@@ -106,7 +110,6 @@
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DONTDOTHAT)
 	@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
-	@${ECHO_MSG} "This option implies the WITH_MOD_DAV_SVN option."
 .else
 	@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
 .endif
--- Makefile.common
+++ Makefile.common
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.18 2009/04/06 17:06:34 lev Exp $
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.0
-PORTREVISION?=	2
+PORTVERSION=	1.6.1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
--- distinfo
+++ distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.0.tar.bz2) = db9f19671c1f5286be3a930c0a7d18f3
-SHA256 (subversion/subversion-1.6.0.tar.bz2) = d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2
-SIZE (subversion/subversion-1.6.0.tar.bz2) = 5477732
+MD5 (subversion/subversion-1.6.1.tar.bz2) = 95708b96b920faeffca017f43ec96777
+SHA256 (subversion/subversion-1.6.1.tar.bz2) = cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca
+SIZE (subversion/subversion-1.6.1.tar.bz2) = 5462507
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484
--- files/build-outputs.mk
+++ files/build-outputs.mk
@@ -248,10 +248,10 @@
 
 libsvn_fs_PATH = subversion/libsvn_fs
 install-ramod-lib: $(SVN_FS_LIB_INSTALL_DEPS)
-libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo subversion/libsvn_fs/fs-loader.lo
+libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo subversion/libsvn_fs/fs-loader.lo subversion/libsvn_fs_util/libsvn_fs_util-1.la
 libsvn_fs_OBJECTS = access.lo fs-loader.lo
 subversion/libsvn_fs/libsvn_fs-1.la: $(libsvn_fs_DEPS)
-	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) -lsvn_subr-1 $(SVN_FS_LIB_LINK) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) ../../subversion/libsvn_fs_util/libsvn_fs_util-1.la -lsvn_subr-1 $(SVN_FS_LIB_LINK) $(SVN_APR_LIBS) $(LIBS)
 
 libsvn_fs_base_PATH = subversion/libsvn_fs_base
 libsvn_fs_base_DEPS =  subversion/libsvn_fs_base/bdb/bdb-err.lo subversion/libsvn_fs_base/bdb/bdb_compat.lo subversion/libsvn_fs_base/bdb/changes-table.lo subversion/libsvn_fs_base/bdb/checksum-reps-table.lo subversion/libsvn_fs_base/bdb/copies-table.lo subversion/libsvn_fs_base/bdb/dbt.lo subversion/libsvn_fs_base/bdb/env.lo subversion/libsvn_fs_base/bdb/lock-tokens-table.lo subversion/libsvn_fs_base/bdb/locks-table.lo subversion/libsvn_fs_base/bdb/miscellaneous-table.lo subversion/libsvn_fs_base/bdb/node-origins-table.lo subversion/libsvn_fs_base/bdb/nodes-table.lo subversion/libsvn_fs_base/bdb/reps-table.lo subversion/libsvn_fs_base/bdb/rev-table.lo subversion/libsvn_fs_base/bdb/strings-table.lo subversion/libsvn_fs_base/bdb/txn-table.lo subversion/libsvn_fs_base/bdb/uuids-table.lo subversion/libsvn_fs_base/dag.lo subversion/libsvn_fs_base/err.lo subversion/libsvn_fs_base/fs.lo subversion/libsvn_fs_base/id.lo subversion/libsvn_fs_base/key-gen.lo subversion/libsvn_fs_base/
 lock.lo subversion/libsvn_fs_base/node-rev.lo subversion/libsvn_fs_base/reps-strings.lo subversion/libsvn_fs_base/revs-txns.lo subversion/libsvn_fs_base/trail.lo subversion/libsvn_fs_base/tree.lo subversion/libsvn_fs_base/util/fs_skels.lo subversion/libsvn_fs_base/uuid.lo subversion/libsvn_fs_util/libsvn_fs_util-1.la
@@ -1672,7 +1672,7 @@
 
 subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h
 
-subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
+subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_fs_util.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_base/bdb/bdb-err.lo: subversion/libsvn_fs_base/bdb/bdb-err.c subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/svn_private_config.h
 
--- patch_subversion_1.6.1.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090411231726.48986CB74>