git: c088ad5cc07a - 2021Q3 - www/tomcat85: Update to 8.5.69

[Kevin Bowling]

The branch 2021Q3 has been updated by kbowling:

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

commit c088ad5cc07a54e94997f543cca67e6e2ba8c291
Author:     VVD <vvd at unislabs.com>
AuthorDate: 2021-08-01 15:42:30 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-08-01 16:07:35 +0000

    www/tomcat85: Update to 8.5.69
    
    PR:             257153
    Security:       CVE-2021-30639
                    CVE-2021-30640
                    CVE-2021-33037
    (cherry picked from commit 07af47498de63bf4ae2a5d0538e476d8836a7a65)
---
 www/tomcat85/Makefile  | 2 +-
 www/tomcat85/distinfo  | 6 +++---
 www/tomcat85/pkg-descr | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index a8e13f355e8e..db5474810745 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alex Dupre <ale at FreeBSD.org>
 
 PORTNAME=	tomcat
-PORTVERSION=	8.5.64
+PORTVERSION=	8.5.69
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
diff --git a/www/tomcat85/distinfo b/www/tomcat85/distinfo
index 11d379bead6f..5d66d4007358 100644
--- a/www/tomcat85/distinfo
+++ b/www/tomcat85/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615488326
-SHA256 (apache-tomcat-8.5.64.tar.gz) = f00d3cc3c6965d160165193e4e071cd3ba39cf69f8b5b8017d66a78e8a754333
-SIZE (apache-tomcat-8.5.64.tar.gz) = 10520844
+TIMESTAMP = 1626175070
+SHA256 (apache-tomcat-8.5.69.tar.gz) = cc9616eb29bf491839ce5c8a1c3e37cb710f6ec99aad5aefb7944b5184b13398
+SIZE (apache-tomcat-8.5.69.tar.gz) = 10561246
diff --git a/www/tomcat85/pkg-descr b/www/tomcat85/pkg-descr
index 1332d2f24b01..11f517c2a857 100644
--- a/www/tomcat85/pkg-descr
+++ b/www/tomcat85/pkg-descr
@@ -2,8 +2,8 @@ Apache Tomcat is a web server written in 100% Pure Java.
 
 Apache Tomcat version 8.5 implements the Servlet 3.1, JavaServer Pages 2.3,
 Java Unified Expression Language 3.0 and Java 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. Tomcat 8.5 is aligned with Java EE 7.
+from the Java Community Process, JASPIC 1.1 specification, and includes many
+additional features that make it a useful platform for developing and deploying
+web applications and web services. Tomcat 8.5 is aligned with Java EE 7.
 
-WWW: http://tomcat.apache.org/
+WWW: https://tomcat.apache.org/