From 3c1d19ffce0b0de2898c6a45123efb407367fef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:13:50 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 2c0f7a5..8a13e8d 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -101,6 +101,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1:2.11.0-1 - Rebuilt for java-21-openjdk as system jdk - updated to 2.11 From 0f2351707a5f92d11e90a2d9170b401eb21f91cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 09:16:34 +0200 Subject: [PATCH 2/9] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- apache-sshd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 8a13e8d..8c5f64a 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,12 +4,13 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: # sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java -License: ASL 2.0 and ISC +# Automatically converted from old format: ASL 2.0 and ISC - review is highly recommended. +License: Apache-2.0 AND ISC URL: http://mina.apache.org/sshd-project Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz @@ -101,6 +102,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-3 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 1:2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3715039818aee9375ed9cadf5032a122d44cfed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:18:57 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 8c5f64a..3ecc7d7 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -102,6 +102,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 1:2.11.0-3 - convert license to SPDX From d7577f8207cdc85a031ad52f526e8863348452fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:07:20 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 3ecc7d7..e096a3a 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -102,6 +102,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1:2.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5288b431bcbf0aacf078fdb3c4a9e1d9f44b1e82 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:43:34 +0200 Subject: [PATCH 5/9] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- apache-sshd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index e096a3a..a762aa4 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -18,7 +18,7 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd # Avoid optional dep on tomcat native APR library Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache:apache:pom:) @@ -102,6 +102,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-6 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 1:2.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7d331bbfc695a430f36ed29a212394444e515a0a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:04:47 +0200 Subject: [PATCH 6/9] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- apache-sshd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index a762aa4..2d0767e 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.11.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -18,7 +18,7 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd # Avoid optional dep on tomcat native APR library Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local-openjdk21 BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache:apache:pom:) @@ -102,6 +102,9 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-7 +- Rrevert to jdk21 + * Tue Jul 29 2025 jiri vanek - 1:2.11.0-6 - Rebuilt for java-25-openjdk as preffered jdk From 7959d325a441ae1f8aa0aaabf91eec64e06b983b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 7 Jan 2026 12:56:21 +0100 Subject: [PATCH 7/9] Bumped to 2.16 --- ...al-dependency-on-native-tomcat-APR-libra.patch | 2 +- apache-sshd.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) 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 57ade97..81efaf7 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 8716930..0a2496b 100644 +++ b/pom.xml @@ -417,11 +417,6 @@ mina-core - 2.0.23 + 2.0.27 - - tomcat diff --git a/apache-sshd.spec b/apache-sshd.spec index 2d0767e..087d969 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -3,8 +3,8 @@ Epoch: 1 Name: apache-sshd -Version: 2.11.0 -Release: 7%{?dist} +Version: 2.16.0 +Release: 1%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -18,7 +18,7 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd # Avoid optional dep on tomcat native APR library Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch -BuildRequires: maven-local-openjdk21 +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache:apache:pom:) @@ -27,7 +27,6 @@ BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) BuildRequires: mvn(org.bouncycastle:bcpg-jdk%{bouncycastleJdk}on) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk%{bouncycastleJdk}on) @@ -54,7 +53,7 @@ This package provides %{name}. # Avoid optional dep on tomcat native APR library %patch -P0 -p1 -rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix +rm -rv sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom @@ -70,18 +69,18 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %pom_disable_module sshd-spring-sftp %pom_disable_module sshd-cli %pom_disable_module sshd-openpgp +%pom_disable_module sshd-benchmarks # Disable plugins we don't need for RPM builds %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :gmavenplus-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-pmd-plugin %pom_remove_plugin :maven-antrun-plugin -%pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :impsort-maven-plugin %pom_remove_plugin :formatter-maven-plugin . sshd-core - +%pom_remove_plugin :maven-remote-resources-plugin +%pom_remove_plugin :maven-shade-plugin sshd-benchmarks # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . diff --git a/sources b/sources index 115baf1..83edcb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-sshd-2.11.0-src.tar.gz) = f396fa8502bc254a0cbbf172f650726db0e80d30a4532ac1fa4b9c8ee32bed1c18db4c491ae2959f59a078dde7e194f5807d290687a6126555e9a945af37f1dd +SHA512 (apache-sshd-2.16.0-src.tar.gz) = e6c3f286330bee83aeeb2d440f56872080fcc99448e9de7c4298b2cfd0a6fcc25fa40a17aa2064564b641db9d1e47709f21984ca619552b34c5863155129a3c7 From 88614090dddf05f25fe89cae45c8fbdafe8e117d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 7 Jan 2026 15:44:01 +0100 Subject: [PATCH 8/9] BUmped bouncy castle pom version, although it seems it have no effect --- apache-sshd.spec | 189 +---------------------------------------------- 1 file changed, 3 insertions(+), 186 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 087d969..271136d 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,10 +1,10 @@ %global bouncycastleJdk 18 -%global bouncycastleVer 1.77 +%global bouncycastleVer 1.83 Epoch: 1 Name: apache-sshd Version: 2.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -101,187 +101,4 @@ sed "s;.*;%{bouncycastleVer} - 1:2.11.0-7 -- Rrevert to jdk21 - -* Tue Jul 29 2025 jiri vanek - 1:2.11.0-6 -- Rebuilt for java-25-openjdk as preffered jdk - -* Wed Jul 23 2025 Fedora Release Engineering - 1:2.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1:2.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 07 2024 Miroslav Suchý - 1:2.11.0-3 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1:2.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1:2.11.0-1 -- Rebuilt for java-21-openjdk as system jdk -- updated to 2.11 - -* Mon Jan 22 2024 Fedora Release Engineering - 1:2.8.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1:2.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1:2.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1:2.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1:2.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1:2.8.0-2 -- Rebuilt for Drop i686 JDKs - -* Fri Apr 01 2022 Mat Booth - 1:2.8.0-1 -- Update to latest upstream release - -* Sat Feb 05 2022 Jiri Vanek - 1:2.6.0-5 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1:2.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1:2.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Apr 20 2021 Jeff Johnston 1:2.6.0-2 -- Fix missing imports in MANIFEST.MF files - -* Wed Mar 10 2021 Mat Booth - 1:2.6.0-1 -- Update to latest upstream release - -* Tue Jan 26 2021 Fedora Release Engineering - 1:2.4.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1:2.4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1:2.4.0-4 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jul 09 2020 Mat Booth - 1:2.4.0-3 -- Build against any JDK - -* Wed Jun 24 2020 Alexander Kurtakov 1:2.4.0-2 -- Fix build against Java 11. - -* Mon Jun 22 2020 Mat Booth - 1:2.4.0-1 -- Update to latest upstream release - -* Tue Jan 28 2020 Fedora Release Engineering - 1:2.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 02 2019 Mat Booth - 1:2.2.0-3 -- Include release notes in %%doc section - -* Mon Jul 01 2019 Mat Booth - 1:2.2.0-2 -- Fix license tag to include ISC for bcrypt implementation - -* Fri May 31 2019 Mat Booth - 1:2.2.0-1 -- Update to latest upstream release - -* Fri Mar 15 2019 Mat Booth - 1:2.0.0-4 -- Revert back to 2.0.0, there are problems with 2.2.0 - -* Thu Mar 07 2019 Mat Booth - 2.2.0-1 -- Update to latest upstream release - -* Thu Jan 31 2019 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 08 2019 Mat Booth - 2.1.0-2 -- Disable uses directive generation - -* Thu Nov 29 2018 Mat Booth - 2.1.0-1 -- Update to latest upstream release -- Patch out the dependency on tomcat-libs - -* Thu Jul 12 2018 Fedora Release Engineering - 0.14.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.14.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.14.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.14.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 12 2016 gil cattaneo 0.14.0-4 -- fix FTBFS - -* Mon Jun 20 2016 gil cattaneo 0.14.0-3 -- add missing build requires - -* Wed Feb 03 2016 Fedora Release Engineering - 0.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jul 01 2015 Michal Srb - 0.14.0-1 -- Update to upstream release 0.14.0 -- Do not build sshd-git (not needed) - -* Wed Jun 17 2015 Fedora Release Engineering - 0.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 09 2015 Michal Srb - 0.11.0-4 -- AutoReqProv: yes -- Build against tomcat-jni -- Build only sshd-core - -* Fri Feb 13 2015 gil cattaneo 0.11.0-3 -- introduce license macro - -* Sat Jun 07 2014 Fedora Release Engineering - 0.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 05 2014 gil cattaneo - 0.11.0-1 -- Update to upstream 0.11.0 (rhbz#1094049) - -* Wed Nov 27 2013 Juan Hernandez - 0.9.0-3 -- Revert to upstream version 0.8.0 due to bug 1021273. Note that the - version number can't go backwards, so it stays at 0.9.0. - -* Mon Sep 30 2013 Juan Hernandez - 0.9.0-2 -- Fix bouncycastle requirement - -* Mon Sep 30 2013 Juan Hernandez - 0.9.0-1 -- Update to upstream 0.9.0 - -* Mon Aug 05 2013 gil cattaneo 0.7.0-5 -- rebuilt rhbz#991979 -- swith to Xmvn -- adapt to new guideline -- use pom macros -- remove rpmlint warnings - -* Sat Aug 03 2013 Fedora Release Engineering - 0.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0.7.0-2 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Jul 26 2012 Juan Hernandez - 0.7.0-1 -- Update to upstream 0.7.0 - -* Wed Jul 18 2012 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 14 2012 Juan Hernandez 0.6.0-2 -- Corrected the source URL - -* Sun Feb 12 2012 Juan Hernandez 0.6.0-1 -- Initial packaging +%autochangelog From e64ee38527ac33ed9753b9e7cd9de9bfe86e0b72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:48:31 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 271136d..0b69eea 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -4,7 +4,7 @@ Epoch: 1 Name: apache-sshd Version: 2.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -101,4 +101,7 @@ sed "s;.*;%{bouncycastleVer} - 1:2.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + %autochangelog