summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Afonichev <iafonichev@griddynamics.com>2014-09-21 04:11:01 +0400
committerIvan Afonichev <iafonichev@griddynamics.com>2014-09-21 04:11:01 +0400
commit53dd1361b3ab4535e39dae014a53eb7b56627f24 (patch)
tree383f787d3b97ad6466b62188f92fa8c1c5a2a780
parentbe711a2ff6efc98e2fc8ce27b4ad75dbf449b212 (diff)
downloadtomcat-53dd1361b3ab4535e39dae014a53eb7b56627f24.zip
tomcat-53dd1361b3ab4535e39dae014a53eb7b56627f24.tar.gz
tomcat-53dd1361b3ab4535e39dae014a53eb7b56627f24.tar.xz
Updated to 8.0.12
Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 Use CATALINA_OPTS only on start, resolves: rhbz#1051194
-rw-r--r--tomcat-8.0-bootstrap-MANIFEST.MF.patch (renamed from tomcat-7.0-bootstrap-MANIFEST.MF.patch)0
-rw-r--r--tomcat-8.0-digest.script (renamed from tomcat-7.0-digest.script)0
-rw-r--r--tomcat-8.0-jsvc.service (renamed from tomcat-7.0-jsvc.service)0
-rw-r--r--tomcat-8.0-log4j.properties (renamed from tomcat-7.0-log4j.properties)0
-rw-r--r--tomcat-8.0-tomcat-users-webapp.patch (renamed from tomcat-7.0-tomcat-users-webapp.patch)0
-rw-r--r--tomcat-8.0-tool-wrapper.script (renamed from tomcat-7.0-tool-wrapper.script)0
-rw-r--r--tomcat-8.0.conf (renamed from tomcat-7.0.conf)0
-rw-r--r--tomcat-8.0.logrotate (renamed from tomcat-7.0.logrotate)0
-rw-r--r--tomcat-8.0.service (renamed from tomcat-7.0.service)0
-rw-r--r--tomcat-8.0.sysconfig (renamed from tomcat-7.0.sysconfig)0
-rw-r--r--tomcat-8.0.wrapper (renamed from tomcat-7.0.wrapper)0
-rw-r--r--tomcat-server3
-rw-r--r--tomcat.spec47
13 files changed, 35 insertions, 15 deletions
diff --git a/tomcat-7.0-bootstrap-MANIFEST.MF.patch b/tomcat-8.0-bootstrap-MANIFEST.MF.patch
index e2ee93e..e2ee93e 100644
--- a/tomcat-7.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat-8.0-bootstrap-MANIFEST.MF.patch
diff --git a/tomcat-7.0-digest.script b/tomcat-8.0-digest.script
index 2ff7e64..2ff7e64 100644
--- a/tomcat-7.0-digest.script
+++ b/tomcat-8.0-digest.script
diff --git a/tomcat-7.0-jsvc.service b/tomcat-8.0-jsvc.service
index 8275796..8275796 100644
--- a/tomcat-7.0-jsvc.service
+++ b/tomcat-8.0-jsvc.service
diff --git a/tomcat-7.0-log4j.properties b/tomcat-8.0-log4j.properties
index dfc2309..dfc2309 100644
--- a/tomcat-7.0-log4j.properties
+++ b/tomcat-8.0-log4j.properties
diff --git a/tomcat-7.0-tomcat-users-webapp.patch b/tomcat-8.0-tomcat-users-webapp.patch
index 9f05e37..9f05e37 100644
--- a/tomcat-7.0-tomcat-users-webapp.patch
+++ b/tomcat-8.0-tomcat-users-webapp.patch
diff --git a/tomcat-7.0-tool-wrapper.script b/tomcat-8.0-tool-wrapper.script
index 2640ce2..2640ce2 100644
--- a/tomcat-7.0-tool-wrapper.script
+++ b/tomcat-8.0-tool-wrapper.script
diff --git a/tomcat-7.0.conf b/tomcat-8.0.conf
index 03119b7..03119b7 100644
--- a/tomcat-7.0.conf
+++ b/tomcat-8.0.conf
diff --git a/tomcat-7.0.logrotate b/tomcat-8.0.logrotate
index a87b4c0..a87b4c0 100644
--- a/tomcat-7.0.logrotate
+++ b/tomcat-8.0.logrotate
diff --git a/tomcat-7.0.service b/tomcat-8.0.service
index 103d464..103d464 100644
--- a/tomcat-7.0.service
+++ b/tomcat-8.0.service
diff --git a/tomcat-7.0.sysconfig b/tomcat-8.0.sysconfig
index 3117bf7..3117bf7 100644
--- a/tomcat-7.0.sysconfig
+++ b/tomcat-8.0.sysconfig
diff --git a/tomcat-7.0.wrapper b/tomcat-8.0.wrapper
index c97cb85..c97cb85 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-8.0.wrapper
diff --git a/tomcat-server b/tomcat-server
index bd55999..951b3ee 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -4,7 +4,7 @@
MAIN_CLASS=org.apache.catalina.startup.Bootstrap
-FLAGS="$JAVA_OPTS $CATALINA_OPTS"
+FLAGS="$JAVA_OPTS"
OPTIONS="-Dcatalina.base=$CATALINA_BASE \
-Dcatalina.home=$CATALINA_HOME \
-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
@@ -14,6 +14,7 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \
if [ "$1" = "start" ] ; then
if [ "${SECURITY_MANAGER}" = "true" ] ; then
+ FLAGS="${FLAGS} $CATALINA_OPTS"
OPTIONS="${OPTIONS} \
-Djava.security.manager \
-Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
diff --git a/tomcat.spec b/tomcat.spec
index d9de221..a0a96bb 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -28,13 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global jspspec 2.2
-%global major_version 7
+%global jspspec 2.3
+%global major_version 8
%global minor_version 0
-%global micro_version 54
+%global micro_version 12
%global packdname apache-tomcat-%{version}-src
-%global servletspec 3.0
-%global elspec 2.2
+%global servletspec 3.1
+%global elspec 3.0
%global tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -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
@@ -88,7 +88,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
BuildArch: noarch
BuildRequires: ant
-BuildRequires: ecj >= 1:4.2.1
+BuildRequires: ecj >= 1:4.4.0
BuildRequires: findutils
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon
@@ -168,6 +168,8 @@ Group: Development/Libraries
Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
Provides: jsp22
+Provides: %{name}-jsp-2.2-api
+Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires(post): chkconfig
@@ -205,6 +207,8 @@ Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
Provides: servlet3
+Provides: %{name}-servlet-3.0-api
+Obsoletes: %{name}-servlet-3.0-api
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -213,14 +217,16 @@ Apache Tomcat Servlet API implementation classes.
%package el-%{elspec}-api
Group: Development/Libraries
-Summary: Expression Language v1.0 API
+Summary: Expression Language v%{elspec} API
Provides: el_1_0_api = %{epoch}:%{version}-%{release}
Provides: el_api = %{elspec}
+Provides: %{name}-el-2.2-api
+Obsoletes: %{name}-el-2.2-api
Requires(post): chkconfig
Requires(postun): chkconfig
%description el-%{elspec}-api
-Expression Language 1.0.
+Expression Language %{elspec}.
%package webapps
Group: Applications/Internet
@@ -250,6 +256,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
touch HACK
%{__mkdir_p} HACKDIR
touch HACKDIR/build.xml
+ touch HACKDIR/LICENSE
+
# who needs a build.properties file anyway
%{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
@@ -258,9 +266,9 @@ export OPT_JAR_LIST="xalan-j2-serializer"
-Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \
- -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \
-Dtomcat-native.home="." \
+ -Dtomcat-native.win.path="HACKDIR" \
-Dcommons-daemon.native.win.mgr.exe="HACK" \
-Dnsis.exe="HACK" \
-Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
@@ -275,8 +283,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
- output/build/lib/ecj.jar \
- output/build/lib/apache-commons-dbcp.jar
+ output/build/lib/ecj.jar
# remove the cruft we created
%{__rm} output/build/bin/tomcat-native.tar.gz
@@ -384,6 +391,13 @@ popd
%{__install} -m 0644 %{SOURCE32} \
${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
+# Substitute libnames in catalina-tasks.xml
+sed -i \
+ "s,el-api.jar,%{name}-el-%{elspec}-api.jar,;
+ s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,;
+ s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \
+ ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml
+
# create jsp and servlet API symlinks
pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
@@ -467,7 +481,7 @@ done
%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el,javax.el:el-api"
%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
# Generate a depmap fragment javax.servlet:servlet-api pointing to
@@ -643,7 +657,7 @@ fi
%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%{_datadir}/maven-metadata/tomcat.xml
+%{_datadir}/maven-fragments/%{name}
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%exclude %{libdir}/log4j.jar
@@ -669,6 +683,11 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sat Sep 20 2014 Ivan Afonichev <ivan.afonichev@gmail.com> 0:8.0.12-1
+- Updated to 8.0.12
+- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
+- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
+
* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 0:7.0.54-3
- jsp-api requires el-api