From a39ddae9cd43c4306011340695bf916a58f99626 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Dec 02 2019 09:01:03 +0000 Subject: Revert "Orphaned for 6+ weeks" This reverts commit b94f9304605f0f673512525678929a352adb2e6a. Unretirement request: https://pagure.io/releng/issue/9066 Signed-off-by: Tomas Hrcka --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..153c126 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/apache-sshd-*-src.tar.gz +/*.src.rpm diff --git a/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch new file mode 100644 index 0000000..6006344 --- /dev/null +++ b/0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch @@ -0,0 +1,107 @@ +From accd3e006a05615cf6eed9369d91fbedcc4eab16 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 7 Mar 2019 11:27:55 +0000 +Subject: [PATCH] Avoid optional dependency on native tomcat APR library + +--- + pom.xml | 5 ----- + sshd-core/pom.xml | 6 ------ + .../sshd/agent/local/ProxyAgentFactory.java | 16 +--------------- + sshd-osgi/pom.xml | 6 ------ + 4 files changed, 1 insertion(+), 32 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 867ca88..7c29678 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -397,11 +397,6 @@ + mina-core + 2.0.19 + +- +- tomcat +- tomcat-apr +- 5.5.23 +- + + + net.i2p.crypto +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 @@ + ${project.version} + + +- +- tomcat +- tomcat-apr +- true +- +- + + 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 +--- 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; + import org.apache.sshd.agent.SshAgent; + import org.apache.sshd.agent.SshAgentFactory; + import org.apache.sshd.agent.SshAgentServer; +-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 { + + @Override + public List> getChannelForwardingFactories(FactoryManager manager) { +- return isPreferredUnixAgent(manager) +- ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS +- : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; ++ return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; + } + + @Override +@@ -106,16 +102,6 @@ public class ProxyAgentFactory implements SshAgentFactory { + } + + public static boolean isPreferredUnixAgent(PropertyResolver resolver) { +- if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) { +- try { +- if (AprLibrary.getInstance() != null) { +- return true; +- } +- } catch (Exception ignore) { +- // ignored +- } +- } +- + return false; + } + } +diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml +index 5395ceb..f456263 100644 +--- a/sshd-osgi/pom.xml ++++ b/sshd-osgi/pom.xml +@@ -68,12 +68,6 @@ + true + provided + +- +- tomcat +- tomcat-apr +- true +- provided +- + + + +-- +2.20.1 + + diff --git a/apache-sshd.spec b/apache-sshd.spec new file mode 100644 index 0000000..60515b2 --- /dev/null +++ b/apache-sshd.spec @@ -0,0 +1,193 @@ +Epoch: 1 +Name: apache-sshd +Version: 2.2.0 +Release: 2%{?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 +URL: http://mina.apache.org/sshd-project + +Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz + +Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.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) +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-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:slf4j-api) + +BuildArch: noarch + +%description +Apache SSHD is a 100% pure java library to support the SSH protocols on both +the client and server side. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{name}. + +%prep +%setup -q + +# Avoid optional dep on tomcat native APR library +%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 + +# Build the core modules only +%pom_disable_module assembly +%pom_disable_module sshd-mina +%pom_disable_module sshd-netty +%pom_disable_module sshd-ldap +%pom_disable_module sshd-git +%pom_disable_module sshd-contrib +%pom_disable_module sshd-spring-sftp +%pom_disable_module sshd-cli +%pom_disable_module sshd-openpgp + +# 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 :animal-sniffer-maven-plugin + +# Suppress generation of uses clauses +%pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . + +%build +# tests require ch.ethz.ganymed:ganymed-ssh2 +%mvn_build -f -- -Dworkspace.root.dir=$(pwd) + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt + +%changelog +* 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 diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..daeed3c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (apache-sshd-2.2.0-src.tar.gz) = f2feee18bec9efb4b5a8bf104a3478318db1394362b595363275dcbdaf2e5aa63bca94188ce037582730db53a80a065fa132b74b5f8f825edaf556f405177da0