From 8e3c16de267aa14d5bee2549e69f0942a06d1309b509f28104058254b3b025e2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 10:51:22 +0000 Subject: [PATCH 01/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=33 --- jsch.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsch.spec b/jsch.spec index d0c9474..e899d01 100644 --- a/jsch.spec +++ b/jsch.spec @@ -1,7 +1,7 @@ # # spec file for package jsch # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local BuildRequires: jzlib +BuildRequires: slf4j BuildRequires: unzip BuildRequires: zip Requires: jzlib From b5bab1f0bfb70bf7281ef10393cb5509465fae26225b8f2b8de1a17bc4ca246f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 10:52:40 +0000 Subject: [PATCH 02/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=34 --- jsch.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/jsch.spec b/jsch.spec index e899d01..0054f11 100644 --- a/jsch.spec +++ b/jsch.spec @@ -33,7 +33,6 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local BuildRequires: jzlib -BuildRequires: slf4j BuildRequires: unzip BuildRequires: zip Requires: jzlib From b8f023dd788768be90c496550d4b947fb750c6cc82e9c3f79eccfdcadbb0fab3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 16:09:21 +0000 Subject: [PATCH 03/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=35 --- jsch-0.1.54-sourcetarget.patch | 13 -- jsch-0.1.55.pom | 111 -------------- jsch-0.1.55.zip | 3 - jsch-0.2.9.tar.gz | 3 + jsch-build.xml | 269 +++++++++++++++++++++++++++++++++ jsch-junixsocket.patch | 35 +++++ jsch-osgi-manifest.patch | 23 --- jsch.spec | 53 +++---- plugin.properties | 13 -- 9 files changed, 334 insertions(+), 189 deletions(-) delete mode 100644 jsch-0.1.54-sourcetarget.patch delete mode 100644 jsch-0.1.55.pom delete mode 100644 jsch-0.1.55.zip create mode 100644 jsch-0.2.9.tar.gz create mode 100644 jsch-build.xml create mode 100644 jsch-junixsocket.patch delete mode 100644 jsch-osgi-manifest.patch delete mode 100644 plugin.properties diff --git a/jsch-0.1.54-sourcetarget.patch b/jsch-0.1.54-sourcetarget.patch deleted file mode 100644 index d4453fb..0000000 --- a/jsch-0.1.54-sourcetarget.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- jsch-0.1.54/build.xml 2016-08-30 09:06:39.000000000 +0200 -+++ jsch-0.1.54/build.xml 2017-09-08 10:27:56.694518991 +0200 -@@ -35,8 +35,8 @@ - - - - - 4.0.0 - com.jcraft - jsch - jar - 0.1.55 - JSch - http://www.jcraft.com/jsch/ - JSch is a pure Java implementation of SSH2 - - JCraft,Inc. - http://www.jcraft.com/ - - - scm:git:http://git.jcraft.com/jsch.git - scm:git:http://git.jcraft.com/jsch.git - http://git.jcraft.com/jsch.git - - - - ymnk - Atsuhiko Yamanaka - ymnk at jcraft D0t com - http://github.com/ymnk - JCraft,Inc. - http://www.jcraft.com/ - - architect - developer - - +9 - - - - - Revised BSD - http://www.jcraft.com/jsch/LICENSE.txt - - - - - com.jcraft - jzlib - 1.0.7 - true - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-5 - - - - - - org.sonatype.oss - oss-parent - 6 - - diff --git a/jsch-0.1.55.zip b/jsch-0.1.55.zip deleted file mode 100644 index 856eeb9..0000000 --- a/jsch-0.1.55.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:063bf66e163f43b7d7897ac14efe1e80ed094d4016afe1181fe2285e3797bed3 -size 369664 diff --git a/jsch-0.2.9.tar.gz b/jsch-0.2.9.tar.gz new file mode 100644 index 0000000..43b705f --- /dev/null +++ b/jsch-0.2.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f7c7437115466c53781be7683aa84237f5d968ac7925997beef8f4311ebaad9 +size 382571 diff --git a/jsch-build.xml b/jsch-build.xml new file mode 100644 index 0000000..471738c --- /dev/null +++ b/jsch-build.xml @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jsch-junixsocket.patch b/jsch-junixsocket.patch new file mode 100644 index 0000000..761649f --- /dev/null +++ b/jsch-junixsocket.patch @@ -0,0 +1,35 @@ +--- a/src/main/java/com/jcraft/jsch/SSHAgentConnector.java ++++ b/src/main/java/com/jcraft/jsch/SSHAgentConnector.java +@@ -93,21 +93,7 @@ public class SSHAgentConnector implements AgentConnector { + } + + private static USocketFactory getUSocketFactory() throws AgentProxyException { +- try { +- return new UnixDomainSocketFactory(); +- } catch (AgentProxyException e) { +- try { +- return new JUnixSocketFactory(); +- } catch (NoClassDefFoundError ee) { +- AgentProxyException eee = new AgentProxyException("junixsocket library unavailable"); +- eee.addSuppressed(e); +- eee.addSuppressed(ee); +- throw eee; +- } catch (AgentProxyException ee) { +- ee.addSuppressed(e); +- throw e; +- } +- } ++ return new UnixDomainSocketFactory(); + } + + private static Path getSshAuthSocket() throws AgentProxyException { +--- a/src/main/java9/module-info.java ++++ b/src/main/java9/module-info.java +@@ -6,7 +6,6 @@ module com.jcraft.jsch { + requires static org.apache.logging.log4j; + requires static org.slf4j; + requires static org.bouncycastle.provider; +- requires static org.newsclub.net.unix; + requires static com.sun.jna; + requires static com.sun.jna.platform; + } diff --git a/jsch-osgi-manifest.patch b/jsch-osgi-manifest.patch deleted file mode 100644 index 491f77a..0000000 --- a/jsch-osgi-manifest.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- jsch-0.1.54/build.xml 2016-08-30 09:06:39.000000000 +0200 -+++ jsch-0.1.54/build.xml 2020-04-07 15:40:40.461145903 +0200 -@@ -50,9 +50,7 @@ - - - -- - - - diff --git a/jsch.spec b/jsch.spec index 0054f11..879b2b7 100644 --- a/jsch.spec +++ b/jsch.spec @@ -17,25 +17,27 @@ Name: jsch -Version: 0.1.55 +Version: 0.2.9 Release: 0 Summary: Pure Java implementation of SSH2 License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.jcraft.com/jsch/ -Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip -Source1: https://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{version}.pom -Source2: plugin.properties -Patch0: jsch-0.1.54-sourcetarget.patch -Patch1: jsch-osgi-manifest.patch +Source0: https://github.com/mwiede/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz +Source1: %{name}-build.xml +Patch0: jsch-junixsocket.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.6.0 -BuildRequires: javapackages-local -BuildRequires: jzlib -BuildRequires: unzip -BuildRequires: zip -Requires: jzlib +# We build different multiversion overrides for 9, 10, 11, 15 and 16 +BuildRequires: java-devel >= 17 +BuildRequires: bouncycastle +BuildRequires: javapackages-local >= 6 +BuildRequires: jna +BuildRequires: jna-contrib +BuildRequires: log4j +BuildRequires: slf4j +# The jar still works with Java 8 +Requires: java >= 1.8 BuildArch: noarch %description @@ -62,32 +64,31 @@ X11 forwarding, file transfer, etc., and you can integrate its functionality into your own Java programs. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} +cp %{SOURCE1} build.xml + +# We don't have junixsocket +%pom_remove_dep com.kohlschutter.junixsocket: +rm src/main/java/com/jcraft/jsch/JUnixSocketFactory.java %patch0 -p1 -%patch1 -p1 -cp %{SOURCE1} pom.xml -%pom_remove_parent %build -export CLASSPATH=$(build-classpath jzlib) -ant dist javadoc +mkdir -p lib +build-jar-repository -s lib jna jna-platform slf4j/api bcprov log4j/log4j-api +ant jar javadoc %install -# inject the OSGi Manifest -cp %{SOURCE2} plugin.properties -jar uf dist/lib/%{name}-*.jar plugin.properties - # jars -install -Dpm 644 dist/lib/%{name}-*.jar %{buildroot}%{_javadir}/%{name}.jar +install -Dpm 644 target/%{name}-*.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a com.jcraft:jsch # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} # examples diff --git a/plugin.properties b/plugin.properties deleted file mode 100644 index 175e422..0000000 --- a/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Atsuhiko Yamanaka, JCraft,Inc. - initial API and implementation. -# IBM Corporation - implementation -############################################################################### -venderName=JCraft, Inc. -bundleName=JSch From 68bb2a988c6c6da3ead698e1f6963b1fde9270af39752c90f30024320e54c224 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 16:16:48 +0000 Subject: [PATCH 04/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=36 --- jsch-log4j.patch | 10 ++++++++++ jsch.spec | 14 +++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 jsch-log4j.patch diff --git a/jsch-log4j.patch b/jsch-log4j.patch new file mode 100644 index 0000000..ee4cb67 --- /dev/null +++ b/jsch-log4j.patch @@ -0,0 +1,10 @@ +--- a/src/main/java9/module-info.java ++++ b/src/main/java9/module-info.java +@@ -3,7 +3,6 @@ module com.jcraft.jsch { + + requires static java.security.jgss; + requires static java.logging; +- requires static org.apache.logging.log4j; + requires static org.slf4j; + requires static org.bouncycastle.provider; + requires static com.sun.jna; diff --git a/jsch.spec b/jsch.spec index 879b2b7..2d15397 100644 --- a/jsch.spec +++ b/jsch.spec @@ -26,6 +26,7 @@ URL: https://www.jcraft.com/jsch/ Source0: https://github.com/mwiede/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Patch0: jsch-junixsocket.patch +Patch1: jsch-log4j.patch BuildRequires: ant BuildRequires: fdupes # We build different multiversion overrides for 9, 10, 11, 15 and 16 @@ -34,7 +35,6 @@ BuildRequires: bouncycastle BuildRequires: javapackages-local >= 6 BuildRequires: jna BuildRequires: jna-contrib -BuildRequires: log4j BuildRequires: slf4j # The jar still works with Java 8 Requires: java >= 1.8 @@ -69,12 +69,20 @@ cp %{SOURCE1} build.xml # We don't have junixsocket %pom_remove_dep com.kohlschutter.junixsocket: -rm src/main/java/com/jcraft/jsch/JUnixSocketFactory.java +rm -f \ + src/main/java/com/jcraft/jsch/JUnixSocketFactory.java %patch0 -p1 +# Do not depend on log4j +%pom_remove_dep org.apache.logging.log4j: +rm -f \ + src/main/java/com/jcraft/jsch/Log4j2Logger.java \ + src/test/java/com/jcraft/jsch/Log4j2LoggerTest.java +%patch1 -p1 + %build mkdir -p lib -build-jar-repository -s lib jna jna-platform slf4j/api bcprov log4j/log4j-api +build-jar-repository -s lib jna jna-platform slf4j/api bcprov ant jar javadoc %install From 44d9494098717a11ab7f658e431132390dcda6b3e66c3e316e2ec73684111b81 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 16:19:35 +0000 Subject: [PATCH 05/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=37 --- jsch-build.xml | 39 --------------------------------------- jsch.spec | 4 ++-- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/jsch-build.xml b/jsch-build.xml index 471738c..fac0afa 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -163,45 +163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jsch.spec b/jsch.spec index 2d15397..a637950 100644 --- a/jsch.spec +++ b/jsch.spec @@ -29,8 +29,8 @@ Patch0: jsch-junixsocket.patch Patch1: jsch-log4j.patch BuildRequires: ant BuildRequires: fdupes -# We build different multiversion overrides for 9, 10, 11, 15 and 16 -BuildRequires: java-devel >= 17 +# We build different multiversion overrides for 9, 10, 11 +BuildRequires: java-devel >= 11 BuildRequires: bouncycastle BuildRequires: javapackages-local >= 6 BuildRequires: jna From 3867f8a437ff00abf9851aa953231ae57dfb341514f5ff1dd2ee2a710f66da83 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 May 2023 16:21:58 +0000 Subject: [PATCH 06/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=38 --- jsch-build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jsch-build.xml b/jsch-build.xml index fac0afa..f739638 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -163,6 +163,7 @@ + From cd01c3511867f49d9466517f3bc4cec7cae957f258385e399b8365dd98f7a39a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 May 2023 18:35:02 +0000 Subject: [PATCH 07/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=39 --- jsch-build.xml | 113 +++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/jsch-build.xml b/jsch-build.xml index f739638..33aa4f7 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -10,11 +10,12 @@ - + - + + @@ -72,13 +73,13 @@ - @@ -89,14 +90,14 @@ - @@ -108,13 +109,13 @@ - @@ -127,14 +128,14 @@ - @@ -146,14 +147,14 @@ - @@ -170,24 +171,24 @@ - @@ -198,10 +199,10 @@ - From 21339aee50aace7a0abc1fa37730b65e8a9056699d51d66f254555df0ced5172 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jun 2023 10:16:48 +0000 Subject: [PATCH 08/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=40 --- jsch-build.xml | 38 ++++++++++++++++++++++++++++++++++++++ jsch.spec | 6 +++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/jsch-build.xml b/jsch-build.xml index 33aa4f7..20fa46a 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -164,6 +164,44 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/jsch.spec b/jsch.spec index a637950..09edb79 100644 --- a/jsch.spec +++ b/jsch.spec @@ -22,15 +22,15 @@ Release: 0 Summary: Pure Java implementation of SSH2 License: BSD-3-Clause Group: Development/Libraries/Java -URL: https://www.jcraft.com/jsch/ +URL: https://github.com/mwiede/jsch/ Source0: https://github.com/mwiede/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Patch0: jsch-junixsocket.patch Patch1: jsch-log4j.patch BuildRequires: ant BuildRequires: fdupes -# We build different multiversion overrides for 9, 10, 11 -BuildRequires: java-devel >= 11 +# We build different multiversion overrides for 9, 10, 11, 15 and 16 and module-info.class +BuildRequires: java-devel >= 9 BuildRequires: bouncycastle BuildRequires: javapackages-local >= 6 BuildRequires: jna From 9b5a0b68c7924c7e6b78bdd8fe0a23693483462c4c872b4858ee63e0287a78ca Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jun 2023 10:20:13 +0000 Subject: [PATCH 09/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=41 --- jsch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsch.spec b/jsch.spec index 09edb79..495246f 100644 --- a/jsch.spec +++ b/jsch.spec @@ -29,7 +29,7 @@ Patch0: jsch-junixsocket.patch Patch1: jsch-log4j.patch BuildRequires: ant BuildRequires: fdupes -# We build different multiversion overrides for 9, 10, 11, 15 and 16 and module-info.class +# We need this for module-info.class BuildRequires: java-devel >= 9 BuildRequires: bouncycastle BuildRequires: javapackages-local >= 6 From 27e7a5d872a1efcfdffd02e691f00f8b1a7374ba64cf386c0ebb61b917f71a0a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jun 2023 11:56:17 +0000 Subject: [PATCH 10/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=42 --- jsch-build.xml | 98 +++++++++++++++++++++++++++++++++++--------------- jsch.spec | 2 +- 2 files changed, 70 insertions(+), 30 deletions(-) diff --git a/jsch-build.xml b/jsch-build.xml index 20fa46a..59870ba 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -60,34 +60,11 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Java/JVM version: ${ant.java.version} + + + + + + + + + + + + + + + + + + + + + + @@ -236,7 +276,7 @@ - + Date: Fri, 2 Jun 2023 12:07:13 +0000 Subject: [PATCH 11/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=43 --- jsch.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsch.spec b/jsch.spec index 3eb160e..723a0dd 100644 --- a/jsch.spec +++ b/jsch.spec @@ -28,10 +28,10 @@ Source1: %{name}-build.xml Patch0: jsch-junixsocket.patch Patch1: jsch-log4j.patch BuildRequires: ant +BuildRequires: bouncycastle BuildRequires: fdupes # We need this for module-info.class BuildRequires: java-devel >= 9 -BuildRequires: bouncycastle BuildRequires: javapackages-local >= 6 BuildRequires: jna BuildRequires: jna-contrib @@ -83,7 +83,7 @@ rm -f \ %build mkdir -p lib build-jar-repository -s lib jna jna-platform slf4j/api bcprov -%ant jar javadoc +%{ant} jar javadoc %install # jars From 38b47c5a6aa069fcdefabce332eb3d07a263da1073a78b7a8f716a7ef1425be6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jun 2023 21:21:43 +0000 Subject: [PATCH 12/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=44 --- jsch-build.xml | 110 ++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/jsch-build.xml b/jsch-build.xml index 59870ba..772f09a 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -57,14 +57,61 @@ - + - + + + + + + + + + + + + + + + + + + Java/JVM version: ${ant.java.version} + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - + - - - - - + - - - - - - - - - + - - Java/JVM version: ${ant.java.version} - - - - - - - - - - - - - - - - - - - - - - From b7990743b60c8c037abc7b8970b8c4bcf42525094baae62fad9611d6e60b8db4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 3 Jun 2023 11:14:25 +0000 Subject: [PATCH 13/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=45 --- jsch.changes | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) diff --git a/jsch.changes b/jsch.changes index d9ef5a5..f99c81b 100644 --- a/jsch.changes +++ b/jsch.changes @@ -1,3 +1,273 @@ +------------------------------------------------------------------- +Sat Jun 3 11:03:46 UTC 2023 - Fridrich Strba + +- Migrate from com.jcraft:jsch to com.github.mwiede:jsch fork + (bsc#1211955) + * Alias to the old artifact since the new one is drop-in + replacement + * Keep the old OSGi bundle symbolic name to avoid extensive + patching of eclipse stack +- Upgrade to version 0.2.9 + * Changes of 0.2.9 + + various improvements, #295 + ~ #293 allow UserAuthNone to be extended. + ~ Make JGSS module optional. + ~ Tweak OSGi bundle manifest: + ~ Avoid self-import. + ~ Mark JGSS as optional. + ~ Loosen import versions of dependencies. + ~ Correctly adhere to the Multi-release JAR spec by ensuring + all public classes under versioned directories preside over + classes present in the top-level directory. + ~ Eliminate stray System.err.println() calls. + ~ Change PageantConnector to use JNA's built-in support for + User32.SendMessage(). + + Improve error handling in InputStream.close() for SFTP + channels, #331 + * Changes of 0.2.8 + + activate sourcecode formatting, #247 + + build improvements, #279 + + #287 add algorithm type information to algorithm negotiation + logs, #290 + + wrap NoClassDefFoundError's for invalid private keys, #289 and + #290 + * Changes of 0.2.7 + + #265 change buffer_margin computation to be dynamic based upon + the MAC to allow connections that advertise small maximum + packet sizes. + + #266 fix PuTTY key parsing to work with unix line endings. + + Add support for ECDSA and EdDSA type PuTTY keys. + + #71 add support for PuTTY version 3 format keys. + ~ Encrypted PuTTY version 3 format keys requires Bouncy + Castle (bcprov-jdk18on). + + Eliminate KeyPairDeferred and instead change handling of + OpenSSH V1 type keys to be more like other KeyPair types. + + Be more vigilant about clearing private key data. + + Improve PKCS8 key handling and add support for PKCS5 2.1 + encryption. + + Add support for ECDSA type PKCS8 keys. + + Add support for SCrypt type KDF for PKCS8 keys. + ~ PKCS8 keys using SCrypt requires Bouncy Castle + (bcprov-jdk18on). + + Add support for EdDSA type PKCS8 keys. + ~ EdDSA type PKCS8 keys requires Bouncy Castle + (bcprov-jdk18on). + + Attempt to authenticate using other signature algorithms + supported by the same public key. + ~ Allow this behavior to be disabled via + try_additional_pubkey_algorithms config option. + ° Some servers incorrectly respond with + SSH_MSG_USERAUTH_PK_OK to an initial auth query that they + don't actually support for RSA keys. + + Add a new config option enable_pubkey_auth_query to allow + skipping auth queries and proceed directly to attempting + full SSH_MSG_USERAUTH_REQUEST's. + + Add a new config option enable_auth_none to control whether + an initial auth request for the method none is sent to detect + all supported auth methods available on the server. + * Changes of 0.2.6 + + Include host alias instead of the real host in messages and + exceptions, #257 + + Fix missing keySize set when loading V1 RSA keys, #258 + + Enhancement to present KeyPair.getKeyTypeString() method, #259 + * Changes of 0.2.5 + + Explictly free resources in Compression implementations, #241 + + Fix integration test failures on Apple Silicon by skipping + OpenSSH 7.4 tests, #227 + + generate osgi bundle manifest data for jar #248, #249 + * Changes of 0.2.4 + + Improved excepton handling by @norrisjeremy in #200 + * Changes of 0.2.3 + + #188 fix private key length checks for ssh-ed25519 and + ssh-ed448, #189 + * Changes of 0.2.2 + + setup jdk for code-ql analysis, #151 + + misc improvements, #152 + + Fixing Issue #131, #134 + + Update link to bcrypt, #157 + * Changes of 0.2.1 + + Allow to set a Logger per JSch-instance rather than a VM-wide + one, #128 + + Preliminary changes prior to Javadoc work, #126 + + remove check to allow setting any filename encoding with any + server version #137, #142 + * Changes of 0.2.0 + + Disable RSA/SHA1 signature algorithm by default #75 + + Add basic Logger implementations that can be optionally + utilized with JSch.setLogger(): + ~ JulLogger, using java.util.logging.Logger + ~ JplLogger, using Java 9's JEP 264 + ~ Log4j2Logger, using Apache Log4j 2 + ~ Slf4jLogger, using SLF4J + + Fix client version to be compliant with RFC 4253 section 4.2 + by not including minus sign characters #115 + + Add java.util.zip based compression implementation #114 + ~ This is based upon the CompressionJUZ implementation posted + to the JSch-users mailing list in 2012 by the original JSch + author + ~ The existing JZlib implementation remains the default to + maintain strict RFC 4253 section 6.2 compliance + ° To use the new implementation globally, execute + JSch.setConfig("zlib@openssh.com", + "com.jcraft.jsch.juz.Compression") + + JSch.setConfig("zlib", "com.jcraft.jsch.juz.Compression") + ° To use the new implementation per session, execute + session.setConfig("zlib@openssh.com", + "com.jcraft.jsch.juz.Compression") + + session.setConfig("zlib", + "com.jcraft.jsch.juz.Compression") + * Changes of 0.1.72 + + Switch chacha20-poly1305@openssh.com algorithm to a pure + Bouncy Castle based implementation + + implement openssh config behavior to handle append, prepend + and removal of algorithms #104 + * Changes of 0.1.71 + + Address #98 by restoring JSch.VERSION + * Changes of 0.1.70 + + Address #89 by fixing rare ECDSA signature validation issue + + Address #93 by always setting the "want reply" flag for "env" + type channel requests to false + * Changes of 0.1.69 + + Address #83 by sending CR LF at the end of the identification + string + + Fix earlier change for #76 that failed to correctly make the + "Host" keyword case-insensitive + + Fix PageantConnector struct class visibility #86 + * Changes of 0.1.68 + + Added support for the rijndael-cbc@lysator.liu.se algorithm + + Added support for the hmac-ripemd160, + hmac-ripemd160@openssh.com and hmac-ripemd160-etm@openssh.com + algorithms using Bouncy Castle + + Added support for various algorithms from RFC 4253 and + RFC 4344 using Bouncy Castle + ~ cast128-cbc + ~ cast128-ctr + ~ twofish-cbc + ~ twofish128-cbc + ~ twofish128-ctr + ~ twofish192-cbc + ~ twofish192-ctr + ~ twofish256-cbc + ~ twofish256-ctr + + Added support for the seed-cbc@ssh.com algorithm using Bouncy + Castle + * Changes of 0.1.67 + + Added support for the blowfish-ctr algorithm from RFC 4344 + + Fix bug where ext-info-c was incorrectly advertised during + rekeying + ~ According to RFC 8308 section 2.1, ext-info-c should only + advertised during the first key exchange + + Address #77 by attempting to add compatibility with older + Bouncy Castle releases + * Changes of 0.1.66 + + Added support for RFC 8308 extension negotiation and + server-sig-algs extension + ~ This support is enabled by default, but can be controlled + via the enable_server_sig_algs config option (or + jsch.enable_server_sig_algs system property) + ~ When enabled and a server-sig-algs message is received from + the server, the algorithms included by the server and also + present in the PubkeyAcceptedKeyTypes config option will be + attempted first when using publickey authentication + ~ Additionally if the server is detected as OpenSSH version + 7.4, the rsa-sha2-256 and rsa-sha2-512 algorithms will be + added to the received server-sig-algs as a workaround for + OpenSSH bug 2680 + + Added support for various algorithms supported by Tectia + (ssh.com): + ~ diffie-hellman-group14-sha224@ssh.com + ~ diffie-hellman-group14-sha256@ssh.com + ~ diffie-hellman-group15-sha256@ssh.com + ~ diffie-hellman-group15-sha384@ssh.com + ~ diffie-hellman-group16-sha384@ssh.com + ~ diffie-hellman-group16-sha512@ssh.com + ~ diffie-hellman-group18-sha512@ssh.com + ~ diffie-hellman-group-exchange-sha224@ssh.com + ~ diffie-hellman-group-exchange-sha384@ssh.com + ~ diffie-hellman-group-exchange-sha512@ssh.com + ~ hmac-sha224@ssh.com + ~ hmac-sha256@ssh.com + ~ hmac-sha256-2@ssh.com + ~ hmac-sha384@ssh.com + ~ hmac-sha512@ssh.com + ~ ssh-rsa-sha224@ssh.com + ~ ssh-rsa-sha256@ssh.com + ~ ssh-rsa-sha384@ssh.com + ~ ssh-rsa-sha512@ssh.com + + Added support for SHA224 to FingerprintHash + + Fixing #52 + + Deprecate void setFilenameEncoding(String encoding) in favor + of void setFilenameEncoding(Charset encoding) in ChannelSftp + + Added support for rsa-sha2-256 and rsa-rsa2-512 algorithms to + ChannelAgentForwarding + + Address #65 by adding ssh-agent support derived from + jsch-agent-proxy + ~ See examples/JSchWithAgentProxy.java for simple example + ~ ssh-agent support requires either Java 16's JEP 380 or the + addition of junixsocket to classpath + ~ Pageant support is untested and requires the addition of JNA + to classpath + + Added support for the following algorithms with older Java + releases by using Bouncy Castle: + ~ ssh-ed25519 + ~ ssh-ed448 + ~ curve25519-sha256 + ~ curve25519-sha256@libssh.org + ~ curve448-sha512 + ~ chacha20-poly1305@openssh.com + * Changes of 0.1.65 + + Added system properties to allow manipulation of various + crypto algorithms used by default + + Integrated JZlib, allowing use of zlib@openssh.com and zlib + compressions without the need to provide the JZlib jar-file + + Modularized the jar-file for use with Java 9 or newer + + Added runtime controls for the min/max/preferred sizes used + for diffie-hellman-group-exchange-sha256 and + diffie-hellman-group-exchange-sha1 + + Renamed PubkeyAcceptedKeyTypes config to + PubkeyAcceptedAlgorithms to match recent changes in OpenSSH + (PubkeyAcceptedKeyTypes is still accepted for backward + compatibility) + + Reduced number of algorithms that are runtime checked by + default via CheckCiphers, CheckMacs, CheckKExes and + CheckSignatures to improve runtime performance + * Changes of 0.1.64 + + #55 bug fix + * Changes of 0.1.63 + + fix for #42 + * Changes 0.1.62 + + #13 reject HostKey with some servers + + #20 Include TestBCrypt.java unit test + + #21 Misc cleanup + + #27 Update Testcontainers to newest version to fix test + failures + + #34 NPE with openssh v1 format + * Changes 0.1.61 + + Add support for chacha20-poly1305@openssh.com, ssh-ed25519, + ssh-ed448, curve448-sha512, diffie-hellman-group15-sha512 + and diffie-hellman-group17-sha512. + This makes use of the new EdDSA feature added in Java 15's + JEP 339. #17 + + added integration test for public key authentication #19 + * Changes of 0.1.60 + + support for openssh-v1-private-key format + + Fix bug with AEAD ciphers when compression is used. #15 + * Changes of 0.1.59 + + fixing issue #6 (originally from + https://sourceforge.net/p/jsch/mailman/message/36872566/) + * Changes of 0.1.58 + + adds support for more algorithms, see #4 +- Removed patches: + * jsch-0.1.54-sourcetarget.patch + * jsch-osgi-manifest.patch + + both problems are handled differently in the new version +- Added patches: + * jsch-junixsocket.patch + + disable building with dependency that we don't have + * jsch-log4j.patch + + disable building with log4j support in order to avoid a + huge build cycle + ------------------------------------------------------------------- Sat Mar 19 21:51:39 UTC 2022 - Fridrich Strba From e571df76d9504ae0715d02b95c8ea534d30ddf7ee7844b62f0a3bc0797b37570 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 3 Jun 2023 11:57:06 +0000 Subject: [PATCH 14/14] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=46 --- jsch.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jsch.changes b/jsch.changes index f99c81b..d2c9ab3 100644 --- a/jsch.changes +++ b/jsch.changes @@ -257,6 +257,11 @@ Sat Jun 3 11:03:46 UTC 2023 - Fridrich Strba https://sourceforge.net/p/jsch/mailman/message/36872566/) * Changes of 0.1.58 + adds support for more algorithms, see #4 + * Changes of 0.1.57 + + support for rsa-sha2-256 and rsa-sha2-512. #1 + * Changes of 0.1.56 + + support for direct-streamlocal@openssh.com + (see SocketForwardingL.java) - Removed patches: * jsch-0.1.54-sourcetarget.patch * jsch-osgi-manifest.patch