From 5faa13aab3e5c4a0a20305516778ae51f4dc331e336e319417839a8c579f825d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 16:42:29 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/trilead-ssh2?expand=0&rev=5 --- trilead-ssh2.changes | 5 +++++ trilead-ssh2.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/trilead-ssh2.changes b/trilead-ssh2.changes index 318e820..8e4bbec 100644 --- a/trilead-ssh2.changes +++ b/trilead-ssh2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 18 16:41:59 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + ------------------------------------------------------------------- Tue Apr 16 08:15:30 UTC 2019 - Fridrich Strba diff --git a/trilead-ssh2.spec b/trilead-ssh2.spec index 5ed2088..c064a76 100644 --- a/trilead-ssh2.spec +++ b/trilead-ssh2.spec @@ -1,7 +1,7 @@ # # spec file for package trilead-ssh2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ 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 BuildRequires: fdupes -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildArch: noarch @@ -51,10 +51,10 @@ API documentation for %{name}. %build mkdir -p build/classes -javac -d build/classes -source 6 -target 6 $(find src -name \*.java | xargs) +javac -d build/classes -source 8 -target 8 $(find src -name \*.java | xargs) (cd build/classes && jar cf ../%{name}-%{version}.jar $(find . -name \*.class)) mkdir -p build/docs -javadoc -d build/docs -source 6 $(find src -name \*.java | xargs) +javadoc -d build/docs -source 8 $(find src -name \*.java | xargs) %install # jars From 28a360b650f06e085ccb2ff10829144f29dbdaa5fae8f8ecd254e20c7eb05e84 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Mar 2022 05:39:45 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/trilead-ssh2?expand=0&rev=6 --- trilead-ssh2-javadoc17.patch | 88 ++++++++++++++++++++++++++++++++++++ trilead-ssh2.changes | 7 +++ trilead-ssh2.spec | 2 + 3 files changed, 97 insertions(+) create mode 100644 trilead-ssh2-javadoc17.patch diff --git a/trilead-ssh2-javadoc17.patch b/trilead-ssh2-javadoc17.patch new file mode 100644 index 0000000..f9d2802 --- /dev/null +++ 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 ((cond & ChannelCondition.CLOSED) != 0). ++ * something like ((cond & ChannelCondition.CLOSED) != 0). + */ + 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 & 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 >= 1024 and <= 8192 ++ * @param pref_group_len has to be >= 1024 and <= 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. + *

+- * All values have to be >= 1024 and <= 8192. Furthermore, ++ * All values have to be >= 1024 and <= 8192. Furthermore, + * min_group_len <= pref_group_len <= 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 known_hosts file can be loaded at construction time. + * It is also possible to add more keys later (e.g., one can parse different +- * known_hosts files). ++ * known_hosts files). + *

+ * It is a thread safe implementation, therefore, you need only to instantiate one + * KnownHosts 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: + *

    + *
  • at least of the specified conditions (see {@link ChannelCondition}) holds true
    • +- *
  • timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions) +- *
  • the underlying channel was closed (CLOSED will be set in result conditions) ++ *
  • timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions)
    • ++ *
  • the underlying channel was closed (CLOSED will be set in result conditions)
    • + *
+ *

+ * 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 method). ++ * remote side has been consumed (see also the WaitForCondition method). + * + * @return An Integer holding the exit code, or + * null 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 @@ + *

    + *
  • The server will read as many bytes as it can from the file (up to len), + * and return them.
    • +- *
  • If EOF is encountered before reading any data, -1 is returned. +- *
  • If an error occurs, an exception is thrown
    • . ++ *
  • If EOF is encountered before reading any data, -1 is returned.
    • ++ *
  • If an error occurs, an exception is thrown.
    • + *
  • 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.
    • diff --git a/trilead-ssh2.changes b/trilead-ssh2.changes index 8e4bbec..a2344c8 100644 --- a/trilead-ssh2.changes +++ b/trilead-ssh2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 19 05:39:01 UTC 2022 - Fridrich Strba + +- 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 diff --git a/trilead-ssh2.spec b/trilead-ssh2.spec index c064a76..d673c11 100644 --- 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 From 9e938c5de1ff45a39000505a9a05003d1f6fd79f872939ef46d6b4729c2daaa2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:37:30 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/trilead-ssh2?expand=0&rev=7 --- trilead-ssh2.changes | 7 ------- trilead-ssh2.spec | 2 -- 2 files changed, 9 deletions(-) diff --git a/trilead-ssh2.changes b/trilead-ssh2.changes index a2344c8..8e4bbec 100644 --- a/trilead-ssh2.changes +++ b/trilead-ssh2.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 19 05:39:01 UTC 2022 - Fridrich Strba - -- 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 diff --git a/trilead-ssh2.spec b/trilead-ssh2.spec index d673c11..c064a76 100644 --- a/trilead-ssh2.spec +++ b/trilead-ssh2.spec @@ -26,7 +26,6 @@ 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 @@ -49,7 +48,6 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-build%{buildver}-jenkins-%{patchlvl} -%patch0 -p1 %build mkdir -p build/classes From be839b8de15587f4bc9652c96f528f779acc695c9c6f127d747acb9ecbff54f0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:37:48 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/trilead-ssh2?expand=0&rev=8 --- trilead-ssh2-javadoc17.patch | 88 ------------------------------------ 1 file changed, 88 deletions(-) delete mode 100644 trilead-ssh2-javadoc17.patch diff --git a/trilead-ssh2-javadoc17.patch b/trilead-ssh2-javadoc17.patch deleted file mode 100644 index f9d2802..0000000 --- a/trilead-ssh2-javadoc17.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- 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 ((cond & ChannelCondition.CLOSED) != 0). -+ * something like ((cond & ChannelCondition.CLOSED) != 0). - */ - 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 & 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 >= 1024 and <= 8192 -+ * @param pref_group_len has to be >= 1024 and <= 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. - *

    -- * All values have to be >= 1024 and <= 8192. Furthermore, -+ * All values have to be >= 1024 and <= 8192. Furthermore, - * min_group_len <= pref_group_len <= 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 known_hosts file can be loaded at construction time. - * It is also possible to add more keys later (e.g., one can parse different -- * known_hosts files). -+ * known_hosts files). - *

    - * It is a thread safe implementation, therefore, you need only to instantiate one - * KnownHosts 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: - *

      - *
    • at least of the specified conditions (see {@link ChannelCondition}) holds true
      • -- *
    • timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions) -- *
    • the underlying channel was closed (CLOSED will be set in result conditions) -+ *
    • timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions)
      • -+ *
    • the underlying channel was closed (CLOSED will be set in result conditions)
      • - *
    - *

    - * 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 method). -+ * remote side has been consumed (see also the WaitForCondition method). - * - * @return An Integer holding the exit code, or - * null 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 @@ - *

      - *
    • The server will read as many bytes as it can from the file (up to len), - * and return them.
      • -- *
    • If EOF is encountered before reading any data, -1 is returned. -- *
    • If an error occurs, an exception is thrown
      • . -+ *
    • If EOF is encountered before reading any data, -1 is returned.
      • -+ *
    • If an error occurs, an exception is thrown.
      • - *
    • 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.