From 570591bbfdd13a82c8d59204ecb24e63fa05244b83e05473d638167919a109c7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba <fstrba@suse.com> Date: Wed, 11 Oct 2023 09:13:25 +0000 Subject: [PATCH] Accepting request 1116857 from Java:packages:test 2.10.0 OBS-URL: https://build.opensuse.org/request/show/1116857 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=19 --- ...ependency-on-native-tomcat-APR-libra.patch | 6 +++--- apache-sshd-2.10.0-src.tar.gz | 3 +++ apache-sshd-2.9.2-src.tar.gz | 3 --- apache-sshd.changes | 19 +++++++++++++++++++ apache-sshd.spec | 7 ++++--- 5 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 apache-sshd-2.10.0-src.tar.gz delete mode 100644 apache-sshd-2.9.2-src.tar.gz diff --git a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch index b303f72..bcb8b0c 100644 --- a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch +++ b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch @@ -14,7 +14,7 @@ diff --git a/pom.xml b/pom.xml index 867ca88..7c29678 100644 --- a/pom.xml +++ b/pom.xml -@@ -428,11 +428,6 @@ +@@ -434,11 +434,6 @@ <artifactId>mina-core</artifactId> <version>2.0.23</version> </dependency> @@ -41,7 +41,7 @@ index 6171c5c..73a43a7 100644 - - <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk15on</artifactId> + <artifactId>bcpg-jdk18on</artifactId> <optional>true</optional> diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java index ab19539..5757e68 100644 @@ -88,7 +88,7 @@ diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml index 5395ceb..f456263 100644 --- a/sshd-osgi/pom.xml +++ b/sshd-osgi/pom.xml -@@ -68,12 +68,6 @@ +@@ -81,12 +81,6 @@ <optional>true</optional> <scope>provided</scope> </dependency> diff --git a/apache-sshd-2.10.0-src.tar.gz b/apache-sshd-2.10.0-src.tar.gz new file mode 100644 index 0000000..54987c8 --- /dev/null +++ b/apache-sshd-2.10.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba816577718c66c5f1be237dc32a06aecaaca5d842aa07a8003ce1991ce190b7 +size 1797781 diff --git a/apache-sshd-2.9.2-src.tar.gz b/apache-sshd-2.9.2-src.tar.gz deleted file mode 100644 index e5ba2c8..0000000 --- a/apache-sshd-2.9.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeea62247ea87213f20f6b1d6f817776d2c7493ff23fbc4a1f99e0081631c02e -size 1743627 diff --git a/apache-sshd.changes b/apache-sshd.changes index eb64057..4a08001 100644 --- a/apache-sshd.changes +++ b/apache-sshd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Oct 11 09:03:24 UTC 2023 - Fridrich Strba <fstrba@suse.com> + +- Upgrade to upstrem version 2.10.0 + * Bug + + SSHD-1295: Connection attempt not canceled when a connection + timeout occurs + + SSHD-1316: Possible OOM in ChannelPipedInputStream + + SSHD-1319: SftpRemotePathChannel.transferFrom(...) ignores + position argument + + SSHD-1324: Rooted file system can leak informations + + SSHD-1326: Failed to establish an SSH connection because the + server identifier exceeds the int range + * Improvement + + SSHD-1315: Password in clear in SSHD server's logs +- Modified patch: + * 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch + + rediff to changed context + ------------------------------------------------------------------- Fri Feb 10 07:26:34 UTC 2023 - Fridrich Strba <fstrba@suse.com> diff --git a/apache-sshd.spec b/apache-sshd.spec index 1aec435..c961a97 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -17,12 +17,13 @@ Name: apache-sshd -Version: 2.9.2 +Version: 2.10.0 Release: 0 Summary: Apache SSHD # One file has ISC licensing: # sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java License: Apache-2.0 AND ISC +Group: Development/Libraries/Java URL: https://mina.apache.org/sshd-project Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz # Avoid optional dep on tomcat native APR library @@ -40,8 +41,8 @@ BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache:apache-jar-resource-bundle) BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) +BuildRequires: mvn(org.bouncycastle:bcpg-jdk18on) +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk18on) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.slf4j:jcl-over-slf4j)