From fb81a78e884545aec67fc5b3557f256c49c86c7b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Apr 11 2022 15:48:32 +0000
Subject: Add -apache-sshd patch to adapt to apache-sshd 2.8.0.


Minor spec file cleanups.

---

diff --git a/jline-apache-sshd.patch b/jline-apache-sshd.patch
new file mode 100644
index 0000000..6c86e83
--- /dev/null
+++ b/jline-apache-sshd.patch
@@ -0,0 +1,13 @@
+--- remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java.orig	2021-10-18 12:22:49.000000000 -0600
++++ remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java	2022-04-11 09:37:58.672130921 -0600
+@@ -24,8 +24,8 @@ import org.apache.sshd.common.NamedResou
+ import org.apache.sshd.common.channel.PtyMode;
+ import org.apache.sshd.common.config.keys.FilePasswordProvider;
+ import org.apache.sshd.common.session.SessionContext;
+-import org.apache.sshd.common.util.io.NoCloseInputStream;
+-import org.apache.sshd.common.util.io.NoCloseOutputStream;
++import org.apache.sshd.common.util.io.input.NoCloseInputStream;
++import org.apache.sshd.common.util.io.output.NoCloseOutputStream;
+ import org.apache.sshd.scp.server.ScpCommandFactory;
+ import org.apache.sshd.server.SshServer;
+ import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
diff --git a/jline.spec b/jline.spec
index ec640d3..fd07987 100644
--- a/jline.spec
+++ b/jline.spec
@@ -1,12 +1,14 @@
-Name:             jline
-Version:          3.21.0
-Release:          3%{?dist}
-Summary:          Java library for handling console input
-License:          BSD
-URL:              https://github.com/jline/jline3
-BuildArch:        noarch
-
-Source0:          %{url}/archive/jline-parent-%{version}.tar.gz
+Name:           jline
+Version:        3.21.0
+Release:        4%{?dist}
+Summary:        Java library for handling console input
+License:        BSD
+URL:            https://github.com/jline/jline3
+BuildArch:      noarch
+
+Source0:        %{url}/archive/jline-parent-%{version}.tar.gz
+# Adapt to changed package names in apache-sshd 2.8.0
+Patch0:         %{name}-apache-sshd.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.googlecode.juniversalchardet:juniversalchardet)
@@ -35,7 +37,7 @@ familiar.}
 This package contains the parent POM for the jline project
 
 %package javadoc
-Summary:          Javadocs for %{name}
+Summary:        Javadocs for %{name}
 
 %description javadoc %_desc
 
@@ -178,6 +180,10 @@ This package contains a telnet client.
 %files remote-telnet -f .mfiles-jline-remote-telnet
 
 %changelog
+* Mon Apr 11 2022 Jerry James <loganjerry@gmail.com> - 3.21.0-4
+- Add -apache-sshd patch to adapt to apache-sshd 2.8.0
+- Minor spec file cleanups
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.21.0-3
 - Rebuilt for java-17-openjdk as system jdk