Compare commits
No commits in common. "rawhide" and "eclipse" have entirely different histories.
3 changed files with 135 additions and 43 deletions
|
|
@ -1,6 +1,6 @@
|
|||
From c8838c5839e04aae964505e56ccea524f577c862 Mon Sep 17 00:00:00 2001
|
||||
From accd3e006a05615cf6eed9369d91fbedcc4eab16 Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Wed, 10 Mar 2021 20:26:12 +0000
|
||||
Date: Thu, 7 Mar 2019 11:27:55 +0000
|
||||
Subject: [PATCH] Avoid optional dependency on native tomcat APR library
|
||||
|
||||
---
|
||||
|
|
@ -11,12 +11,12 @@ 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 8716930..0a2496b 100644
|
||||
index 867ca88..7c29678 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -417,11 +417,6 @@
|
||||
@@ -397,11 +397,6 @@
|
||||
<artifactId>mina-core</artifactId>
|
||||
<version>2.0.27</version>
|
||||
<version>2.0.19</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>tomcat</groupId>
|
||||
|
|
@ -27,10 +27,10 @@ index 8716930..0a2496b 100644
|
|||
<dependency>
|
||||
<groupId>net.i2p.crypto</groupId>
|
||||
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
|
||||
index 5fc72b2..b06c00b 100644
|
||||
index 6171c5c..73a43a7 100644
|
||||
--- a/sshd-core/pom.xml
|
||||
+++ b/sshd-core/pom.xml
|
||||
@@ -42,12 +42,6 @@
|
||||
@@ -44,12 +44,6 @@
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -42,9 +42,9 @@ index 5fc72b2..b06c00b 100644
|
|||
-
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpg-jdk18on</artifactId>
|
||||
<artifactId>bcpg-jdk15on</artifactId>
|
||||
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
|
||||
index ab19539..5757e68 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;
|
||||
|
|
@ -54,24 +54,24 @@ index ffde9af..ee5b9c8 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;
|
||||
import org.apache.sshd.common.channel.ChannelFactory;
|
||||
@@ -51,9 +49,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
|
||||
@@ -53,9 +51,7 @@ public class ProxyAgentFactory implements SshAgentFactory {
|
||||
|
||||
@Override
|
||||
public List<ChannelFactory> getChannelForwardingFactories(FactoryManager manager) {
|
||||
public List<NamedFactory<Channel>> 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
|
||||
@@ -104,16 +100,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
|
||||
@@ -106,16 +102,6 @@ public class ProxyAgentFactory implements SshAgentFactory {
|
||||
}
|
||||
|
||||
public static boolean isPreferredUnixAgent(PropertyResolver resolver) {
|
||||
- if (CoreModuleProperties.PREFER_UNIX_AGENT.getRequired(resolver)) {
|
||||
- if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) {
|
||||
- try {
|
||||
- if (AprLibrary.getInstance() != null) {
|
||||
- return true;
|
||||
|
|
@ -85,7 +85,7 @@ index ffde9af..ee5b9c8 100644
|
|||
}
|
||||
}
|
||||
diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml
|
||||
index cc37015..bf3c0c3 100644
|
||||
index 5395ceb..f456263 100644
|
||||
--- a/sshd-osgi/pom.xml
|
||||
+++ b/sshd-osgi/pom.xml
|
||||
@@ -68,12 +68,6 @@
|
||||
|
|
@ -102,5 +102,6 @@ index cc37015..bf3c0c3 100644
|
|||
|
||||
<build>
|
||||
--
|
||||
2.28.0
|
||||
2.20.1
|
||||
|
||||
|
||||
|
|
|
|||
139
apache-sshd.spec
139
apache-sshd.spec
|
|
@ -1,16 +1,12 @@
|
|||
%global bouncycastleJdk 18
|
||||
%global bouncycastleVer 1.83
|
||||
|
||||
Epoch: 1
|
||||
Name: apache-sshd
|
||||
Version: 2.16.0
|
||||
Version: 2.2.0
|
||||
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
|
||||
# Automatically converted from old format: ASL 2.0 and ISC - review is highly recommended.
|
||||
License: Apache-2.0 AND ISC
|
||||
License: ASL 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
|
||||
|
|
@ -18,25 +14,25 @@ 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
|
||||
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)
|
||||
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)
|
||||
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
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
%description
|
||||
Apache SSHD is a 100% pure java library to support the SSH protocols on both
|
||||
|
|
@ -52,12 +48,11 @@ This package provides %{name}.
|
|||
%setup -q
|
||||
|
||||
# Avoid optional dep on tomcat native APR library
|
||||
%patch -P0 -p1
|
||||
rm -rv sshd-core/src/main/java/org/apache/sshd/agent/unix
|
||||
%patch0 -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 sshd-scp
|
||||
|
||||
# Build the core modules only
|
||||
%pom_disable_module assembly
|
||||
|
|
@ -69,22 +64,17 @@ rm -rv 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 :groovy-maven-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 :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
|
||||
%pom_remove_plugin :animal-sniffer-maven-plugin
|
||||
|
||||
# Suppress generation of uses clauses
|
||||
%pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true</_nouses>" .
|
||||
sed "s;<bouncycastle.version>.*;<bouncycastle.version>%{bouncycastleVer}</bouncycastle.version>;g" -i pom.xml
|
||||
|
||||
%build
|
||||
# Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2
|
||||
|
|
@ -101,7 +91,108 @@ sed "s;<bouncycastle.version>.*;<bouncycastle.version>%{bouncycastleVer}</bouncy
|
|||
%license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.16.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
* Mon Dec 02 2019 Mat Booth <mat.booth@redhat.com> - 1:2.2.0-3
|
||||
- Include release notes in %%doc section
|
||||
|
||||
%autochangelog
|
||||
* Mon Jul 01 2019 Mat Booth <mat.booth@redhat.com> - 1:2.2.0-2
|
||||
- Fix license tag to include ISC for bcrypt implementation
|
||||
|
||||
* Fri May 31 2019 Mat Booth <mat.booth@redhat.com> - 1:2.2.0-1
|
||||
- Update to latest upstream release
|
||||
|
||||
* Fri Mar 15 2019 Mat Booth <mat.booth@redhat.com> - 1:2.0.0-4
|
||||
- Revert back to 2.0.0, there are problems with 2.2.0
|
||||
|
||||
* Thu Mar 07 2019 Mat Booth <mat.booth@redhat.com> - 2.2.0-1
|
||||
- Update to latest upstream release
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 08 2019 Mat Booth <mat.booth@redhat.com> - 2.1.0-2
|
||||
- Disable uses directive generation
|
||||
|
||||
* Thu Nov 29 2018 Mat Booth <mat.booth@redhat.com> - 2.1.0-1
|
||||
- Update to latest upstream release
|
||||
- Patch out the dependency on tomcat-libs
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Dec 12 2016 gil cattaneo <puntogil@libero.it> 0.14.0-4
|
||||
- fix FTBFS
|
||||
|
||||
* Mon Jun 20 2016 gil cattaneo <puntogil@libero.it> 0.14.0-3
|
||||
- add missing build requires
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jul 01 2015 Michal Srb <msrb@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.11.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jun 09 2015 Michal Srb <msrb@redhat.com> - 0.11.0-4
|
||||
- AutoReqProv: yes
|
||||
- Build against tomcat-jni
|
||||
- Build only sshd-core
|
||||
|
||||
* Fri Feb 13 2015 gil cattaneo <puntogil@libero.it> 0.11.0-3
|
||||
- introduce license macro
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon May 05 2014 gil cattaneo <puntogil@libero.it> - 0.11.0-1
|
||||
- Update to upstream 0.11.0 (rhbz#1094049)
|
||||
|
||||
* Wed Nov 27 2013 Juan Hernandez <juan.hernandez@redhat.com> - 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 <juan.hernandez@redhat.com> - 0.9.0-2
|
||||
- Fix bouncycastle requirement
|
||||
|
||||
* Mon Sep 30 2013 Juan Hernandez <juan.hernandez@redhat.com> - 0.9.0-1
|
||||
- Update to upstream 0.9.0
|
||||
|
||||
* Mon Aug 05 2013 gil cattaneo <puntogil@libero.it> 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 <rel-eng@lists.fedoraproject.org> - 0.7.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <juan.hernandez@redhat.com> - 0.7.0-1
|
||||
- Update to upstream 0.7.0
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Feb 14 2012 Juan Hernandez <juan.hernandez@redhat.com> 0.6.0-2
|
||||
- Corrected the source URL
|
||||
|
||||
* Sun Feb 12 2012 Juan Hernandez <juan.hernandez@redhat.com> 0.6.0-1
|
||||
- Initial packaging
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (apache-sshd-2.16.0-src.tar.gz) = e6c3f286330bee83aeeb2d440f56872080fcc99448e9de7c4298b2cfd0a6fcc25fa40a17aa2064564b641db9d1e47709f21984ca619552b34c5863155129a3c7
|
||||
SHA512 (apache-sshd-2.2.0-src.tar.gz) = f2feee18bec9efb4b5a8bf104a3478318db1394362b595363275dcbdaf2e5aa63bca94188ce037582730db53a80a065fa132b74b5f8f825edaf556f405177da0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue