From cbe1c62d80ac7b6cccd9a3202bde27dab7ff8589 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jul 01 2015 12:53:14 +0000 Subject: Update to upstream release 0.14.0 - Do not build sshd-git (not needed) --- diff --git a/.gitignore b/.gitignore index 477d6d5..dde07f7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /apache-sshd-0.9.0-src.tar.gz /apache-sshd-0.8.0-src.tar.gz /apache-sshd-0.11.0-src.tar.gz +/apache-sshd-0.14.0-src.tar.gz diff --git a/apache-sshd-use-bouncycastle-for-jdk6.patch b/apache-sshd-use-bouncycastle-for-jdk6.patch deleted file mode 100644 index f6303b4..0000000 --- a/apache-sshd-use-bouncycastle-for-jdk6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 44568691d9501bd650fb9aa13087e06207ffd285 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Wed, 27 Nov 2013 14:36:01 +0100 -Subject: [PATCH] Use BouncyCastle for JDK 1.6 - ---- - pom.xml | 6 +++--- - sshd-core/pom.xml | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 1a48d78..18c1a7c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -100,9 +100,9 @@ - 1.1.1 - - -- bouncycastle -- bcprov-jdk15 -- 140 -+ org.bouncycastle -+ bcprov-jdk16 -+ 1.46 - - - org.slf4j -diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml -index 2b18420..3fbdde0 100644 ---- a/sshd-core/pom.xml -+++ b/sshd-core/pom.xml -@@ -54,8 +54,8 @@ - true - - -- bouncycastle -- bcprov-jdk15 -+ org.bouncycastle -+ bcprov-jdk16 - true - - --- -1.8.3.1 - diff --git a/apache-sshd-use-tomcat-coyote.patch b/apache-sshd-use-tomcat-coyote.patch deleted file mode 100644 index 619f3a6..0000000 --- a/apache-sshd-use-tomcat-coyote.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 387c538f6532600b76e73e1157d06d656b1c969b Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Wed, 27 Nov 2013 14:37:16 +0100 -Subject: [PATCH] Replace tomcat-apr with tomcat-coyote - ---- - pom.xml | 6 +++--- - sshd-core/pom.xml | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 18c1a7c..8676d8c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -90,9 +90,9 @@ - 2.0.5 - - -- tomcat -- tomcat-apr -- 5.5.23 -+ org.apache.tomcat -+ tomcat-coyote -+ 7.0.40 - - - com.jcraft -diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml -index 3fbdde0..0be1062 100644 ---- a/sshd-core/pom.xml -+++ b/sshd-core/pom.xml -@@ -44,8 +44,8 @@ - mina-core - - -- tomcat -- tomcat-apr -+ org.apache.tomcat -+ tomcat-coyote - true - - --- -1.8.3.1 - diff --git a/apache-sshd.spec b/apache-sshd.spec index e65798c..0c8ff3c 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,47 +1,50 @@ -Name: apache-sshd -Version: 0.11.0 -Release: 5%{?dist} -Summary: Apache SSHD -License: ASL 2.0 -URL: http://mina.apache.org/sshd-project/ - -Source0: http://www.apache.org/dist/mina/sshd/%{version}/%{name}-%{version}-src.tar.gz - -BuildArch: noarch - -BuildRequires: apache-mina -BuildRequires: bouncycastle >= 1.46 -BuildRequires: bouncycastle-pkix -BuildRequires: bouncycastle-pg -BuildRequires: jzlib >= 1.1.0 -BuildRequires: maven-local -BuildRequires: maven-plugin-bundle -BuildRequires: maven-plugin-testing-harness -BuildRequires: maven-shared -BuildRequires: tomcat-lib >= 7.0.25 +Name: apache-sshd +Version: 0.14.0 +Release: 1%{?dist} +Summary: Apache SSHD +License: ASL 2.0 +URL: http://mina.apache.org/sshd-project + +Source0: http://www.eu.apache.org/dist/mina/sshd/%{version}/dist/%{name}-%{version}-src.tar.gz +Patch0: build-with-tomcat8.patch + +BuildRequires: maven-local +BuildRequires: mvn(com.jcraft:jzlib) +BuildRequires: mvn(commons-httpclient:commons-httpclient) +BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.apache.mina:mina-core) +BuildRequires: mvn(org.apache.tomcat:tomcat-jni) +BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) +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} -%package javadoc -Summary: API documentation for %{name} - -%description javadoc +%description javadoc This package provides %{name}. - %prep %setup -q +%patch0 -p1 + # Use tomcat-jni instead of unavailable tomcat-apr -sed -i "s,tomcat,org.apache.tomcat,;s,tomcat-apr,tomcat-jni,;s,5.5.23,8.0.20," pom.xml */pom.xml +%pom_change_dep -r tomcat:tomcat-apr org.apache.tomcat:tomcat-jni:8.0.23 # Build the core only: %pom_disable_module assembly %pom_disable_module sshd-pam %pom_disable_module sshd-sftp +%pom_disable_module sshd-git # Disable the plugins that we don't need: %pom_remove_plugin :maven-remote-resources-plugin @@ -49,8 +52,7 @@ sed -i "s,tomcat,org.apache.tomcat,;s,tomcat-apr,< %pom_remove_plugin org.apache.rat:apache-rat-plugin %build -# Skip the tests as they don't run correctly with the current -# version of the jzlib compression library: +# tests require ch.ethz.ganymed:ganymed-ssh2 %mvn_build -f %install @@ -64,6 +66,10 @@ sed -i "s,tomcat,org.apache.tomcat,;s,tomcat-apr,< %license LICENSE.txt NOTICE.txt %changelog +* 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 diff --git a/sources b/sources index 3cbb239..bba13c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e29a9866649acf11531722bea4c8cf9 apache-sshd-0.11.0-src.tar.gz +0b48b8bdd0007f73609bc915808ead66 apache-sshd-0.14.0-src.tar.gz