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

[Matthew Harmsen]

Everyone,

Bodhi contains a proposed Fedora 22 update to Tomcat 7.0.68:

  * tomcat-7.0.68-3.fc22
    <https://bodhi.fedoraproject.org/updates/FEDORA-2016-e6651efbaf>

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20160316/52311912/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tomcatjss-Build-Tomcat-7.0.68.patch
Type: text/x-patch
Size: 442 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20160316/52311912/attachment.bin>
-------------- next part --------------
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 <edewata at redhat.com> 7.1.2-2
> - Bugzilla Bug #1245786 - Build failure on F23 (backported to F22 to
>   coincide with Tomcat version change to 7.0.68)
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pki-core-Build-using-tomcat-7.0.68-on-F22.patch
Type: text/x-patch
Size: 997 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20160316/52311912/attachment-0001.bin>
-------------- next part --------------
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 <pki-devel at redhat.com> 10.2.6-12
> - Changes due to F22 Tomcat version change to 7.0.68
>