diff --git a/jsch-0.2.15.tar.gz b/jsch-0.2.15.tar.gz deleted file mode 100644 index 4c9c166..0000000 --- a/jsch-0.2.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:751d088eb00a2b41a4d320a23805fdbe75466ffb401b4099a8e0dd814adc9587 -size 400526 diff --git a/jsch-0.2.22.tar.gz b/jsch-0.2.22.tar.gz new file mode 100644 index 0000000..8e0bb41 --- /dev/null +++ b/jsch-0.2.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b339e373b1933bd171cd3bf52337a48d3d49985c673498f141ab3dbebe406a5c +size 410284 diff --git a/jsch-build.xml b/jsch-build.xml index 772f09a..65c5d14 100644 --- a/jsch-build.xml +++ b/jsch-build.xml @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/jsch-junixsocket.patch b/jsch-junixsocket.patch index 761649f..efd605e 100644 --- a/jsch-junixsocket.patch +++ b/jsch-junixsocket.patch @@ -25,11 +25,10 @@ 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; +@@ -7,6 +7,5 @@ module com.jcraft.jsch { + requires static java.security.jgss; + requires static org.apache.logging.log4j; + requires static org.bouncycastle.provider; +- requires static org.newsclub.net.unix; + requires static org.slf4j; } diff --git a/jsch-log4j.patch b/jsch-log4j.patch index ee4cb67..f88e298 100644 --- a/jsch-log4j.patch +++ b/jsch-log4j.patch @@ -1,10 +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; +@@ -5,7 +5,6 @@ module com.jcraft.jsch { + requires static com.sun.jna.platform; + requires static java.logging; + requires static java.security.jgss; +- requires static org.apache.logging.log4j; + requires static org.bouncycastle.provider; + requires static org.slf4j; + } diff --git a/jsch.changes b/jsch.changes index 000aeea..c0ed259 100644 --- a/jsch.changes +++ b/jsch.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Tue Jan 14 08:17:38 UTC 2025 - Fridrich Strba + +- Upgrade to version 0.2.22 + * Changes in 0.2.22 + + Add support for sntrup761x25519-sha512 KEX algorithm. + ° As with sntrup761x25519-sha512@openssh.com, this requires + Bouncy Castle + + Add support for mlkem768x25519-sha256, mlkem768nistp256-sha256 + & mlkem1024nistp384-sha384 KEX algorithms. + ° As with sntrup761x25519-sha512 & + sntrup761x25519-sha512@openssh.com, this requires Bouncy + Castle + + Run tests on Java 23. + + fix(#739) SignatureECDSAN destroying private key + * Changes in 0.2.21 + + Update Deflate.java + * Changes in 0.2.20 + + Fix #648: Incorrect Oid for service name in GSSAPI + authentication + + Update Hostkey.getFingerprint() method to output more moden + format first introduced with OpenSSH 6.8 + + Add stack trace to log message when an exception occurs during + authentication + * Changes in 0.2.19 + + Enforce DHGEX prime modulus bit length meets configured + constraints + + Fix possible rekeying timeouts + * Changes in 0.2.18 + + Handle negated patterns according to ssh_config(5) + * Changes in 0.2.17 + + Organize imports and remove unused imports + + Remove unneeded implements statements + + Remove unused local variables + + Skip flatten-maven-plugin during CI tests + + Expand wildcard imports in order to better adhere to Google + Java Style Guide + + Add PBKDF2-HMAC-SHA512/256 & PBKDF2-HMAC-SHA512/224, which are + both supported as of Java 21 + + Organize imports + + Always embed NoPadding into Cipher string + + Import javax.crypto.Cipher instead of com.jcraft.jsch.Cipher + + Organize module-info + + More formatting corrections to better adhere to Google Java + Style Guide + + Switch to using java.time classes & make work for dates past + 2038 + * Changes of 0.2.16 + + Add support for sntrup761x25519-sha512@openssh.com KEX + algorithm + + Switch to bnd-maven-plugin in order to support Multi-Release + OSGi bundle JAR's via supplemental manifest files + + Introduce JSchProxyException to replace generic JschException + in Proxy implementations + + Do not falsely log support for ext-info if the server did not + return 'ext-info-s' +- Modified patches: + * jsch-junixsocket.patch + * jsch-log4j.patch + + rediff + ------------------------------------------------------------------- Mon Apr 29 12:18:36 UTC 2024 - Fridrich Strba diff --git a/jsch.spec b/jsch.spec index 53dd0b6..b2eed1e 100644 --- a/jsch.spec +++ b/jsch.spec @@ -1,7 +1,7 @@ # # spec file for package jsch # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ # binaries are java 8 compatible %define __requires_exclude java-headless Name: jsch -Version: 0.2.15 +Version: 0.2.22 Release: 0 Summary: Pure Java implementation of SSH2 License: BSD-3-Clause @@ -85,11 +85,11 @@ rm -f \ %build mkdir -p lib build-jar-repository -s lib jna jna-platform slf4j/api bcprov -%{ant} jar javadoc +%{ant} -Dproject.version=%{version} jar javadoc %install # jars -install -Dpm 644 target/%{name}-*.jar %{buildroot}%{_javadir}/%{name}.jar +install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir}