Resolves: rhbz#1557507 Update to 9.0.7
This commit is contained in:
parent
70272203ee
commit
fb3fee7d60
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (apache-tomcat-8.5.29-src.tar.gz) = af3827642cfc9a5a4a6e1e802537e0ccecb002b330ffedafb0106cf2f4ff4999374248636cff29a2d73b2c46fc00acd3b81f4e27003ac8883e70643d426f6490
|
SHA512 (apache-tomcat-9.0.7-src.tar.gz) = cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
|
||||||
|
25
tomcat.spec
25
tomcat.spec
@ -29,15 +29,15 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
%global jspspec 2.3
|
%global jspspec 2.3
|
||||||
%global major_version 8
|
%global major_version 9
|
||||||
%global minor_version 5
|
%global minor_version 0
|
||||||
%global micro_version 29
|
%global micro_version 7
|
||||||
%global packdname apache-tomcat-%{version}-src
|
%global packdname apache-tomcat-%{version}-src
|
||||||
%global servletspec 3.1
|
%global servletspec 4.0
|
||||||
%global elspec 3.0
|
%global elspec 3.0
|
||||||
%global tcuid 91
|
%global tcuid 91
|
||||||
# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java
|
# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java
|
||||||
%global native_version 1.2.8
|
%global native_version 1.2.14
|
||||||
|
|
||||||
|
|
||||||
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
||||||
@ -93,19 +93,18 @@ Source32: tomcat-named.service
|
|||||||
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
|
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
|
||||||
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
|
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
|
||||||
Patch2: %{name}-8.0.36-CompilerOptionsV9.patch
|
Patch2: %{name}-8.0.36-CompilerOptionsV9.patch
|
||||||
Patch3: disableJavadocFailOnWarning.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ecj >= 1:4.4.0
|
BuildRequires: ecj >= 1:4.6.1
|
||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
BuildRequires: apache-commons-collections
|
BuildRequires: apache-commons-collections
|
||||||
BuildRequires: apache-commons-daemon
|
BuildRequires: apache-commons-daemon
|
||||||
BuildRequires: apache-commons-dbcp
|
BuildRequires: apache-commons-dbcp
|
||||||
BuildRequires: apache-commons-pool
|
BuildRequires: apache-commons-pool
|
||||||
BuildRequires: tomcat-taglibs-standard
|
BuildRequires: tomcat-taglibs-standard
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
BuildRequires: java-devel >= 1:1.8.0
|
||||||
BuildRequires: jpackage-utils >= 0:1.7.0
|
BuildRequires: jpackage-utils >= 0:1.7.0
|
||||||
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
|
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
|
||||||
# add_maven_depmap is deprecated, using javapackages-local for now
|
# add_maven_depmap is deprecated, using javapackages-local for now
|
||||||
@ -121,7 +120,7 @@ Requires: apache-commons-daemon
|
|||||||
Requires: apache-commons-collections
|
Requires: apache-commons-collections
|
||||||
Requires: apache-commons-dbcp
|
Requires: apache-commons-dbcp
|
||||||
Requires: apache-commons-pool
|
Requires: apache-commons-pool
|
||||||
Requires: java-headless >= 1:1.6.0
|
Requires: java-headless >= 1:1.8.0
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
Requires: procps
|
Requires: procps
|
||||||
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
|
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
|
||||||
@ -200,7 +199,7 @@ Summary: Libraries needed to run the Tomcat Web container
|
|||||||
Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
|
Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
|
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
|
||||||
Requires: ecj >= 1:4.2.1
|
Requires: ecj >= 1:4.6.1
|
||||||
Requires: apache-commons-collections
|
Requires: apache-commons-collections
|
||||||
Requires: apache-commons-dbcp
|
Requires: apache-commons-dbcp
|
||||||
Requires: apache-commons-pool
|
Requires: apache-commons-pool
|
||||||
@ -215,7 +214,7 @@ Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
|
|||||||
Provides: servlet = %{servletspec}
|
Provides: servlet = %{servletspec}
|
||||||
Provides: servlet6
|
Provides: servlet6
|
||||||
Provides: servlet3
|
Provides: servlet3
|
||||||
Obsoletes: %{name}-servlet-3.0-api
|
Obsoletes: %{name}-servlet-3.1-api
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig
|
||||||
Requires(postun): chkconfig
|
Requires(postun): chkconfig
|
||||||
|
|
||||||
@ -251,7 +250,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
|
|||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
%patch2 -p0
|
%patch2 -p0
|
||||||
%patch3 -p0
|
|
||||||
|
|
||||||
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar
|
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar
|
||||||
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar
|
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar
|
||||||
@ -701,6 +699,9 @@ fi
|
|||||||
%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
|
%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 01 2018 Coty Sutherland <csutherl@redhat.com> - 1:9.0.7-1
|
||||||
|
- Update to 9.0.7
|
||||||
|
|
||||||
* Thu Mar 15 2018 Coty Sutherland <csutherl@redhat.com> - 1:8.5.29-1
|
* Thu Mar 15 2018 Coty Sutherland <csutherl@redhat.com> - 1:8.5.29-1
|
||||||
- Update to 8.5.29
|
- Update to 8.5.29
|
||||||
- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources
|
- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources
|
||||||
|
Loading…
Reference in New Issue
Block a user