[svnkit] trilead-ssh2 215
Tom Callaway
spot at fedoraproject.org
Thu May 16 19:51:03 UTC 2013
commit b0ca3049d669ca69cdea6e8f416b244e29aef4d9
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu May 16 15:50:36 2013 -0400
trilead-ssh2 215
svnkit-1.7.6-trilead-ssh2-215.patch | 73 +++++++++++++++++++++++++++++++++++
svnkit-1.7.6.pom | 2 +-
svnkit.spec | 9 +++-
3 files changed, 81 insertions(+), 3 deletions(-)
---
diff --git a/svnkit-1.7.6-trilead-ssh2-215.patch b/svnkit-1.7.6-trilead-ssh2-215.patch
new file mode 100644
index 0000000..165d69c
--- /dev/null
+++ b/svnkit-1.7.6-trilead-ssh2-215.patch
@@ -0,0 +1,73 @@
+diff -up svnkit-1.7.6/build.gradle.ssh2fix svnkit-1.7.6/build.gradle
+--- svnkit-1.7.6/build.gradle.ssh2fix 2013-05-16 15:32:56.307718978 -0400
++++ svnkit-1.7.6/build.gradle 2013-05-16 15:33:15.560719267 -0400
+@@ -91,7 +91,7 @@ project(':svnkit') {
+ compile 'de.regnis.q.sequence:sequence-library:1.0.2'
+ compile 'org.tmatesoft.sqljet:sqljet:1.1.5'
+ compile 'net.java.dev.jna:jna:3.4.0'
+- compile 'com.trilead:trilead-ssh2:1.0.0-build215'
++ compile 'org.tmatesoft.svnkit:trilead-ssh2:1.0.0-build215'
+
+ testCompile 'junit:junit:4.8'
+ }
+@@ -157,7 +157,7 @@ project(':svnkit-distribution') {
+ scripts project(path: ':svnkit-cli', configuration: 'scripts')
+
+ osgi project(path: ':svnkit-osgi', configuration: 'archives')
+- osgi 'com.trilead:trilead-ssh2-osgi:1.0.0-build215'
++ osgi 'org.tmatesoft.svnkit:trilead-ssh2-osgi:1.0.0-build215'
+ osgi 'org.tmatesoft.sqljet:sqljet-osgi:1.1.5'
+ osgi 'net.java.dev.jna:jna-osgi:3.4.0'
+ }
+diff -up svnkit-1.7.6/svnkit-osgi/build.gradle.ssh2fix svnkit-1.7.6/svnkit-osgi/build.gradle
+--- svnkit-1.7.6/svnkit-osgi/build.gradle.ssh2fix 2013-05-16 15:33:53.071719829 -0400
++++ svnkit-1.7.6/svnkit-osgi/build.gradle 2013-05-16 15:34:02.876719977 -0400
+@@ -45,7 +45,7 @@ jar {
+ 'Bundle-ActivationPolicy' : 'lazy',
+ 'Eclipse-BundleShape' : 'jar',
+ 'Require-Bundle': 'net.java.dev.jna;bundle-version="[3.2.7,4.0.0)";resolution:=optional,' +
+- 'com.trilead.ssh2;bundle-version="[1.0.0,2.0.0)",' +
++ 'org.tmatesoft.svnkit.ssh2;bundle-version="[1.0.0,2.0.0)",' +
+ 'org.tmatesoft.sqljet;bundle-version="[1.0.5,2.0.0)",' +
+ 'org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)"'
+
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshConnection.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshConnection.java
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshHost.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshHost.java
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSessionPool.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSessionPool.java
+--- svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSessionPool.java.ssh2fix 2011-07-18 00:31:10.000000000 -0400
++++ svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSessionPool.java 2013-05-16 15:36:34.065722245 -0400
+@@ -11,7 +11,7 @@ import java.util.TimerTask;
+ import org.tmatesoft.svn.util.SVNDebugLog;
+ import org.tmatesoft.svn.util.SVNLogType;
+
+-import com.trilead.ssh2.ServerHostKeyVerifier;
++import org.tmatesoft.svnkit.ssh2.ServerHostKeyVerifier;
+
+ public class SshSessionPool {
+
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNAbstractTunnelConnector.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNAbstractTunnelConnector.java
+--- svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNAbstractTunnelConnector.java.ssh2fix 2011-05-06 17:04:20.000000000 -0400
++++ svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNAbstractTunnelConnector.java 2013-05-16 15:36:34.126722246 -0400
+@@ -13,7 +13,7 @@ import org.tmatesoft.svn.core.internal.w
+ import org.tmatesoft.svn.core.internal.wc.SVNFileUtil;
+ import org.tmatesoft.svn.util.SVNLogType;
+
+-import com.trilead.ssh2.StreamGobbler;
++import org.tmatesoft.svnkit.ssh2.StreamGobbler;
+
+ /**
+ * @version 1.3
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHConnector.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHConnector.java
+diff -up svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHPrivateKeyUtil.java.ssh2fix svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHPrivateKeyUtil.java
+--- svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHPrivateKeyUtil.java.ssh2fix 2011-07-18 00:31:10.000000000 -0400
++++ svnkit-1.7.6/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/SVNSSHPrivateKeyUtil.java 2013-05-16 15:36:34.151722246 -0400
+@@ -11,7 +11,7 @@ import org.tmatesoft.svn.core.internal.w
+ import org.tmatesoft.svn.util.SVNDebugLog;
+ import org.tmatesoft.svn.util.SVNLogType;
+
+-import com.trilead.ssh2.crypto.PEMDecoder;
++import org.tmatesoft.svnkit.ssh2.crypto.PEMDecoder;
+
+ public class SVNSSHPrivateKeyUtil {
+
diff --git a/svnkit-1.7.6.pom b/svnkit-1.7.6.pom
index 3065158..a03a951 100644
--- a/svnkit-1.7.6.pom
+++ b/svnkit-1.7.6.pom
@@ -44,7 +44,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.trilead</groupId>
+ <groupId>org.tmatesoft.svnkit</groupId>
<artifactId>trilead-ssh2</artifactId>
<version>1.0.0-build215</version>
<scope>compile</scope>
diff --git a/svnkit.spec b/svnkit.spec
index 5b8ea5f..6f7c8ea 100644
--- a/svnkit.spec
+++ b/svnkit.spec
@@ -1,6 +1,6 @@
Name: svnkit
Version: 1.7.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Pure java subversion client library
Group: Development/Tools
@@ -18,6 +18,8 @@ Source4: https://www.apache.org/licenses/LICENSE-1.1.txt
# patch reported at http://issues.tmatesoft.com/_persistent/svnkit-jna-3.5.0.patch?file=67-134&v=0&c=true
Patch0: svnkit-jna-3.5.0.patch
+# Fix for current trilead-ssh2
+Patch1: svnkit-1.7.6-trilead-ssh2-215.patch
BuildArch: noarch
@@ -27,7 +29,7 @@ BuildRequires: ant
BuildRequires: sequence-library
BuildRequires: subversion-javahl >= 1.5
BuildRequires: jna >= 3.0
-BuildRequires: trilead-ssh2 >= 213
+BuildRequires: trilead-ssh2 >= 215
BuildRequires: sqljet >= 1.1.4
BuildRequires: tomcat-servlet-3.0-api >= 7.0.0
Requires: jpackage-utils >= 0:1.6
@@ -149,6 +151,9 @@ cp -rp build/javadoc %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Thu May 16 2013 Tom Callaway <spot at fedoraproject.org> - 1.7.6-7
+- fix pom file for proper naming for trilead-ssh2
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list