From 5855eabf4fbead96d1eb984d12d7bed945de4113d371003558fd8788bcf43fab Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 29 Jun 2020 13:10:05 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=2

---
 ...nal-dependency-on-native-tomcat-APR-libra.patch | 14 ++++++--------
 apache-sshd-2.2.0-src.tar.gz                       |  3 ---
 apache-sshd-2.4.0-src.tar.gz                       |  3 +++
 apache-sshd.spec                                   |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 apache-sshd-2.2.0-src.tar.gz
 create mode 100644 apache-sshd-2.4.0-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 ac53b63..da73768 100644
--- a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
+++ b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
@@ -16,7 +16,7 @@ index 867ca88..7c29678 100644
 +++ b/pom.xml
 @@ -397,11 +397,6 @@
                  <artifactId>mina-core</artifactId>
-                 <version>2.0.19</version>
+                 <version>2.0.21</version>
              </dependency>
 -            <dependency>
 -                <groupId>tomcat</groupId>
@@ -30,7 +30,7 @@ diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
 index 6171c5c..73a43a7 100644
 --- a/sshd-core/pom.xml
 +++ b/sshd-core/pom.xml
-@@ -44,12 +44,6 @@
+@@ -42,12 +42,6 @@
              <version>${project.version}</version>
          </dependency>
  
@@ -54,12 +54,12 @@ index ab19539..5757e68 100644
 -import org.apache.sshd.agent.unix.AprLibrary;
 -import org.apache.sshd.agent.unix.UnixAgentFactory;
  import org.apache.sshd.common.FactoryManager;
- import org.apache.sshd.common.NamedFactory;
  import org.apache.sshd.common.PropertyResolver;
-@@ -53,9 +51,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
+ import org.apache.sshd.common.PropertyResolverUtils;
+@@ -52,9 +50,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
  
      @Override
-     public List<NamedFactory<Channel>> getChannelForwardingFactories(FactoryManager manager) {
+     public List<ChannelFactory> getChannelForwardingFactories(FactoryManager manager) {
 -        return isPreferredUnixAgent(manager)
 -            ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS
 -            : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
@@ -67,7 +67,7 @@ index ab19539..5757e68 100644
      }
  
      @Override
-@@ -106,16 +102,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
+@@ -105,16 +101,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
      }
  
      public static boolean isPreferredUnixAgent(PropertyResolver resolver) {
@@ -103,5 +103,3 @@ index 5395ceb..f456263 100644
      <build>
 -- 
 2.20.1
-
-
diff --git a/apache-sshd-2.2.0-src.tar.gz b/apache-sshd-2.2.0-src.tar.gz
deleted file mode 100644
index dd6987c..0000000
--- a/apache-sshd-2.2.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c092fe6eb3e568cdfad9695596e076362f3e6ed4990b85a225367590027d10c9
-size 1280311
diff --git a/apache-sshd-2.4.0-src.tar.gz b/apache-sshd-2.4.0-src.tar.gz
new file mode 100644
index 0000000..2ef80f3
--- /dev/null
+++ b/apache-sshd-2.4.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b4aa68359d7959316fa2c4fae9e835de6ce71bd4de30bf90d3497c7f1e92f2e
+size 1372521
diff --git a/apache-sshd.spec b/apache-sshd.spec
index 3e7cb4a..65c90ba 100644
--- a/apache-sshd.spec
+++ b/apache-sshd.spec
@@ -17,7 +17,7 @@
 
 
 Name:           apache-sshd
-Version:        2.2.0
+Version:        2.4.0
 Release:        0
 Summary:        Apache SSHD
 # One file has ISC licensing: