From 9ad06d9aa0e172b78ceec7b44ece0e37a7fd98a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:48:30 +0000 Subject: [PATCH 01/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 321fc3e..71a5e5e 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -91,6 +91,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 02bd413ff5bbddc39614f3f7dfb85e83add2c141 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 22 Jun 2020 03:02:06 +0100 Subject: [PATCH 02/31] Update to latest upstream release --- ...nal-dependency-on-native-tomcat-APR-libra.patch | 14 ++++++-------- apache-sshd.spec | 7 +++++-- sources | 2 +- 3 files changed, 12 insertions(+), 11 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 6006344..45d0fa2 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 @@ mina-core - 2.0.19 + 2.0.21 - - tomcat @@ -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 @@ ${project.version} @@ -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> getChannelForwardingFactories(FactoryManager manager) { + public List 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 -- 2.20.1 - - diff --git a/apache-sshd.spec b/apache-sshd.spec index 71a5e5e..0ab27e3 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -91,6 +91,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 diff --git a/sources b/sources index daeed3c..dfeec73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-sshd-2.2.0-src.tar.gz) = f2feee18bec9efb4b5a8bf104a3478318db1394362b595363275dcbdaf2e5aa63bca94188ce037582730db53a80a065fa132b74b5f8f825edaf556f405177da0 +SHA512 (apache-sshd-2.4.0-src.tar.gz) = 32c29bde91ded3ecc5cfd4f5859178c3f0dafd7080cd978a5c045e15fe254147455213c6a6f3c39dce87a0f20fd1848f76f57a150624fdb5fe4f26346915e345 From 8472a61e914a774fa70dca1c281d98613ac055f2 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 24 Jun 2020 23:58:07 +0300 Subject: [PATCH 03/31] Fix build against Java 11. --- apache-sshd.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 0ab27e3..6d28109 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -15,6 +15,7 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch BuildRequires: maven-local +BuildRequires: java-11-openjdk-devel BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache.ant:ant) @@ -71,12 +72,21 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %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 # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . +# Fix javadoc generation on java 11 +%pom_xpath_inject pom:pluginManagement/pom:plugins " +maven-javadoc-plugin +1.8 +" + + %build +export JAVA_HOME=/usr/lib/jvm/java-11 # Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2 %mvn_build -f -- -Dworkspace.root.dir=$(pwd) @@ -91,6 +101,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 8a05a96e2ece2f93912e20ac7bca9d555e1def0a Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 9 Jul 2020 13:57:28 +0100 Subject: [PATCH 04/31] Build against any JDK --- apache-sshd.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 6d28109..aa731eb 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -15,7 +15,6 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch BuildRequires: maven-local -BuildRequires: java-11-openjdk-devel BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache.ant:ant) @@ -78,17 +77,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . -# Fix javadoc generation on java 11 -%pom_xpath_inject pom:pluginManagement/pom:plugins " -maven-javadoc-plugin -1.8 -" - - %build -export JAVA_HOME=/usr/lib/jvm/java-11 # Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2 -%mvn_build -f -- -Dworkspace.root.dir=$(pwd) +%mvn_build -f -- -Dworkspace.root.dir=$(pwd) -Dsource=1.8 %install %mvn_install @@ -101,6 +92,9 @@ export JAVA_HOME=/usr/lib/jvm/java-11 %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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. From a42144130c2dee9191709d622c43fbe16cbb5760 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 16:05:59 +0200 Subject: [PATCH 05/31] Rebuilt for JDK-11 --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index aa731eb..a0fe88e 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -92,6 +92,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 3d2f73153a16b09989c3cd30dc6fea62be782c4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:13:20 +0000 Subject: [PATCH 06/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index a0fe88e..a0ac338 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -92,6 +92,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 0a1eec0e17b483a3d27c99f0f2e4d024e5bd415b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:16:40 +0000 Subject: [PATCH 07/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index a0ac338..6f4a4f7 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -92,6 +92,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 829fac761f37fa85146c90470d127b1b7f8a273a Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 10 Mar 2021 20:41:36 +0000 Subject: [PATCH 08/31] Update to latest upstream release --- ...ependency-on-native-tomcat-APR-libra.patch | 29 ++++++++++--------- apache-sshd.spec | 12 ++++++-- sources | 2 +- 3 files changed, 25 insertions(+), 18 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 45d0fa2..77fa97c 100644 --- a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch +++ b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch @@ -1,6 +1,6 @@ -From accd3e006a05615cf6eed9369d91fbedcc4eab16 Mon Sep 17 00:00:00 2001 +From c8838c5839e04aae964505e56ccea524f577c862 Mon Sep 17 00:00:00 2001 From: Mat Booth -Date: Thu, 7 Mar 2019 11:27:55 +0000 +Date: Wed, 10 Mar 2021 20:26:12 +0000 Subject: [PATCH] Avoid optional dependency on native tomcat APR library --- @@ -11,10 +11,10 @@ Subject: [PATCH] Avoid optional dependency on native tomcat APR library 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml -index 867ca88..7c29678 100644 +index 8716930..0a2496b 100644 --- a/pom.xml +++ b/pom.xml -@@ -397,11 +397,6 @@ +@@ -404,11 +404,6 @@ mina-core 2.0.21 @@ -27,7 +27,7 @@ index 867ca88..7c29678 100644 net.i2p.crypto diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml -index 6171c5c..73a43a7 100644 +index 5fc72b2..b06c00b 100644 --- a/sshd-core/pom.xml +++ b/sshd-core/pom.xml @@ -42,12 +42,6 @@ @@ -44,7 +44,7 @@ index 6171c5c..73a43a7 100644 org.bouncycastle bcpg-jdk15on diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java -index ab19539..5757e68 100644 +index ffde9af..ee5b9c8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java @@ -27,8 +27,6 @@ import java.util.concurrent.atomic.AtomicBoolean; @@ -55,23 +55,23 @@ index ab19539..5757e68 100644 -import org.apache.sshd.agent.unix.UnixAgentFactory; import org.apache.sshd.common.FactoryManager; import org.apache.sshd.common.PropertyResolver; - import org.apache.sshd.common.PropertyResolverUtils; -@@ -52,9 +50,7 @@ public class ProxyAgentFactory implements SshAgentFactory { + import org.apache.sshd.common.channel.ChannelFactory; +@@ -51,9 +49,7 @@ public class ProxyAgentFactory implements SshAgentFactory { @Override public List getChannelForwardingFactories(FactoryManager manager) { - return isPreferredUnixAgent(manager) -- ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS -- : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; +- ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS +- : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; + return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; } @Override -@@ -105,16 +101,6 @@ public class ProxyAgentFactory implements SshAgentFactory { +@@ -104,16 +100,6 @@ public class ProxyAgentFactory implements SshAgentFactory { } public static boolean isPreferredUnixAgent(PropertyResolver resolver) { -- if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) { +- if (CoreModuleProperties.PREFER_UNIX_AGENT.getRequired(resolver)) { - try { - if (AprLibrary.getInstance() != null) { - return true; @@ -85,7 +85,7 @@ index ab19539..5757e68 100644 } } diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml -index 5395ceb..f456263 100644 +index cc37015..bf3c0c3 100644 --- a/sshd-osgi/pom.xml +++ b/sshd-osgi/pom.xml @@ -68,12 +68,6 @@ @@ -102,4 +102,5 @@ index 5395ceb..f456263 100644 -- -2.20.1 +2.28.0 + diff --git a/apache-sshd.spec b/apache-sshd.spec index 6f4a4f7..f850b41 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd -Version: 2.4.0 -Release: 6%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -53,6 +53,7 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom +%pom_remove_dep :testcontainers-bom sshd-sftp # Build the core modules only %pom_disable_module assembly @@ -67,12 +68,14 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Disable plugins we don't need for RPM builds %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :groovy-maven-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 # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . @@ -92,6 +95,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 diff --git a/sources b/sources index dfeec73..63e6e7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-sshd-2.4.0-src.tar.gz) = 32c29bde91ded3ecc5cfd4f5859178c3f0dafd7080cd978a5c045e15fe254147455213c6a6f3c39dce87a0f20fd1848f76f57a150624fdb5fe4f26346915e345 +SHA512 (apache-sshd-2.6.0-src.tar.gz) = c970237bbb95e338333f482e96b70a3fb7cade0d6e97bafc94a19399f910b6a967421cd3e166ede0e93801afbc158d4015250a179333bcc6c365510a48f478b3 From fa3eb1de9cd25060caece197f304b9414ff13d60 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 21 Apr 2021 13:38:58 +0300 Subject: [PATCH 09/31] Fix missing imports in MANIFEST.MF files --- 0002-Fix-manifest-generation.patch | 11 +++++++++++ apache-sshd.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 0002-Fix-manifest-generation.patch diff --git a/0002-Fix-manifest-generation.patch b/0002-Fix-manifest-generation.patch new file mode 100644 index 0000000..68ae17f --- /dev/null +++ b/0002-Fix-manifest-generation.patch @@ -0,0 +1,11 @@ +diff -up ./pom.xml.fix ./pom.xml +--- ./pom.xml.fix 2021-04-20 21:32:51.749782800 -0400 ++++ ./pom.xml 2021-04-20 21:33:22.600740917 -0400 +@@ -1358,7 +1358,6 @@ + + + +- org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))" + *;-noimport:=true + + pom diff --git a/apache-sshd.spec b/apache-sshd.spec index f850b41..a666b9b 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -14,6 +14,9 @@ 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 +# Fix error when generating MANIFEST.MF files and not adding imports +Patch1: 0002-Fix-manifest-generation.patch + BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) @@ -49,6 +52,7 @@ This package provides %{name}. # Avoid optional dep on tomcat native APR library %patch0 -p1 +%patch1 -p1 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework @@ -95,6 +99,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From e0107831121aa6d7bfc279e0571e8d3e7eedbed1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:48:48 +0000 Subject: [PATCH 10/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From fbf2bd7c143edbe23a39fe5b29440e4457c3a6dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:44:51 +0000 Subject: [PATCH 11/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index a666b9b..8e55337 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -99,6 +99,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 8c9339da11effb3bafa87de923997b500ad63f14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:26:48 +0000 Subject: [PATCH 12/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 8e55337..4304437 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -99,6 +99,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 9198fab63384367d7599038f36b00326557ea9eb Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:34:13 +0100 Subject: [PATCH 13/31] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 4304437..b4cfe2a 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -99,6 +99,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 18ded72d9d461cfb6473ea07eeace5c469f375eb Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 1 Apr 2022 18:36:52 +0100 Subject: [PATCH 14/31] Update to latest upstream release --- ...-dependency-on-native-tomcat-APR-libra.patch | 2 +- 0002-Fix-manifest-generation.patch | 11 ----------- apache-sshd.spec | 17 ++++++++--------- sources | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 0002-Fix-manifest-generation.patch 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 77fa97c..9a79283 100644 --- a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch +++ b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch @@ -14,7 +14,7 @@ diff --git a/pom.xml b/pom.xml index 8716930..0a2496b 100644 --- a/pom.xml +++ b/pom.xml -@@ -404,11 +404,6 @@ +@@ -417,11 +417,6 @@ mina-core 2.0.21 diff --git a/0002-Fix-manifest-generation.patch b/0002-Fix-manifest-generation.patch deleted file mode 100644 index 68ae17f..0000000 --- a/0002-Fix-manifest-generation.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./pom.xml.fix ./pom.xml ---- ./pom.xml.fix 2021-04-20 21:32:51.749782800 -0400 -+++ ./pom.xml 2021-04-20 21:33:22.600740917 -0400 -@@ -1358,7 +1358,6 @@ - - - -- org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))" - *;-noimport:=true - - pom diff --git a/apache-sshd.spec b/apache-sshd.spec index b4cfe2a..4eb5610 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd -Version: 2.6.0 -Release: 5%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -14,13 +14,9 @@ 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 -# Fix error when generating MANIFEST.MF files and not adding imports -Patch1: 0002-Fix-manifest-generation.patch - BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) -BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-archiver) @@ -33,6 +29,7 @@ BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch @@ -52,12 +49,11 @@ This package provides %{name}. # Avoid optional dep on tomcat native APR library %patch0 -p1 -%patch1 -p1 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom -%pom_remove_dep :testcontainers-bom sshd-sftp +%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core # Build the core modules only %pom_disable_module assembly @@ -86,7 +82,7 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %build # Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2 -%mvn_build -f -- -Dworkspace.root.dir=$(pwd) -Dsource=1.8 +%mvn_build -f -- -Dworkspace.root.dir=$(pwd) %install %mvn_install @@ -99,6 +95,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 diff --git a/sources b/sources index 63e6e7c..9cdb7ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-sshd-2.6.0-src.tar.gz) = c970237bbb95e338333f482e96b70a3fb7cade0d6e97bafc94a19399f910b6a967421cd3e166ede0e93801afbc158d4015250a179333bcc6c365510a48f478b3 +SHA512 (apache-sshd-2.8.0-src.tar.gz) = 7af622d43dd5b908c307cb5c2cfe64a0a8d7ef29c2dfe71581cc11688547b8bd31dc9732ee065b14a45bd2a2b6bfa75fc904155ca5409b8ff58f7a1544f720f6 From 24dba5094204132e918a117d4e056f8ed8ea87a2 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:32:19 +0200 Subject: [PATCH 15/31] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-sshd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 4eb5610..06f4157 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -33,6 +33,7 @@ BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch +ExclusiveArch: %{java_arches} noarch %description Apache SSHD is a 100% pure java library to support the SSH protocols on both @@ -95,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From e1de1b03d5740fdbef9b9c9038b7fbce48436678 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:01:57 +0000 Subject: [PATCH 16/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 06f4157..5855e28 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 391c2936347039869467b0feb432bfb19757fc90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:56:28 +0000 Subject: [PATCH 17/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 5855e28..ce93a94 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 696d24333004ff8a73bac0d73f76faf56cd93371 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:31:40 +0000 Subject: [PATCH 18/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index ce93a94..e6774c3 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 1636b1d79e876d7a246813aaac03f4e5beb9e934 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:17:59 +0000 Subject: [PATCH 19/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index e6774c3..64d8baa 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 353af9ed5103e94a835571d354d7cf4681b605a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:16:12 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 64d8baa..6dcfd52 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* 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 From 8eff37414cf8c8b6d9a0e6f437436cf1e55cccbb Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:52:34 +0100 Subject: [PATCH 21/31] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-sshd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 6dcfd52..d06b7bb 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -96,6 +96,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:2.8.0-8 +- Rebuilt for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1:2.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b7467374c079392953f120a9f632e28d52c043c2 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 13 Mar 2024 20:37:20 +0100 Subject: [PATCH 22/31] updated to 2.11 --- ...ependency-on-native-tomcat-APR-libra.patch | 4 ++-- apache-sshd.spec | 20 ++++++++++++------- sources | 2 +- 3 files changed, 16 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 9a79283..57ade97 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.21 + 2.0.23 - - tomcat @@ -42,7 +42,7 @@ index 5fc72b2..b06c00b 100644 - org.bouncycastle - bcpg-jdk15on + bcpg-jdk18on diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java index ffde9af..ee5b9c8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java diff --git a/apache-sshd.spec b/apache-sshd.spec index d06b7bb..2c0f7a5 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,10 @@ +%global bouncycastleJdk 18 +%global bouncycastleVer 1.77 + Epoch: 1 Name: apache-sshd -Version: 2.8.0 -Release: 8%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -25,8 +28,8 @@ 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-jdk15on) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) +BuildRequires: mvn(org.bouncycastle:bcpg-jdk%{bouncycastleJdk}on) +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk%{bouncycastleJdk}on) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) @@ -49,12 +52,12 @@ This package provides %{name}. %setup -q # Avoid optional dep on tomcat native APR library -%patch0 -p1 +%patch -P0 -p1 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom -%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core +%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core sshd-scp # Build the core modules only %pom_disable_module assembly @@ -78,8 +81,10 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %pom_remove_plugin :impsort-maven-plugin %pom_remove_plugin :formatter-maven-plugin . sshd-core + # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . +sed "s;.*;%{bouncycastleVer};g" -i pom.xml %build # Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2 @@ -96,8 +101,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog -* Tue Feb 27 2024 Jiri Vanek - 1:2.8.0-8 +* 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 diff --git a/sources b/sources index 9cdb7ba..115baf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-sshd-2.8.0-src.tar.gz) = 7af622d43dd5b908c307cb5c2cfe64a0a8d7ef29c2dfe71581cc11688547b8bd31dc9732ee065b14a45bd2a2b6bfa75fc904155ca5409b8ff58f7a1544f720f6 +SHA512 (apache-sshd-2.11.0-src.tar.gz) = f396fa8502bc254a0cbbf172f650726db0e80d30a4532ac1fa4b9c8ee32bed1c18db4c491ae2959f59a078dde7e194f5807d290687a6126555e9a945af37f1dd From 3c1d19ffce0b0de2898c6a45123efb407367fef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:13:50 +0000 Subject: [PATCH 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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