Attachment 215960 Details for Bug 247563 – Update to 7.0.104

[patch] Update to 7.0.104

tomcat7.diff (text/plain), 5.14 KB, created by Vladimir Druzenko on 2020-06-26 13:55:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-06-26 13:55:29 UTC

Size: 5.14 KB

patch

obsolete

>diff -ur www/tomcat7.orig/Makefile www/tomcat7/Makefile
>--- www/tomcat7.orig/Makefile
>+++ www/tomcat7/Makefile
>@@ -2,13 +2,16 @@
> # $FreeBSD: head/www/tomcat7/Makefile 518482 2019-11-26 21:46:12Z jkim $
> 
> PORTNAME=	tomcat
>-PORTVERSION=	7.0.92
>+PORTVERSION=	7.0.104
> PORTREVISION=	0
> CATEGORIES=	www java
> MASTER_SITES=	APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin
> PKGNAMESUFFIX=	7
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
> 
>+DEPRECATED=	Apache Tomcat 7.0 is nearing EOL - support will end on 2021-03-31, please consider porting to Tomcat 8.5 or 9.0
>+EXPIRATION_DATE=2021-06-31
>+
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	Open-source Java web server by Apache, 7.x branch
> 
>@@ -68,7 +71,7 @@
> 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 &&\
>diff -ur www/tomcat7.orig/distinfo www/tomcat7/distinfo
>--- www/tomcat7.orig/distinfo
>+++ www/tomcat7/distinfo
>@@ -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
>diff -ur www/tomcat7.orig/pkg-plist www/tomcat7/pkg-plist
>--- www/tomcat7.orig/pkg-plist
>+++ www/tomcat7/pkg-plist
>@@ -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

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 247563: 215960