From 5aef45576c3ac72e875c0c25b656500fdfdd0ea9 Mon Sep 17 00:00:00 2001 From: Matt Wringe Date: Oct 03 2008 21:18:18 +0000 Subject: Add patch to build with newer jsch. --- diff --git a/maven-wagon-jsch.patch b/maven-wagon-jsch.patch new file mode 100644 index 0000000..9015c07 --- /dev/null +++ b/maven-wagon-jsch.patch @@ -0,0 +1,27 @@ +--- ./wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/SingleKnownHostProvider.java.sav 2005-10-12 10:16:36.000000000 -0400 ++++ ./wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/SingleKnownHostProvider.java 2008-10-03 17:10:56.000000000 -0400 +@@ -17,6 +17,7 @@ + */ + + import com.jcraft.jsch.HostKeyRepository; ++import com.jcraft.jsch.HostKey; + import com.jcraft.jsch.JSch; + import com.jcraft.jsch.UserInfo; + import org.codehaus.plexus.util.Base64; +@@ -59,6 +60,15 @@ + public void addKnownHosts( JSch sch, UserInfo userInfo ) + { + HostKeyRepository hkr = sch.getHostKeyRepository(); +- hkr.add( host, Base64.decodeBase64( key.getBytes() ), userInfo ); ++ //hkr.add( host, Base64.decodeBase64( key.getBytes() ), userInfo ); ++ try ++ { ++ HostKey hostkey = new HostKey(host, Base64.decodeBase64(key.getBytes())); ++ hkr.add(hostkey, userInfo); ++ } ++ catch (Exception e) ++ { ++ e.printStackTrace(); ++ } + } + } diff --git a/maven-wagon.spec b/maven-wagon.spec index 8f311e9..2fde590 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -16,7 +16,7 @@ Name: maven-%{bname} Version: 1.0 -Release: 0.1.a5.3.3%{?dist} +Release: 0.1.a5.3.4%{?dist} Epoch: 0 Summary: Tools to manage artifacts and deployment License: ASL 2.0 @@ -53,6 +53,7 @@ Patch10: wagon-1.0-alpha5-providers-scm-build_xml.patch Patch11: wagon-1.0-alpha5-providers-ssh-build_xml.patch Patch12: wagon-1.0-alpha5-providers-ssh-external-build_xml.patch Patch13: wagon-1.0-alpha5-provider-test-build_xml.patch +Patch14: maven-wagon-jsch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -146,6 +147,7 @@ cp %{SOURCE17} wagon-providers/wagon-ssh-external/build.xml %patch11 -b .sav %patch12 -b .sav %patch13 -b .sav +%patch14 -b .sav %build pushd wagon-provider-api @@ -395,6 +397,9 @@ rm -rf $RPM_BUILD_ROOT #%endif %changelog +* Fri Oct 03 2008 Matt Wringe - 0:1.0-0.1.a5.3.4 +- added patch to make it compatible with the newer version of jsch + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a5.3.3 - drop repotag - fix license tag