svn commit: r540733 - head/www/tomcat7
Joseph Mingrone
jrm at FreeBSD.org
Sun Jun 28 22:04:09 UTC 2020
Author: jrm
Date: Sun Jun 28 22:04:08 2020
New Revision: 540733
URL: https://svnweb.freebsd.org/changeset/ports/540733
Log:
www/tomcat7: Update to version 7.0.104
This update fixes the following CVEs:
CVE-2020-9484
CVE-2020-1938
CVE-2020-1935
CVE-2019-17569
CVE-2019-17563
CVE-2019-12418
CVE-2019-0232
CVE-2019-0221
http://tomcat.apache.org/security-7.html#Fixed_in_Apache_Tomcat_7.0.104
PR: 247563
Submitted by: vvd at unislabs.com
Approved by: ports-secteam (zi)
Modified:
head/www/tomcat7/Makefile (contents, props changed)
head/www/tomcat7/distinfo (contents, props changed)
head/www/tomcat7/pkg-plist (contents, props changed)
Modified: head/www/tomcat7/Makefile
==============================================================================
--- head/www/tomcat7/Makefile Sun Jun 28 21:52:02 2020 (r540732)
+++ head/www/tomcat7/Makefile Sun Jun 28 22:04:08 2020 (r540733)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tomcat
-PORTVERSION= 7.0.92
+PORTVERSION= 7.0.104
PORTREVISION= 0
CATEGORIES= www java
MASTER_SITES= APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin
@@ -14,6 +14,9 @@ COMMENT= Open-source Java web server by Apache, 7.x br
LICENSE= APACHE20
+DEPRECATED= Tomcat 7 is EOL on 2021-03-31. Please upgrade to a later version.
+EXPIRATION_DATE= 2021-06-30
+
RUN_DEPENDS= jsvc:devel/apache-commons-daemon
USES= cpe
@@ -68,7 +71,7 @@ do-install:
post-install:
@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
- for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
+ for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
post-install-HOST_MANAGER-on:
(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
Modified: head/www/tomcat7/distinfo
==============================================================================
--- head/www/tomcat7/distinfo Sun Jun 28 21:52:02 2020 (r540732)
+++ head/www/tomcat7/distinfo Sun Jun 28 22:04:08 2020 (r540733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549975679
-SHA256 (apache-tomcat-7.0.92.tar.gz) = d3fe8a26f52241203282d1bacd739880c72fffbd21fab7a74834b7125c2d0148
-SIZE (apache-tomcat-7.0.92.tar.gz) = 9125027
+TIMESTAMP = 1593176924
+SHA256 (apache-tomcat-7.0.104.tar.gz) = 0cbc72a05f62978e0b78ce4acf1bb7aa720bfbbabc8a11e11930d73285aea73e
+SIZE (apache-tomcat-7.0.104.tar.gz) = 9648795
Modified: head/www/tomcat7/pkg-plist
==============================================================================
--- head/www/tomcat7/pkg-plist Sun Jun 28 21:52:02 2020 (r540732)
+++ head/www/tomcat7/pkg-plist Sun Jun 28 22:04:08 2020 (r540733)
@@ -34,10 +34,13 @@
%%T%%/lib/tomcat-api.jar
%%T%%/lib/tomcat-coyote.jar
%%T%%/lib/tomcat-dbcp.jar
+%%T%%/lib/tomcat-i18n-de.jar
%%T%%/lib/tomcat-i18n-es.jar
%%T%%/lib/tomcat-i18n-fr.jar
%%T%%/lib/tomcat-i18n-ja.jar
+%%T%%/lib/tomcat-i18n-ko.jar
%%T%%/lib/tomcat-i18n-ru.jar
+%%T%%/lib/tomcat-i18n-zh-CN.jar
%%T%%/lib/tomcat-jdbc.jar
%%T%%/lib/tomcat-util.jar
%%T%%/lib/tomcat7-websocket.jar
@@ -57,6 +60,7 @@
@sample %%T%%/conf/logging.properties.sample
@sample %%T%%/conf/server.xml.sample
@sample %%T%%/conf/tomcat-users.xml.sample
+%%T%%/conf/tomcat-users.xsd
@sample %%T%%/conf/web.xml.sample
%%T%%/temp/safeToDelete.tmp
%%ROOT%%%%T%%/webapps/ROOT/RELEASE-NOTES.txt
@@ -64,7 +68,6 @@
%%ROOT%%%%T%%/webapps/ROOT/asf-logo-wide.svg
%%ROOT%%%%T%%/webapps/ROOT/bg-button.png
%%ROOT%%%%T%%/webapps/ROOT/bg-middle.png
-%%ROOT%%%%T%%/webapps/ROOT/bg-nav-item.png
%%ROOT%%%%T%%/webapps/ROOT/bg-nav.png
%%ROOT%%%%T%%/webapps/ROOT/bg-upper.png
%%ROOT%%%%T%%/webapps/ROOT/favicon.ico
@@ -79,6 +82,7 @@
%%DOCS%%%%T%%/webapps/docs/RUNNING.txt
%%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
%%DOCS%%%%T%%/webapps/docs/aio.html
+%%DOCS%%%%T%%/webapps/docs/annotationapi/index.html
%%DOCS%%%%T%%/webapps/docs/api/index.html
%%DOCS%%%%T%%/webapps/docs/appdev/build.xml.txt
%%DOCS%%%%T%%/webapps/docs/appdev/deployment.html
@@ -214,10 +218,14 @@
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.java
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings.properties
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_de.properties
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_ja.properties
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_ko.properties
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.class
@@ -282,8 +290,6 @@
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.class
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.class
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.java
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.class
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.java
%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
@@ -565,8 +571,6 @@
%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.html
%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.jsp
%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.jsp.html
-%%EXAMPLES%%%%T%%/webapps/examples/jsp/source.jsp
-%%EXAMPLES%%%%T%%/webapps/examples/jsp/source.jsp.html
%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.html
%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.jsp
%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.jsp.html
More information about the svn-ports-all
mailing list