diff --git a/apache-sshd-2.10.0-src.tar.gz b/apache-sshd-2.10.0-src.tar.gz deleted file mode 100644 index 54987c8..0000000 --- a/apache-sshd-2.10.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba816577718c66c5f1be237dc32a06aecaaca5d842aa07a8003ce1991ce190b7 -size 1797781 diff --git a/apache-sshd-2.12.0-src.tar.gz b/apache-sshd-2.12.0-src.tar.gz new file mode 100644 index 0000000..342ee39 --- /dev/null +++ b/apache-sshd-2.12.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8198fd90ca8089a71547300a7a8f6e853dd5fea6095a6887f79564849e76bd8 +size 1857423 diff --git a/apache-sshd-javadoc.patch b/apache-sshd-javadoc.patch index b8c7c90..e334846 100644 --- a/apache-sshd-javadoc.patch +++ b/apache-sshd-javadoc.patch @@ -171,46 +171,6 @@ */ public static final List DEFAULT_MAC_PREFERENCE = Collections.unmodifiableList( Arrays.asList( ---- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java 2022-11-16 09:50:02.575293593 +0100 -+++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java 2022-11-16 10:22:11.968492069 +0100 -@@ -51,8 +51,6 @@ - /** - * Initializes the {@link LocalWindow} with the packet and window sizes from the {@code resolver}. - * -- * @param size the initial window size -- * @param packetSize the peer's advertised maximum packet size - * @param resolver {@PropertyResolver} to access properties - */ - public void init(PropertyResolver resolver) { ---- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java 2022-11-16 09:50:02.579293619 +0100 -+++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java 2022-11-16 10:49:31.567743605 +0100 -@@ -46,7 +46,7 @@ - /** - * Manages SSH message sending during a key exchange. RFC 4253 specifies that during a key exchange, no high-level - * messages are to be sent, but a receiver must be able to deal with messages "in flight" until the peer's -- * {@link SshConstants#SSH_MSG_KEX_INIT} message is received. -+ * {@link SshConstants#SSH_MSG_KEXINIT} message is received. - *

- * Apache MINA sshd queues up high-level messages that threads try to send while a key exchange is ongoing, and sends - * them once the key exchange is done. Sending queued messages may make the peer re-trigger a new key exchange, in which -@@ -154,7 +154,7 @@ - } - - /** -- * Initializes the state for a new key exchange. {@link #allPacketsFlushed()} will be {@code false}, and a new -+ * Initializes the state for a new key exchange. kexFlushed will be {@code false}, and a new - * future to be fulfilled when all queued packets will be flushed once the key exchange is done is set. The - * currently set future from an earlier key exchange is returned. The returned future may or may not be fulfilled; - * if it isn't, there are still left-over pending packets to write from the previous key exchange, which will be -@@ -406,7 +406,7 @@ - * exchange, flushing is stopped and is to be resumed by another call to this method when the new key exchange is - * done. - * -- * @param flushDone the future obtained from {@link #getFlushedFuture()}; will be fulfilled once all pending packets -+ * @param flushDone the future obtained from {@link #terminateKeyExchange()}; will be fulfilled once all pending packets - * have been written - */ - protected void flushQueue(DefaultKeyExchangeFuture flushDone) { --- apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java 2022-11-16 09:50:02.579293619 +0100 +++ apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java 2022-11-16 10:02:05.032231651 +0100 @@ -224,11 +224,11 @@ diff --git a/apache-sshd.spec b/apache-sshd.spec index c961a97..1e2fc90 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ # # spec file for package apache-sshd # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: apache-sshd -Version: 2.10.0 +Version: 2.12.0 Release: 0 Summary: Apache SSHD # One file has ISC licensing: @@ -40,7 +40,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) 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.apache:apache:pom:) >= 30 BuildRequires: mvn(org.bouncycastle:bcpg-jdk18on) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk18on) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) @@ -85,6 +85,8 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %pom_disable_module sshd-cli %pom_disable_module sshd-openpgp %pom_disable_module assembly +# don't require bom that we don't package +%pom_remove_dep org.testcontainers:testcontainers-bom sshd-scp # Disable plugins we don't need for RPM builds %pom_remove_plugin :apache-rat-plugin