rpms/jsch/devel jsch-0.1.31-backwards-compat.patch, NONE, 1.1 jsch.spec, 1.24, 1.25

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/extras/rpms/jsch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657

Modified Files:
	jsch.spec 
Added Files:
	jsch-0.1.31-backwards-compat.patch 
Log Message:

Fix bz# 441071: Add backward compatibility patch from mwringe at redhat



jsch-0.1.31-backwards-compat.patch:

--- NEW FILE jsch-0.1.31-backwards-compat.patch ---
diff -ru src/com/jcraft/jsch/HostKeyRepository.java.orig src/com/jcraft/jsch/HostKeyRepository.java
--- src/com/jcraft/jsch/HostKeyRepository.java.orig	2006-10-15 13:14:46.000000000 -0400
+++ src/com/jcraft/jsch/HostKeyRepository.java	2008-04-04 16:44:31.000000000 -0400
@@ -36,6 +36,7 @@
 
   int check(String host, byte[] key);
   void add(HostKey hostkey, UserInfo ui);
+  void add(String host, byte[] key, UserInfo ui);
   void remove(String host, String type);
   void remove(String host, String type, byte[] key);
   String getKnownHostsRepositoryID();
diff -ru src/com/jcraft/jsch/KnownHosts.java.orig src/com/jcraft/jsch/KnownHosts.java
--- src/com/jcraft/jsch/KnownHosts.java.orig	2006-10-15 14:02:31.000000000 -0400
+++ src/com/jcraft/jsch/KnownHosts.java	2008-04-04 16:46:41.000000000 -0400
@@ -205,6 +205,20 @@
     //System.err.println("fail!!");
     return result;
   }
+
+  public void add(String host, byte[] key, UserInfo userinfo)
+  {
+    try 
+    {
+       HostKey hostkey = new HostKey(host,key);
+       add(hostkey, userinfo);
+    }
+    catch (Exception e)
+    {
+      // this should't get called 
+    }
+  }
+
   public void add(HostKey hostkey, UserInfo userinfo){
     int type=hostkey.type;
     String host=hostkey.getHost();



Index: jsch.spec
===================================================================
RCS file: /cvs/extras/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jsch.spec	19 Feb 2008 00:42:53 -0000	1.24
+++ jsch.spec	7 Apr 2008 17:34:57 -0000	1.25
@@ -36,7 +36,7 @@
 
 Name:           jsch
 Version:        0.1.31
-Release:        2jpp.2%{?dist}
+Release:        2jpp.3%{?dist}
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -48,6 +48,8 @@
 # mv META-INF/MANIFEST.MF
 # rmdir META-INF
 Source1:        MANIFEST.MF
+Patch0:         %{name}-%{version}-backwards-compat.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -93,6 +95,8 @@
 %prep
 %setup -q
 
+%patch0
+
 %build
 export CLASSPATH=$(build-classpath jzlib)
 ant dist javadoc 
@@ -178,6 +182,9 @@
 
 
 %changelog
+* Mon Apr 07 2008 Deepak Bhole <dbhole at redhat.com> - 0:0.1.31-2jpp.3
+- Fix bz# 441071: Add backward compatibility patch from mwringe at redhat
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:0.1.31-2jpp.2
 - Autorebuild for GCC 4.3