From 6e85eb6ff5f45f8a9cc87c6609b9cce6855942b8 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Thu, 13 Aug 2009 08:08:44 +0000
Subject: [PATCH] Fix for 4175: This rev up the external dependency svnkit to version 1.3.0 (from 1.2.0). svnkit 1.3.0 is required to deal with svn 1.6
---
opends/ext/svnkit/svnkitclisrc.zip | 0
opends/ext/svnkit/jsvnadmin | 23 +++++
opends/ext/svnkit/jsvnversion | 23 +++++
opends/ext/svnkit/jsvnsync | 23 +++++
opends/ext/svnkit/svnkit-cli.jar | 0
opends/ext/svnkit/svnkit-javahl.jar | 0
opends/ext/svnkit/jsvndumpfilter | 23 +++++
opends/ext/svnkit/jsvnlook | 23 +++++
opends/ext/svnkit/COPYING | 2
opends/ext/svnkit/jsvn | 22 +++++
opends/ext/svnkit/doc.tar.gz | 0
opends/ext/svnkit/changelog.txt | 65 ++++++++++++++++
opends/ext/svnkit/svnkitsrc.zip | 0
opends/ext/svnkit/svnkit.jar | 0
opends/ext/svnkit/jna.jar | 0
opends/ext/svnkit/README.txt | 2
opends/ext/svnkit/svnkit.build.properties | 12 +-
17 files changed, 204 insertions(+), 14 deletions(-)
diff --git a/opends/ext/svnkit/COPYING b/opends/ext/svnkit/COPYING
index f30961b..817c939 100644
--- a/opends/ext/svnkit/COPYING
+++ b/opends/ext/svnkit/COPYING
@@ -6,7 +6,7 @@
All the source code and compiled classes in package org.tigris.subversion.javahl
except SvnClient class are covered by the license in JAVAHL-LICENSE file
-Copyright (c) 2004-2008 TMate Software. All rights reserved.
+Copyright (c) 2004-2009 TMate Software. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/opends/ext/svnkit/README.txt b/opends/ext/svnkit/README.txt
index a368e2f..793a6e2 100644
--- a/opends/ext/svnkit/README.txt
+++ b/opends/ext/svnkit/README.txt
@@ -26,7 +26,7 @@
direct repository access as well as support for all high level Subversion operation that are
available with the command line Subversion client.
-This version of SVNKit supports all Subversion 1.5.2 features and supports older Subversion repositories.
+This version of SVNKit supports all Subversion 1.6.2 features and supports older Subversion repositories.
4. RESOURCES
diff --git a/opends/ext/svnkit/changelog.txt b/opends/ext/svnkit/changelog.txt
index 81291e0..d9ee096 100644
--- a/opends/ext/svnkit/changelog.txt
+++ b/opends/ext/svnkit/changelog.txt
@@ -1,3 +1,68 @@
+== version 1.3.0
+
++ Changes made in Subversion since version 1.5.6 implemented,
+ all Subversion 1.6.2 features are supported:
+ * Tree conflicts handled more gracefully
+ * File-externals support for intra-repository files
+ * File protocol: 1.6.2 Subversion repositories format supported
+ * Administrative tools: support for packing repository shards
+ * Command line client: repository root relative URL support on most commands
+ * Performance improvements on huge files during update\commits
+
++ Other bugfixes and performance improvements.
+
+== version 1.3.0-beta3
+
++ Changes made in Subversion since version 1.5.6 implemented,
+ all Subversion 1.6.1 features are supported.
++ Bugfixes since version 1.3.0-beta2
+
+== version 1.3.0-beta2
+
++ Changes made in Subversion since version 1.5.6 implemented,
+ all Subversion 1.6.1 features are supported.
++ JavaHL implementation bugfixes.
++ Compatibility with pre-1.6 working copies improved for
+ 'no working copy upgrade' cases.
++ Update performance on large files improved.
++ Command line client improvements.
++ Other bugfixes and performance improvements.
+
+== version 1.3.0-beta
+
++ Changes made in Subversion since version 1.5.6 implemented,
+ all Subversion 1.6.1 features are supported.
++ Merge tracking bugfixes
++ Other bugfixes and performance improvements.
+
+== version 1.2.3
+
++ Changes made in Subversion since version 1.5.5 implemented,
+ all Subversion 1.5.6 features are supported.
++ Merge tracking bugfixes
++ Better interacting with external diff programs
++ svnkit.no.safe.copy system property introduced for file system copy operations
++ Other bugfixes and performance improvements.
+
+== version 1.2.2
+
++ Changes made in Subversion since version 1.5.4 implemented,
+ all Subversion 1.5.5 features are supported.
++ Merge tracking implementation changed to match Subversion 1.5.5.
++ HP-UX support added.
++ Other stability and performance improvements.
+
+== version 1.2.1
+
++ Changes made in Subversion since version 1.5.0 implemented,
+ all Subversion 1.5.4 features are supported.
++ JNA library updated to version 3.0.9.
++ JNA-based code fixed to work properly on amd64 systems.
++ HTTP Negotiate authentication scheme support added.
++ "Fast" update feature has been added to SVNUpdateClient API.
++ Command line client improvements.
++ Other stability and performance improvements.
+
== version 1.2.0
+ Possible NPE on WC to URL copy operation fixed.
diff --git a/opends/ext/svnkit/doc.tar.gz b/opends/ext/svnkit/doc.tar.gz
index 789b815..3e0a572 100644
--- a/opends/ext/svnkit/doc.tar.gz
+++ b/opends/ext/svnkit/doc.tar.gz
Binary files differ
diff --git a/opends/ext/svnkit/jna.jar b/opends/ext/svnkit/jna.jar
index ec12e11..33461ec 100644
--- a/opends/ext/svnkit/jna.jar
+++ b/opends/ext/svnkit/jna.jar
Binary files differ
diff --git a/opends/ext/svnkit/jsvn b/opends/ext/svnkit/jsvn
index 2e76c65..3d0ebf0 100755
--- a/opends/ext/svnkit/jsvn
+++ b/opends/ext/svnkit/jsvn
@@ -5,9 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/jsvnadmin b/opends/ext/svnkit/jsvnadmin
index 60f8f9d..c0b85a0 100755
--- a/opends/ext/svnkit/jsvnadmin
+++ b/opends/ext/svnkit/jsvnadmin
@@ -5,8 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/jsvndumpfilter b/opends/ext/svnkit/jsvndumpfilter
index e20abd2..970915d 100755
--- a/opends/ext/svnkit/jsvndumpfilter
+++ b/opends/ext/svnkit/jsvndumpfilter
@@ -5,8 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/jsvnlook b/opends/ext/svnkit/jsvnlook
index bfb9256..a07f8ea 100755
--- a/opends/ext/svnkit/jsvnlook
+++ b/opends/ext/svnkit/jsvnlook
@@ -5,8 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/jsvnsync b/opends/ext/svnkit/jsvnsync
index 2a3793f..28526b6 100755
--- a/opends/ext/svnkit/jsvnsync
+++ b/opends/ext/svnkit/jsvnsync
@@ -5,8 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/jsvnversion b/opends/ext/svnkit/jsvnversion
index ee9a61e..e892609 100755
--- a/opends/ext/svnkit/jsvnversion
+++ b/opends/ext/svnkit/jsvnversion
@@ -5,8 +5,29 @@
CYGWIN*) cygwin=true ;;
esac
-SVNKIT_HOME=`dirname $0`
+old_wd=`pwd`
+
+progname=`basename "$0"`
+linkdir=`dirname "$0"`
+
+cd "$linkdir"
+prg="$progname"
+
+while [ -h "$prg" ] ; do
+ ls=`ls -ld "$prg"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ prg="$link"
+ else
+ prg="`dirname $prg`/$link"
+ fi
+done
+
+SVNKIT_HOME=`dirname $prg`
SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+cd "$old_wd"
+
SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
if $cygwin ; then
diff --git a/opends/ext/svnkit/svnkit-cli.jar b/opends/ext/svnkit/svnkit-cli.jar
index 8bb051b..2f2c0ab 100644
--- a/opends/ext/svnkit/svnkit-cli.jar
+++ b/opends/ext/svnkit/svnkit-cli.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkit-javahl.jar b/opends/ext/svnkit/svnkit-javahl.jar
index 4899086..6b9f0fa 100644
--- a/opends/ext/svnkit/svnkit-javahl.jar
+++ b/opends/ext/svnkit/svnkit-javahl.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkit.build.properties b/opends/ext/svnkit/svnkit.build.properties
index 71356b1..9e4f4b9 100644
--- a/opends/ext/svnkit/svnkit.build.properties
+++ b/opends/ext/svnkit/svnkit.build.properties
@@ -1,14 +1,14 @@
-svnkit.version=1.2.0
+svnkit.version=1.3.0
# could be overriden by build server, e.g. TeamCity.
build.number=${svnkit.version}
#properties for SVN runtime
-svnkit.version.string=SVN/1.5.2 SVNKit/1.2.0 (http://svnkit.com/) r4949
+svnkit.version.string=SVN/1.6.2 SVNKit/1.3.0 (http://svnkit.com/) r5847
svnkit.version.major=1
-svnkit.version.minor=2
+svnkit.version.minor=3
svnkit.version.micro=0
-svnkit.version.revision=4949
+svnkit.version.revision=5847
#build.xml properties
-jna.version=3.0.5
-trilead.ssh2.version=build213-svnkit-1.2-patch
+jna.version=3.0.9
+trilead.ssh2.version=build213-svnkit-1.3-patch
diff --git a/opends/ext/svnkit/svnkit.jar b/opends/ext/svnkit/svnkit.jar
index a70ae44..8fe3f41 100644
--- a/opends/ext/svnkit/svnkit.jar
+++ b/opends/ext/svnkit/svnkit.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkitclisrc.zip b/opends/ext/svnkit/svnkitclisrc.zip
index 176b16c..b51d5ff 100644
--- a/opends/ext/svnkit/svnkitclisrc.zip
+++ b/opends/ext/svnkit/svnkitclisrc.zip
Binary files differ
diff --git a/opends/ext/svnkit/svnkitsrc.zip b/opends/ext/svnkit/svnkitsrc.zip
index f2d5fe8..be59de7 100644
--- a/opends/ext/svnkit/svnkitsrc.zip
+++ b/opends/ext/svnkit/svnkitsrc.zip
Binary files differ
--
Gitblit v1.10.0