diff --git a/9.0.75.tar.gz b/9.0.80.tar.gz similarity index 45% rename from 9.0.75.tar.gz rename to 9.0.80.tar.gz index 9cc5c48f55a44c74c0b793b24527a0e110e26353..9974b87887898aca79f220b3997f6c8085f2e418 100644 Binary files a/9.0.75.tar.gz and b/9.0.80.tar.gz differ diff --git a/tomcat.spec b/tomcat.spec index 38ac106da874b9e6991ed1f93ce541265ec594d2..591f16de891035c69c76fceef2d8589f0d02657c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -3,13 +3,13 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 75 +%global micro_version 80 %global packdname tomcat-%{version} %global servletspec 4.0 %global elspec 3.0 %global tcuid 53 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java -%global native_version 1.2.21 +%global native_version 1.2.38 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -23,7 +23,6 @@ %global cachedir %{_var}/cache/%{name} %global tempdir %{cachedir}/temp %global workdir %{cachedir}/work -%global _systemddir /lib/systemd/system Name: tomcat Epoch: 1 @@ -60,6 +59,7 @@ BuildArch: noarch BuildRequires: ant BuildRequires: wsdl4j BuildRequires: systemd +BuildRequires: rpm_macro(_unitdir) BuildRequires: findutils BuildRequires: aqute-bnd BuildRequires: aqute-bndlib @@ -70,7 +70,7 @@ BuildRequires: java-devel >= 1:1.8.0 Requires: procps Requires: javapackages-tools Requires: java-headless >= 1:1.8.0 -Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Requires: %{name}-lib = %{EVR} Recommends: tomcat-native >= %{native_version} Conflicts: tomcat-native >= 2 Requires(pre): shadow-utils @@ -79,7 +79,7 @@ Requires(preun): systemd Requires(postun): systemd # added after log4j sub-package was removed -Provides: %{name}-log4j = %{epoch}:%{version}-%{release} +Provides: %{name}-log4j = %{EVR} %description Tomcat, also known as Apache Tomcat, is an open-source web application server @@ -121,14 +121,14 @@ choice for deploying Java-based web applications. %package admin-webapps Summary: The host-manager and manager web applications for Apache Tomcat -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} %description admin-webapps The host-manager and manager web applications for Apache Tomcat. %package docs-webapp Summary: The docs web application for Apache Tomcat -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} %description docs-webapp The docs web application for Apache Tomcat. @@ -136,17 +136,17 @@ The docs web application for Apache Tomcat. %package jsp-%{jspspec}-api Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} -Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} -Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-servlet-%{servletspec}-api = %{EVR} +Requires: %{name}-el-%{elspec}-api = %{EVR} %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. %package lib Summary: Libraries needed to run the Tomcat Web container -Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} -Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} -Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} +Requires: %{name}-jsp-%{jspspec}-api = %{EVR} +Requires: %{name}-servlet-%{servletspec}-api = %{EVR} +Requires: %{name}-el-%{elspec}-api = %{EVR} Requires: ecj >= 1:4.10 Requires(preun): coreutils @@ -171,14 +171,14 @@ Apache Tomcat EL API Implementation Classes. %package webapps Summary: The ROOT web application for Apache Tomcat -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} %description webapps The ROOT web application for Apache Tomcat. %package doc Summary: Documentation files for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} BuildArch: noarch %description doc @@ -200,7 +200,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api - %build export OPT_JAR_LIST="xalan-j2-serializer" # we don't care about the tarballs and we're going to replace @@ -232,12 +231,11 @@ touch HACK # see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html %{__rm} -rf output/build/webapps/examples - %install # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} @@ -325,6 +323,8 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar + + cp ../../%{name}/bin/tomcat-juli.jar . popd # symlink to the FHS locations where we've installed things @@ -340,7 +340,7 @@ popd # Install the maven metadata for the spec impl artifacts as other projects use them #%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} pushd res/maven - for pom in tomcat-el-api.pom tomcat-jsp-api.pom tomcat-servlet-api.pom; do + for pom in *.pom; do # fix-up version in all pom files sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom done @@ -350,9 +350,50 @@ popd %mvn_artifact res/maven/tomcat-el-api.pom output/build/lib/el-api.jar %mvn_artifact res/maven/tomcat-jsp-api.pom output/build/lib/jsp-api.jar %mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar -%mvn_install -sed -i '/usr\/share\/java\/tomcat$/d' .mfiles-tomcat-jsp-api +%mvn_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api +%mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar +%mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant +%mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar +%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha +%mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar +%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina +%mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar +%mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar +%mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar +%mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar +%mvn_artifact res/maven/tomcat-i18n-de.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-de.jar +%mvn_artifact res/maven/tomcat-i18n-es.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-es.jar +%mvn_artifact res/maven/tomcat-i18n-fr.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-fr.jar +%mvn_artifact res/maven/tomcat-i18n-ja.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ja.jar +%mvn_artifact res/maven/tomcat-i18n-ko.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ko.jar +%mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar +%mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar +%mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar +%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el +%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar +%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper +%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar +%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api +%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar +%mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar +%mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar +%mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar +%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi +%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar +%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig +%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar +%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes +%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar +%mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar +%mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar +%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api +%mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar +%mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar +%mvn_artifact res/maven/tomcat.pom + +%mvn_install %pre # add the tomcat user and group @@ -407,9 +448,9 @@ if [ "$1" = "0" ]; then %{_javadir}/%{name}-el-%{elspec}-api.jar fi -%files +%files %defattr(0664,root,tomcat,0755) -%doc LICENSE +%license LICENSE %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper %attr(0755,root,root) %{_sbindir}/%{name} @@ -460,45 +501,59 @@ fi %{homedir}/logs %{homedir}/conf -%files lib +%files admin-webapps +%defattr(0664,root,tomcat,0755) +%{appdir}/host-manager +%{appdir}/manager + +%files docs-webapp +%{appdir}/docs + +%files lib -f .mfiles %dir %{libdir} %{libdir}/*.jar %{_javadir}/*.jar %{bindir}/tomcat-juli.jar %exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{libdir}/%{name}-servlet-%{servletspec}*.jar +%exclude %{libdir}/%{name}-jsp-%{jspspec}*.jar %exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar %exclude %{_javadir}/%{name}-el-%{elspec}-api.jar %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%exclude %{_javadir}/%{name}-servlet-api.jar +%exclude %{_javadir}/%{name}-el-api.jar +%exclude %{_javadir}/%{name}-jsp-api.jar +%exclude %{_jnidir}/* %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%{libdir}/%{name}-jsp-%{jspspec}*.jar +%{_javadir}/%{name}-jsp-api.jar %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api -%doc LICENSE +%license LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar +%{libdir}/%{name}-servlet-%{servletspec}*.jar +%{_javadir}/%{name}-servlet-api.jar %files el-%{elspec}-api -f .mfiles-tomcat-el-api -%doc LICENSE +%license LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar - -%files admin-webapps -%defattr(0664,root,tomcat,0755) -%{appdir}/host-manager -%{appdir}/manager +%{_javadir}/%{name}-el-api.jar %files webapps %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT -%files docs-webapp -%{appdir}/docs - %files doc %doc {NOTICE,RELEASE*} %changelog -* Mon May 8 2023 Funda Wang - 9.0.75-1 +* Sat Aug 26 2023 Funda Wang - 1:9.0.80-1 +- New version 9.0.80 + +* Mon May 8 2023 Funda Wang - 1:9.0.75-1 - New version 9.0.75 * Wed Apr 12 2023 Xuchun Shang - 1:9.0.73-2