[apache-sshd/f19] Revert to upstream version 0.8.0

Wed Nov 27 13:46:42 UTC 2013

commit 3f89ad89c4a88a7e716b2db89e00a001348452cb
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Wed Nov 27 12:47:00 2013 +0100

    Revert to upstream version 0.8.0
    
    Due to bug 1021273 we need to revert to upstream version 0.8.0. As the
    version number can't go backwards it stays as 0.9.0 and only the release
    number is increased.

 .gitignore                                  |    1 +
 apache-sshd-use-bouncycastle-for-jdk6.patch |   10 +++++-----
 apache-sshd-use-tomcat-coyote.patch         |   14 +++++++-------
 apache-sshd.spec                            |   16 ++++++++++------
 sources                                     |    2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6defe64..d911913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /apache-sshd-0.6.0-src.tar.gz
 /apache-sshd-0.7.0-src.tar.gz
 /apache-sshd-0.9.0-src.tar.gz
+/apache-sshd-0.8.0-src.tar.gz
diff --git a/apache-sshd-use-bouncycastle-for-jdk6.patch b/apache-sshd-use-bouncycastle-for-jdk6.patch
index 65efd67..f6303b4 100644
--- a/apache-sshd-use-bouncycastle-for-jdk6.patch
+++ b/apache-sshd-use-bouncycastle-for-jdk6.patch
@@ -1,6 +1,6 @@
-From 281780acde645d3db12ca15f931c4db494967d88 Mon Sep 17 00:00:00 2001
+From 44568691d9501bd650fb9aa13087e06207ffd285 Mon Sep 17 00:00:00 2001
 From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Thu, 26 Sep 2013 15:46:25 +0200
+Date: Wed, 27 Nov 2013 14:36:01 +0100
 Subject: [PATCH] Use BouncyCastle for JDK 1.6
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH] Use BouncyCastle for JDK 1.6
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index f026683..b67a649 100644
+index 1a48d78..18c1a7c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -115,9 +115,9 @@
+@@ -100,9 +100,9 @@
                  <version>1.1.1</version>
              </dependency>
              <dependency>
@@ -26,7 +26,7 @@ index f026683..b67a649 100644
              <dependency>
                  <groupId>org.slf4j</groupId>
 diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
-index 764a999..461d4ed 100644
+index 2b18420..3fbdde0 100644
 --- a/sshd-core/pom.xml
 +++ b/sshd-core/pom.xml
 @@ -54,8 +54,8 @@
diff --git a/apache-sshd-use-tomcat-coyote.patch b/apache-sshd-use-tomcat-coyote.patch
index 09fb787..619f3a6 100644
--- a/apache-sshd-use-tomcat-coyote.patch
+++ b/apache-sshd-use-tomcat-coyote.patch
@@ -1,7 +1,7 @@
-From e5f84ffccd5ae4c742006534029a965c9ff76c41 Mon Sep 17 00:00:00 2001
+From 387c538f6532600b76e73e1157d06d656b1c969b Mon Sep 17 00:00:00 2001
 From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Thu, 26 Sep 2013 15:44:08 +0200
-Subject: [PATCH] Repaace tomcat-apr with tomcat-coyote
+Date: Wed, 27 Nov 2013 14:37:16 +0100
+Subject: [PATCH] Replace tomcat-apr with tomcat-coyote
 
 ---
  pom.xml           | 6 +++---
@@ -9,11 +9,11 @@ Subject: [PATCH] Repaace tomcat-apr with tomcat-coyote
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index dd7e90d..f026683 100644
+index 18c1a7c..8676d8c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -105,9 +105,9 @@
-                 <version>2.0.7</version>
+@@ -90,9 +90,9 @@
+                 <version>2.0.5</version>
              </dependency>
              <dependency>
 -                <groupId>tomcat</groupId>
@@ -26,7 +26,7 @@ index dd7e90d..f026683 100644
              <dependency>
                  <groupId>com.jcraft</groupId>
 diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
-index 593fa11..764a999 100644
+index 3fbdde0..0be1062 100644
 --- a/sshd-core/pom.xml
 +++ b/sshd-core/pom.xml
 @@ -44,8 +44,8 @@
diff --git a/apache-sshd.spec b/apache-sshd.spec
index 610d665..a1b28d6 100644
--- a/apache-sshd.spec
+++ b/apache-sshd.spec
@@ -1,13 +1,14 @@
 Name: apache-sshd
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Apache SSHD
 License: ASL 2.0
 URL: http://mina.apache.org/sshd-project/
 
-# Take into account that this URL will take you to a mirror
-# system, so you will need to use a browser to get the real file:
-Source0: http://www.apache.org/dyn/closer.cgi/mina/sshd/%{version}/%{name}-%{version}-src.tar.gz
+# Note that the version is hardcoded as 0.8.0 because we needed to revert to
+# upstream version 0.8.0 due to bug 1021273, but as the version number can't go
+# backwards it has to stay as 0.9.0:
+Source0: http://www.apache.org/dyn/closer.cgi/mina/sshd/0.8.0/%{name}-0.8.0-src.tar.gz
 
 # User version of bouncycastle for JDK6:
 Patch0: %{name}-use-bouncycastle-for-jdk6.patch
@@ -53,7 +54,7 @@ This package provides %{name}.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.8.0
 %patch0 -p1
 %patch1 -p1
 
@@ -63,7 +64,6 @@ This package provides %{name}.
 
 # Disable the plugins that we don't need:
 %pom_remove_plugin :maven-remote-resources-plugin
-%pom_remove_plugin :apache-rat-plugin
 
 %build
 
@@ -88,6 +88,10 @@ This package provides %{name}.
 
 
 %changelog
+* Wed Nov 27 2013 Juan Hernandez <juan.hernandez at 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 at redhat.com> - 0.9.0-2
 - Fix bouncycastle requirement
 
diff --git a/sources b/sources
index 03aa9c4..d6cb3a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-921e385efe629ec409a3fc4a0c3ae81b  apache-sshd-0.9.0-src.tar.gz
+c8c71cc9de71eb76296027ac040dd59a  apache-sshd-0.8.0-src.tar.gz
