[Pkg-freeipa-devel] tomcatjss: Changes to 'master'

[Timo Aaltonen]

 build.xml                                          |    4 +-
 debian/changelog                                   |    7 ++++
 debian/patches/add-dummy-getprotocol.diff          |   31 ---------------------
 debian/patches/series                              |    1 
 src/org/apache/tomcat/util/net/jss/JSSSupport.java |    4 ++
 tomcatjss.spec                                     |    8 ++++-
 6 files changed, 20 insertions(+), 35 deletions(-)

New commits:
commit 5e21dba1c84d59a30105d79345a937defae6c783
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Aug 17 10:23:20 2015 +0300

    releasing package tomcatjss version 7.1.3-1

diff --git a/debian/changelog b/debian/changelog
index c57c1b2..888db07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-tomcatjss (7.1.3-1) UNRELEASED; urgency=medium
+tomcatjss (7.1.3-1) unstable; urgency=medium
 
   * New upstream release.
   * add-dummy-getprotocol.diff: Removed, upstream.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Mon, 17 Aug 2015 08:43:19 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 17 Aug 2015 08:45:11 +0300
 
 tomcatjss (7.1.2-1) unstable; urgency=medium
 

commit 0c4f4371acbc7b396f378e01816f7076aeb7710b
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Aug 17 08:45:04 2015 +0300

    new upstream, remove patch

diff --git a/debian/changelog b/debian/changelog
index 67513a5..c57c1b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcatjss (7.1.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * add-dummy-getprotocol.diff: Removed, upstream.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 17 Aug 2015 08:43:19 +0300
+
 tomcatjss (7.1.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/add-dummy-getprotocol.diff b/debian/patches/add-dummy-getprotocol.diff
deleted file mode 100644
index a7c9620..0000000
--- a/debian/patches/add-dummy-getprotocol.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bd20b44e0fa191c059f6b311663e7f8b396a5cb Mon Sep 17 00:00:00 2001
-From: "Endi S. Dewata" <edewata at redhat.com>
-Date: Wed, 22 Jul 2015 15:17:04 +0200
-Subject: [PATCH] Added JSSSupport.getProtocol().
-
-A dummy getProtocol() has been added to JSSSupport in order
-to build with newer Tomcat.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1245786
----
- src/org/apache/tomcat/util/net/jss/JSSSupport.java | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/org/apache/tomcat/util/net/jss/JSSSupport.java b/src/org/apache/tomcat/util/net/jss/JSSSupport.java
-index e243ca134852cefe7e8353d9b92eb5915004b0e8..4c04034d25396c3f6f3641b2844adb70d6c89100 100755
---- a/src/org/apache/tomcat/util/net/jss/JSSSupport.java
-+++ b/src/org/apache/tomcat/util/net/jss/JSSSupport.java
-@@ -97,6 +97,10 @@ class JSSSupport implements SSLSupport {
-         return null;
-     }
- 
-+    public String getProtocol() throws IOException {
-+        return null;
-+    }
-+
-     public String getSessionId() throws IOException {
-         return null;
-     }
--- 
-2.4.6
-
diff --git a/debian/patches/series b/debian/patches/series
index 8104d92..6116b9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-build.diff
-add-dummy-getprotocol.diff

commit fe66739e5485875cc68ba178bff855656adc72cb
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Aug 17 08:41:46 2015 +0300

    Imported Upstream version 7.1.3

diff --git a/build.xml b/build.xml
index eaa3bda..4bd13ec 100755
--- a/build.xml
+++ b/build.xml
@@ -37,8 +37,8 @@
 
   <property name="Name" value="Tomcat JSS"/>
   <property name="name" value="tomcatjss"/>
-  <property name="version" value="7.1.2"/>
-  <property name="manifest-version" value="7.1.2"/>
+  <property name="version" value="7.1.3"/>
+  <property name="manifest-version" value="7.1.3"/>
 
   <!--
     Set the properties that control various build options
diff --git a/src/org/apache/tomcat/util/net/jss/JSSSupport.java b/src/org/apache/tomcat/util/net/jss/JSSSupport.java
index e243ca1..4c04034 100755
--- a/src/org/apache/tomcat/util/net/jss/JSSSupport.java
+++ b/src/org/apache/tomcat/util/net/jss/JSSSupport.java
@@ -97,6 +97,10 @@ class JSSSupport implements SSLSupport {
         return null;
     }
 
+    public String getProtocol() throws IOException {
+        return null;
+    }
+
     public String getSessionId() throws IOException {
         return null;
     }
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 5485c88..7c29c35 100755
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,5 +1,5 @@
 Name:     tomcatjss
-Version:  7.1.2
+Version:  7.1.3
 Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
@@ -91,6 +91,12 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* Wed Jul 22 2015 Endi Sukma Dewata <edewata at redhat.com> 7.1.3-1
+- Bugzilla Bug #1245786 - Build failure on F23
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Wed Mar  4 2015 Endi Sukma Dewata <edewata at redhat.com> 7.1.2-1
 - Bugzilla Bug #1198450 - Support for Tomcat 8
 - Bugzilla Bug #1214858 - Add nuxwdog support (alee)