rpms/pki-servlet-engine
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Adding temporary workaround for add_maven_depmap deprecation fed_hash: c154cf4359

Browse Source
This commit is contained in:
Troy Dawson 2017-08-31 12:09:58 +00:00
parent 66a81e03cb
commit 6d9eaa9d4c
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/apache-tomcat-8.0.44-src.tar.gz /apache-tomcat-8.0.46-src.tar.gz

2
sources
View File

@ -1 +1 @@
b9eccb2c956aabd2c319e91ce308971b apache-tomcat-8.0.44-src.tar.gz 3feaec442115a40dcb068114c500b884 apache-tomcat-8.0.46-src.tar.gz

14
tomcat.spec
View File

@ -31,7 +31,7 @@
%global jspspec 2.3 %global jspspec 2.3
%global major_version 8 %global major_version 8
%global minor_version 0 %global minor_version 0
%global micro_version 44 %global micro_version 46
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 3.1 %global servletspec 3.1
%global elspec 3.0 %global elspec 3.0
@ -100,6 +100,11 @@ BuildRequires: apache-commons-pool
BuildRequires: tomcat-taglibs-standard BuildRequires: tomcat-taglibs-standard
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0
%if 0%{?fedora} >= 27
# add_maven_depmap is deprecated, using javapackages-local for now
# See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro
BuildRequires: javapackages-local
%endif
BuildRequires: junit BuildRequires: junit
BuildRequires: geronimo-jaxrpc BuildRequires: geronimo-jaxrpc
BuildRequires: wsdl4j BuildRequires: wsdl4j
@ -685,6 +690,13 @@ 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
* Mon Aug 21 2017 Coty Sutherland <csutherl@redhat.com> - 1:8.0.46-1
- Update to 8.0.46
- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.0.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Jun 09 2017 Coty Sutherland <csutherl@redhat.com> - 1:8.0.44-1 * Fri Jun 09 2017 Coty Sutherland <csutherl@redhat.com> - 1:8.0.44-1
- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism - Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism