From 354467a767e84e633ccf1a3c3042181fd7be6b305058aaf4919c1196e2b90a25 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 30 Jul 2021 12:36:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=9 --- apache-sshd-2.4.0-java8.patch | 75 ----------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 apache-sshd-2.4.0-java8.patch diff --git a/apache-sshd-2.4.0-java8.patch b/apache-sshd-2.4.0-java8.patch deleted file mode 100644 index 52d7b14..0000000 --- a/apache-sshd-2.4.0-java8.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- apache-sshd-2.4.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2020-07-16 23:25:44.981904289 +0200 -+++ apache-sshd-2.4.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2020-07-16 23:49:34.043250054 +0200 -@@ -362,13 +362,13 @@ - if (debugEnabled) { - log.debug("handleReadCycleCompletion({}) read {} bytes", this, result); - } -- buffer.flip(); -+ ((java.nio.Buffer)buffer).flip(); - - IoHandler handler = getIoHandler(); - handler.messageReceived(this, bufReader); - if (!closeFuture.isClosed()) { - // re-use reference for next iteration since we finished processing it -- buffer.clear(); -+ ((java.nio.Buffer)buffer).clear(); - doReadCycle(buffer, completionHandler); - } else { - if (debugEnabled) { ---- apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpRemotePathChannel.java 2020-07-16 23:25:44.961904157 +0200 -+++ apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpRemotePathChannel.java 2020-07-16 23:38:16.702818800 +0200 -@@ -20,6 +20,7 @@ - package org.apache.sshd.client.subsystem.sftp; - - import java.io.IOException; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.MappedByteBuffer; - import java.nio.channels.AsynchronousCloseException; -@@ -123,7 +124,7 @@ - int read = sftp.read(handle, curPos, wrap.array(), wrap.arrayOffset() + wrap.position(), wrap.remaining()); - if (read > 0) { - if (wrap == buffer) { -- wrap.position(wrap.position() + read); -+ ((Buffer)wrap).position(wrap.position() + read); - } else { - buffer.put(wrap.array(), wrap.arrayOffset(), read); - } -@@ -191,7 +192,7 @@ - int written = wrap.remaining(); - sftp.write(handle, curPos, wrap.array(), wrap.arrayOffset() + wrap.position(), written); - if (wrap == buffer) { -- wrap.position(wrap.position() + written); -+ ((Buffer)wrap).position(wrap.position() + written); - } - curPos += written; - totalWritten += written; ---- apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/AbstractSftpSubsystemHelper.java 2020-07-16 23:25:44.961904157 +0200 -+++ apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/AbstractSftpSubsystemHelper.java 2020-07-16 23:51:17.255925762 +0200 -@@ -980,7 +980,7 @@ - if (remainLen < digestBuf.length) { - bb = ByteBuffer.wrap(digestBuf, 0, remainLen); - } -- bb.clear(); // prepare for next read -+ ((java.nio.Buffer)bb).clear(); // prepare for next read - - int readLen = channel.read(bb); - if (readLen < 0) { -@@ -1005,7 +1005,7 @@ - if (remainLen < digestBuf.length) { - bb = ByteBuffer.wrap(digestBuf, 0, remainLen); - } -- bb.clear(); // prepare for next read -+ ((java.nio.Buffer)bb).clear(); // prepare for next read - - int readLen = channel.read(bb); - if (readLen < 0) { -@@ -1140,7 +1140,7 @@ - if (remainLen < digestBuf.length) { - bb = ByteBuffer.wrap(digestBuf, 0, remainLen); - } -- bb.clear(); // prepare for next read -+ ((java.nio.Buffer)bb).clear(); // prepare for next read - - int readLen = channel.read(bb); - if (readLen < 0) {