git: 387db17c7f9e - 2021Q3 - www/tomcat7: Update to 7.0.109

[Kevin Bowling]

The branch 2021Q3 has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=387db17c7f9eae9f3ac9ba636fae8893bfe77189

commit 387db17c7f9eae9f3ac9ba636fae8893bfe77189
Author:     VVD <vvd at unislabs.com>
AuthorDate: 2021-08-01 15:38:26 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-08-01 16:07:24 +0000

    www/tomcat7: Update to 7.0.109
    
    PR:             257153
    Approved by:    ale (maintainer)
    Security:       CVE-2021-30640
    
    (cherry picked from commit c9577aaafdbd34b08c30bfe12cd4690db0749dab)
---
 www/tomcat7/Makefile  |  4 ++--
 www/tomcat7/distinfo  |  6 +++---
 www/tomcat7/pkg-descr | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index e3cf78ea8721..cb94b186229a 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alex Dupre <ale at FreeBSD.org>
 
 PORTNAME=	tomcat
-PORTVERSION=	7.0.108
+PORTVERSION=	7.0.109
 PORTREVISION=	0
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin
@@ -14,7 +14,7 @@ COMMENT=	Open-source Java web server by Apache, 7.x branch
 LICENSE=	APACHE20
 
 DEPRECATED=	Tomcat 7 is EOL on 2021-03-31. Please upgrade to a later version
-EXPIRATION_DATE=	2021-06-30
+EXPIRATION_DATE=	2021-12-31
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index 3c54a9402f8e..46b379bddc82 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612777255
-SHA256 (apache-tomcat-7.0.108.tar.gz) = 6dbf37fe4362cf1bc68959ad83ffea8daddd49c89ea273238765778eb229aa6a
-SIZE (apache-tomcat-7.0.108.tar.gz) = 9655294
+TIMESTAMP = 1626174995
+SHA256 (apache-tomcat-7.0.109.tar.gz) = ebfeb051e6da24bce583a4105439bfdafefdc7c5bdd642db2ab07e056211cb31
+SIZE (apache-tomcat-7.0.109.tar.gz) = 9656576
diff --git a/www/tomcat7/pkg-descr b/www/tomcat7/pkg-descr
index f3775c2a0058..6093e1b6b5fd 100644
--- a/www/tomcat7/pkg-descr
+++ b/www/tomcat7/pkg-descr
@@ -1,8 +1,8 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
-Apache Tomcat version 7.0 implements the Servlet 3.0 and JavaServer Pages 2.2
-specifications from the Java Community Process, and includes many additional
-features that make it a useful platform for developing and deploying web
-applications and web services.
+Apache Tomcat version 7.0 implements the Servlet 3.0, JavaServer Pages 2.2,
+EL 2.2 and WebSocket 1.1 specifications from the Java Community Process, and
+includes many additional features that make it a useful platform for developing
+and deploying web applications and web services.
 
-WWW: http://tomcat.apache.org/
+WWW: https://tomcat.apache.org/