[apache-sshd] Update to upstream 0.7.0
Juan Hernandez
jhernand at fedoraproject.org
Thu Jul 26 07:59:54 UTC 2012
commit 54e01f2e329b8b7d504f36277c9650f9e1cb8b0a
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Thu Jul 26 09:49:44 2012 +0200
Update to upstream 0.7.0
.gitignore | 1 +
apache-sshd-build-the-core-only.patch | 14 ++++++++
apache-sshd-dont-download-license.patch | 14 ++++++++
apache-sshd-use-bouncycastle-for-jdk6.patch | 21 ++++++++++-
apache-sshd-use-jzlib-as-system-dependency.patch | 18 +++++++++-
apache-sshd-use-slf4j-api.patch | 36 --------------------
...-sshd-use-tomcat-apr-as-system-dependency.patch | 14 ++++++++
apache-sshd.spec | 21 +++++++----
sources | 2 +-
9 files changed, 92 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba83e37..ee18a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/apache-sshd-0.6.0-src.tar.gz
+/apache-sshd-0.7.0-src.tar.gz
diff --git a/apache-sshd-build-the-core-only.patch b/apache-sshd-build-the-core-only.patch
index 9cc7903..9bc8456 100644
--- a/apache-sshd-build-the-core-only.patch
+++ b/apache-sshd-build-the-core-only.patch
@@ -1,3 +1,14 @@
+From 7fa5b60de1ab93fbb57411dbadf3ba8ec79baba1 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 26 Jul 2012 09:35:16 +0200
+Subject: [PATCH 1/5] Build only the core
+
+---
+ src/pom.xml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/pom.xml b/src/pom.xml
+index 3011259..9a0ac38 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -223,8 +223,6 @@
@@ -9,3 +20,6 @@
</modules>
</project>
+--
+1.7.11.2
+
diff --git a/apache-sshd-dont-download-license.patch b/apache-sshd-dont-download-license.patch
index febe5c4..50fd556 100644
--- a/apache-sshd-dont-download-license.patch
+++ b/apache-sshd-dont-download-license.patch
@@ -1,3 +1,14 @@
+From d1c4b8f89f5e1740ba7528ad50b3465b84899a2b Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 26 Jul 2012 09:35:35 +0200
+Subject: [PATCH 2/5] Don't download license
+
+---
+ src/pom.xml | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/src/pom.xml b/src/pom.xml
+index 9a0ac38..781af17 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -183,29 +183,6 @@
@@ -30,3 +41,6 @@
</plugins>
</build>
+--
+1.7.11.2
+
diff --git a/apache-sshd-use-bouncycastle-for-jdk6.patch b/apache-sshd-use-bouncycastle-for-jdk6.patch
index 0fae926..7311fdd 100644
--- a/apache-sshd-use-bouncycastle-for-jdk6.patch
+++ b/apache-sshd-use-bouncycastle-for-jdk6.patch
@@ -1,6 +1,18 @@
+From b9c7795ef969f68f517641e234b0aa917d16567c Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 26 Jul 2012 09:40:14 +0200
+Subject: [PATCH 5/5] Use BouncyCastle for JDK6
+
+---
+ src/pom.xml | 6 +++---
+ src/sshd-core/pom.xml | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/pom.xml b/src/pom.xml
+index 03b26f2..e81266f 100644
--- a/src/pom.xml
+++ b/src/pom.xml
-@@ -97,9 +97,9 @@
+@@ -104,9 +104,9 @@
<systemPath>${_javadir}/jzlib.jar</systemPath>
</dependency>
<dependency>
@@ -13,9 +25,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+diff --git a/src/sshd-core/pom.xml b/src/sshd-core/pom.xml
+index e0aaef2..9d680df 100644
--- a/src/sshd-core/pom.xml
+++ b/src/sshd-core/pom.xml
-@@ -49,8 +49,8 @@
+@@ -54,8 +54,8 @@
<optional>true</optional>
</dependency>
<dependency>
@@ -26,3 +40,6 @@
<optional>true</optional>
</dependency>
<dependency>
+--
+1.7.11.2
+
diff --git a/apache-sshd-use-jzlib-as-system-dependency.patch b/apache-sshd-use-jzlib-as-system-dependency.patch
index 7a0b981..b431714 100644
--- a/apache-sshd-use-jzlib-as-system-dependency.patch
+++ b/apache-sshd-use-jzlib-as-system-dependency.patch
@@ -1,11 +1,25 @@
+From c7c7b8c96668400ca2d620aa575c029e9d309a37 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 26 Jul 2012 09:37:30 +0200
+Subject: [PATCH 3/5] Use jzlib as system dependency
+
+---
+ src/pom.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/pom.xml b/src/pom.xml
+index 781af17..27d07f7 100644
--- a/src/pom.xml
+++ b/src/pom.xml
-@@ -93,6 +93,8 @@
+@@ -98,6 +98,8 @@
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
- <version>1.0.7</version>
+ <version>1.1.1</version>
+ <scope>system</scope>
+ <systemPath>${_javadir}/jzlib.jar</systemPath>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
+--
+1.7.11.2
+
diff --git a/apache-sshd-use-tomcat-apr-as-system-dependency.patch b/apache-sshd-use-tomcat-apr-as-system-dependency.patch
index 9fa5720..81ea084 100644
--- a/apache-sshd-use-tomcat-apr-as-system-dependency.patch
+++ b/apache-sshd-use-tomcat-apr-as-system-dependency.patch
@@ -1,3 +1,14 @@
+From be1c1ae14470f832bae3270dbf9306eae6523105 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 26 Jul 2012 09:38:15 +0200
+Subject: [PATCH 4/5] Use Tomcat APR as system dependency
+
+---
+ src/pom.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/pom.xml b/src/pom.xml
+index 27d07f7..03b26f2 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -93,6 +93,8 @@
@@ -9,3 +20,6 @@
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
+--
+1.7.11.2
+
diff --git a/apache-sshd.spec b/apache-sshd.spec
index 2742f46..ef6f4f4 100644
--- a/apache-sshd.spec
+++ b/apache-sshd.spec
@@ -1,12 +1,14 @@
Name: apache-sshd
-Version: 0.6.0
-Release: 3%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Apache SSHD
Group: Development/Libraries
License: ASL 2.0
URL: http://mina.apache.org/sshd
+# 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
# Build the core only:
@@ -23,7 +25,7 @@ Patch3: %{name}-use-tomcat-apr-as-system-dependency.patch
Patch4: %{name}-use-bouncycastle-for-jdk6.patch
# Use slf4j-api:
-Patch5: %{name}-use-slf4j-api.patch
+#Patch5: %{name}-use-slf4j-api.patch
BuildArch: noarch
@@ -74,7 +76,7 @@ This package contains javadoc for %{name}.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+#%patch5 -p1
%build
@@ -117,17 +119,20 @@ cp -rp src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_javadir}/*
-%doc LICENSE.txt
-%doc NOTICE.txt
+%doc src/LICENSE.txt
+%doc src/NOTICE.txt
%files javadoc
%{_javadocdir}/%{name}
-%doc LICENSE.txt
-%doc NOTICE.txt
+%doc src/LICENSE.txt
+%doc src/NOTICE.txt
%changelog
+* Thu Jul 26 2012 Juan Hernandez <juan.hernandez at redhat.com> - 0.7.0-1
+- Update to upstream 0.7.0
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index f567bad..1d86089 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7a2dace1e2305c2072fc28f10257d0 apache-sshd-0.6.0-src.tar.gz
+bf1f96c4cec9519172695ab318896cb4 apache-sshd-0.7.0-src.tar.gz
More information about the scm-commits
mailing list