OBS-URL: https://build.opensuse.org/package/show/Java:packages/trilead-ssh2?expand=0&rev=6

2022-03-19 05:39:45 +00:00 · 2022-03-19 05:39:45 +00:00 · 28a360b650
commit 28a360b650
parent 5faa13aab3
3 changed files with 97 additions and 0 deletions
--- a/trilead-ssh2-javadoc17.patch
+++ b/trilead-ssh2-javadoc17.patch
@ -0,0 +1,88 @@
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/ChannelCondition.java	2022-03-19 06:26:07.892206683 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/ChannelCondition.java	2022-03-19 06:31:33.158164595 +0100
+@@ -17,7 +17,7 @@
+ 	 * A timeout has occurred, none of your requested conditions is fulfilled.
+ 	 * However, other conditions may be true - therefore, NEVER use the "=="
+ 	 * operator to test for this (or any other) condition. Always use
+-	 * something like <code>((cond & ChannelCondition.CLOSED) != 0)</code>.
+	 * something like <code>((cond &amp; ChannelCondition.CLOSED) != 0)</code>.
+ 	 */
+ 	public static final int TIMEOUT = 1;
+ 
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/crypto/cipher/DES.java	2022-03-19 06:26:07.896206708 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/crypto/cipher/DES.java	2022-03-19 06:35:27.631582750 +0100
+@@ -187,7 +187,7 @@
+ 	 * generate an integer based working key based on our secret key and what we
+ 	 * processing we are planning to do.
+ 	 * 
+-	 * Acknowledgements for this routine go to James Gillogly & Phil Karn.
+	 * Acknowledgements for this routine go to James Gillogly &amp; Phil Karn.
+ 	 * (whoever, and wherever they are!).
+ 	 */
+ 	protected int[] generateWorkingKey(boolean encrypting, byte[] key, int off)
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/DHGexParameters.java	2022-03-19 06:26:07.892206683 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/DHGexParameters.java	2022-03-19 06:36:31.399968581 +0100
+@@ -39,7 +39,7 @@
+ 	 * Internally, the minimum and maximum group lengths will
+ 	 * be set to zero.
+ 	 * 
+-	 * @param pref_group_len has to be &gt= 1024 and &lt;= 8192
+	 * @param pref_group_len has to be &gt;= 1024 and &lt;= 8192
+ 	 */
+ 	public DHGexParameters(int pref_group_len)
+ 	{
+@@ -58,7 +58,7 @@
+ 	 * Note: older OpenSSH servers don't understand this request, in which
+ 	 * case you should use the {@link #DHGexParameters(int)} constructor.
+ 	 * <p>
+-	 * All values have to be &gt= 1024 and &lt;= 8192. Furthermore,
+	 * All values have to be &gt;= 1024 and &lt;= 8192. Furthermore,
+ 	 * min_group_len &lt;= pref_group_len &lt;= max_group_len.
+ 	 * 
+ 	 * @param min_group_len
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/KnownHosts.java	2022-03-19 06:26:07.896206708 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/KnownHosts.java	2022-03-19 06:27:45.980795075 +0100
+@@ -36,7 +36,7 @@
+  * It offers basically an in-memory database for known_hosts entries, as well as some
+  * helper functions. Entries from a <code>known_hosts</code> file can be loaded at construction time.
+  * It is also possible to add more keys later (e.g., one can parse different
+- * <code>known_hosts<code> files).
+ * <code>known_hosts</code> files).
+  * <p>
+  * It is a thread safe implementation, therefore, you need only to instantiate one
+  * <code>KnownHosts</code> for your whole application.
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/Session.java	2022-03-19 06:26:07.896206708 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/Session.java	2022-03-19 06:33:58.935046105 +0100
+@@ -485,8 +485,8 @@
+ 	 * This method returns as soon as one of the following happens:
+ 	 * <ul>
+ 	 * <li>at least of the specified conditions (see {@link ChannelCondition}) holds true</li>
+-	 * <li>timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions)</a> 
+-	 * <li>the underlying channel was closed (CLOSED will be set in result conditions)</a>
+	 * <li>timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions)</li> 
+	 * <li>the underlying channel was closed (CLOSED will be set in result conditions)</li>
+ 	 * </ul>
+ 	 * <p>
+ 	 * In any case, the result value contains ALL current conditions, which may be more
+@@ -514,7 +514,7 @@
+ 	 * Get the exit code/status from the remote command - if available. Be
+ 	 * careful - not all server implementations return this value. It is
+ 	 * generally a good idea to call this method only when all data from the
+-	 * remote side has been consumed (see also the <code<WaitForCondition</code> method).
+	 * remote side has been consumed (see also the <code>WaitForCondition</code> method).
+ 	 * 
+ 	 * @return An <code>Integer</code> holding the exit code, or
+ 	 *         <code>null</code> if no exit code is (yet) available.
+--- trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/SFTPv3Client.java	2022-03-19 06:26:07.896206708 +0100
+++ trilead-ssh2-trilead-ssh2-build217-jenkins-8/src/com/trilead/ssh2/SFTPv3Client.java	2022-03-19 06:38:24.044650356 +0100
+@@ -1208,8 +1208,8 @@
+ 	 * <ul>
+ 	 * <li>The server will read as many bytes as it can from the file (up to <code>len</code>),
+ 	 * and return them.</li>
+-	 * <li>If EOF is encountered before reading any data, <code>-1</code> is returned.
+-	 * <li>If an error occurs, an exception is thrown</li>.
+	 * <li>If EOF is encountered before reading any data, <code>-1</code> is returned.</li>
+	 * <li>If an error occurs, an exception is thrown.</li>
+ 	 * <li>For normal disk files, it is guaranteed that the server will return the specified
+ 	 * number of bytes, or up to end of file. For, e.g., device files this may return
+ 	 * fewer bytes than requested.</li>
--- a/trilead-ssh2.changes
+++ b/trilead-ssh2.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Mar 19 05:39:01 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * trilead-ssh2-javadoc17.patch
+    + fix html5 errors when generating javadoc with JDK 17
+
 -------------------------------------------------------------------
 Fri Mar 18 16:41:59 UTC 2022 - Fridrich Strba <fstrba@suse.com>

--- a/trilead-ssh2.spec
+++ b/trilead-ssh2.spec
@ -26,6 +26,7 @@ License:        BSD-3-Clause AND MIT
 Group:          Development/Libraries/Java
 URL:            https://github.com/jenkinsci/trilead-ssh2
 Source0:        https://github.com/jenkinsci/%{name}/archive/%{name}-build%{buildver}-jenkins-%{patchlvl}.tar.gz
+Patch0:         trilead-ssh2-javadoc17.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
@ -48,6 +49,7 @@ API documentation for %{name}.

 %prep
 %setup -q -n %{name}-%{name}-build%{buildver}-jenkins-%{patchlvl}
+%patch0 -p1

 %build
 mkdir -p build/classes