forked from pool/apache-sshd
Accepting request 817688 from home:fstrba:maven:test
new package OBS-URL: https://build.opensuse.org/request/show/817688 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=1
This commit is contained in:
Fridrich Strba
Git OBS Bridge
commit
9afbac4563
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
107
0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
Normal file
107
0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
Normal file
@ -0,0 +1,107 @@
|
||||
From accd3e006a05615cf6eed9369d91fbedcc4eab16 Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mat.booth@redhat.com>
|
||||
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 @@
|
||||
<artifactId>mina-core</artifactId>
|
||||
<version>2.0.19</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>tomcat</groupId>
|
||||
- <artifactId>tomcat-apr</artifactId>
|
||||
- <version>5.5.23</version>
|
||||
- </dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.i2p.crypto</groupId>
|
||||
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 @@
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
- <dependency>
|
||||
- <groupId>tomcat</groupId>
|
||||
- <artifactId>tomcat-apr</artifactId>
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
-
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<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 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<NamedFactory<Channel>> 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 @@
|
||||
<optional>true</optional>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>tomcat</groupId>
|
||||
- <artifactId>tomcat-apr</artifactId>
|
||||
- <optional>true</optional>
|
||||
- <scope>provided</scope>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
3
apache-sshd-2.2.0-src.tar.gz
Normal file
3
apache-sshd-2.2.0-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c092fe6eb3e568cdfad9695596e076362f3e6ed4990b85a225367590027d10c9
|
||||
size 1280311
|
||||
4
apache-sshd.changes
Normal file
4
apache-sshd.changes
Normal file
@ -0,0 +1,4 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 29 11:32:37 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Initial packaging of apache-sshd 2.2.0
|
||||
108
apache-sshd.spec
Normal file
108
apache-sshd.spec
Normal file
@ -0,0 +1,108 @@
|
||||
#
|
||||
# spec file for package apache-sshd
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: apache-sshd
|
||||
Version: 2.2.0
|
||||
Release: 0
|
||||
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: Apache-2.0 AND ISC
|
||||
URL: https://mina.apache.org/sshd-project
|
||||
Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz
|
||||
# Avoid optional dep on tomcat native APR library
|
||||
Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(net.i2p.crypto:eddsa)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-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.apache.maven:maven-archiver)
|
||||
BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
|
||||
BuildRequires: mvn(org.apache:apache:pom:)
|
||||
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</_nouses>" .
|
||||
|
||||
%pom_remove_plugin :maven-antrun-plugin sshd-osgi
|
||||
|
||||
%build
|
||||
# Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2
|
||||
%{mvn_build} -f -- -Dworkspace.root.dir=$(pwd) -Dsource=8
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles
|
||||
%doc CHANGES.md
|
||||
%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
|
||||
Loading…
Reference in New Issue
Block a user