From 2e1950e71c024982f4a0025fe7bf0b1fbe943125 Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 4 Nov 2013 00:04:06 +0400 Subject: [PATCH] Updated to 7.0.47 Fix java.security.policy --- sources | 2 +- tomcat-server | 2 +- tomcat.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c9c84cf..2bb650f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz +4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz diff --git a/tomcat-server b/tomcat-server index ef8cec9..bd55999 100644 --- a/tomcat-server +++ b/tomcat-server @@ -16,7 +16,7 @@ if [ "$1" = "start" ] ; then if [ "${SECURITY_MANAGER}" = "true" ] ; then OPTIONS="${OPTIONS} \ -Djava.security.manager \ - -Djava.security.policy==\"${CATALINA_BASE}/conf/catalina.policy\"" + -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy" fi run start elif [ "$1" = "stop" ] ; then diff --git a/tomcat.spec b/tomcat.spec index ba04e78..d960a78 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 42 +%global micro_version 47 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -661,6 +661,10 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1 +- Updated to 7.0.47 +- Fix java.security.policy + * Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild