[Pki-devel] [PATCHES] Updated tomcatjss and pki-core to work with Tomcat 7.0.68 on F22

2016-03-19 Thread Matthew Harmsen 

Everyone,

Bodhi contains a proposed Fedora 22 update to Tomcat 7.0.68:

 * tomcat-7.0.68-3.fc22
   

This required changes to both tomcatjss (attached) and pki-core (attached).

These changes are specific to the Fedora 22 platform only; they have 
only been tested out via a Dogtag CA, not yet on FreeIPA, and require 
all of the following packages to be installed:


 * pki-base-10.2.6-12.fc22.noarch
 * pki-ca-10.2.6-12.fc22.noarch
 * pki-server-10.2.6-12.fc22.noarch
 * pki-tools-10.2.6-12.fc22.x86_64
 * tomcat-jsp-2.2-api-7.0.68-3.fc22.noarch
 * tomcat-servlet-3.0-api-7.0.68-3.fc22.noarch
 * tomcat-7.0.68-3.fc22.noarch
 * tomcat-lib-7.0.68-3.fc22.noarch
 * tomcat-el-2.2-api-7.0.68-3.fc22.noarch
 * tomcatjss-7.1.2-2.fc22.noarch

-- Matt
--- src/org/apache/tomcat/util/net/jss/JSSSupport.java	2015-04-20 12:34:46.0 -0600
+++ src/org/apache/tomcat/util/net/jss/JSSSupport.java	2015-08-05 15:10:53.0 -0600
@@ -97,6 +97,10 @@ class JSSSupport implements SSLSupport {
 return null;
 }
 
+public String getProtocol() throws IOException {
+return null;
+}
+
 public String getSessionId() throws IOException {
 return null;
 }
3c3
< Release:  1%{?dist}
---
> Release:  2%{?dist}
24a25,27
> %if 0%{?fedora} == 22
> BuildRequires:tomcat >= 7.0.68
> %else
26a30
> %endif
38a43,45
> %if 0%{?fedora} == 22
> Requires: tomcat >= 7.0.68
> %else
40a48,50
> %endif
> 
> Patch1:   tomcatjss-Build-Tomcat-7.0.68.patch
63a74
> %patch1 -p0
93a105,108
> * Wed Mar 16 2016 Endi Sukma Dewata  7.1.2-2
> - Bugzilla Bug #1245786 - Build failure on F23 (backported to F22 to
>   coincide with Tomcat version change to 7.0.68)
> 
From 1f1d642e207b3610c0a418653eed6d2855ca13a8 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen 
Date: Tue, 15 Mar 2016 17:43:10 -0600
Subject: [PATCH] Build using tomcat 7.0.68 on F22

---
 base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
index 094c056..c5e845b 100644
--- a/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
+++ b/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
@@ -60,6 +60,11 @@ public class ProxyRealm implements Realm {
 }
 
 @Override
+public Principal authenticate(String username) {
+return realm.authenticate(username);
+}
+
+@Override
 public Principal authenticate(String username, String password) {
 return realm.authenticate(username, password);
 }
-- 
2.5.0

43c43
< Release:  11%{?dist}
---
> Release:  12%{?dist}
126a127,129
> %if 0%{?fedora} == 22
> BuildRequires:tomcatjss >= 7.1.2-2
> %else
129a133
> %endif
204a209,210
> ## pki-core-10.2.6-12
> Patch42:  pki-core-Build-using-tomcat-7.0.68-on-F22.patch
397c403,406
< Requires: tomcat-servlet-3.1-api
---
> Requires: tomcat-servlet-3.1-api >= 8.0.32
> %else
> %if 0%{?fedora} == 22
> Requires: tomcat-servlet-3.0-api >= 7.0.68
399d407
< %if 0%{?fedora} >= 22
458d465
< Requires: tomcat >= 7.0.47
460,462c467,476
< Requires: tomcat-el-3.0-api
< Requires: tomcat-jsp-2.3-api
< Requires: tomcat-servlet-3.1-api
---
> Requires: tomcat >= 8.0.32
> Requires: tomcat-el-3.0-api >= 8.0.32
> Requires: tomcat-jsp-2.3-api >= 8.0.32
> Requires: tomcat-servlet-3.1-api >= 8.0.32
> %else
> %if 0%{?fedora} == 22
> Requires: tomcat >= 7.0.68
> Requires: tomcat-el-2.2-api >= 7.0.68
> Requires: tomcat-jsp-2.2-api >= 7.0.68
> Requires: tomcat-servlet-3.0-api >= 7.0.68
463a478
> Requires: tomcat >= 7.0.47
468a484
> %endif
481a498,500
> %if 0%{?fedora} == 22
> Requires: tomcatjss >= 7.1.2-2
> %else
484a504
> %endif
748a769
> %patch42 -p1
1097a1119,1121
> * Wed Mar 16 2016 Dogtag Team  10.2.6-12
> - Changes due to F22 Tomcat version change to 7.0.68
> 
___
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Re: [Pki-devel] [PATCHES] Updated tomcatjss and pki-core to work with Tomcat 7.0.68 on F22

2016-03-19 Thread John Magne 
Looks fine :

ACK

I presume once all this is in,certain packages have to be available in koji or 
the build wont work.

- Original Message -
From: "Matthew Harmsen" 
To: "pki-devel" 
Cc: "Jack Magne" , "Matthew Harmsen" 
Sent: Wednesday, March 16, 2016 5:51:11 PM
Subject: [PATCHES] Updated tomcatjss and pki-core to work with Tomcat 7.0.68 on 
F22

Everyone,

Bodhi contains a proposed Fedora 22 update to Tomcat 7.0.68:

  * tomcat-7.0.68-3.fc22


This required changes to both tomcatjss (attached) and pki-core (attached).

These changes are specific to the Fedora 22 platform only; they have 
only been tested out via a Dogtag CA, not yet on FreeIPA, and require 
all of the following packages to be installed:

  * pki-base-10.2.6-12.fc22.noarch
  * pki-ca-10.2.6-12.fc22.noarch
  * pki-server-10.2.6-12.fc22.noarch
  * pki-tools-10.2.6-12.fc22.x86_64
  * tomcat-jsp-2.2-api-7.0.68-3.fc22.noarch
  * tomcat-servlet-3.0-api-7.0.68-3.fc22.noarch
  * tomcat-7.0.68-3.fc22.noarch
  * tomcat-lib-7.0.68-3.fc22.noarch
  * tomcat-el-2.2-api-7.0.68-3.fc22.noarch
  * tomcatjss-7.1.2-2.fc22.noarch

-- Matt

___
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Re: [Pki-devel] [PATCHES] Updated tomcatjss and pki-core to work with Tomcat 7.0.68 on F22

2016-03-18 Thread Fraser Tweedale 
On Wed, Mar 16, 2016 at 06:51:11PM -0600, Matthew Harmsen wrote:
> Everyone,
> 
> Bodhi contains a proposed Fedora 22 update to Tomcat 7.0.68:
> 
>  * tomcat-7.0.68-3.fc22
>
> 
> This required changes to both tomcatjss (attached) and pki-core (attached).
> 
> These changes are specific to the Fedora 22 platform only; they have only
> been tested out via a Dogtag CA, not yet on FreeIPA, and require all of the
> following packages to be installed:
> 
I tested FreeIPA; installation failed without these changes,
succeded with them, so LGTM.

___
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel