From owner-svn-ports-head@freebsd.org Tue Jun 18 21:31:24 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 366B615C91C5; Tue, 18 Jun 2019 21:31:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D0CE48EBAE; Tue, 18 Jun 2019 21:31:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8FEF1AE31; Tue, 18 Jun 2019 21:31:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5ILVNun015634; Tue, 18 Jun 2019 21:31:23 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5ILVNRu015631; Tue, 18 Jun 2019 21:31:23 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201906182131.x5ILVNRu015631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 18 Jun 2019 21:31:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504502 - in head/www/tomcat85: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in head/www/tomcat85: . files X-SVN-Commit-Revision: 504502 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D0CE48EBAE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2019 21:31:24 -0000 Author: jkim Date: Tue Jun 18 21:31:22 2019 New Revision: 504502 URL: https://svnweb.freebsd.org/changeset/ports/504502 Log: Update to 8.5.42. Submitted by: Владимир Друзенко (maintainer) Modified: head/www/tomcat85/Makefile head/www/tomcat85/distinfo head/www/tomcat85/files/patch-bin__daemon.sh Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/Makefile Tue Jun 18 21:31:22 2019 (r504502) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.5.41 +PORTVERSION= 8.5.42 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 Modified: head/www/tomcat85/distinfo ============================================================================== --- head/www/tomcat85/distinfo Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/distinfo Tue Jun 18 21:31:22 2019 (r504502) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558564268 -SHA256 (apache-tomcat-8.5.41.tar.gz) = 4f6b88d0c07ba3dc68779a01c3da6da0e4e8889df0c93000659d6da6166de293 -SIZE (apache-tomcat-8.5.41.tar.gz) = 9699102 +TIMESTAMP = 1560892311 +SHA256 (apache-tomcat-8.5.42.tar.gz) = e3bebd1ecfdf439dc54f9a6f72f8fb22f33324223337f040860fd0cdf95220b5 +SIZE (apache-tomcat-8.5.42.tar.gz) = 9711748 Modified: head/www/tomcat85/files/patch-bin__daemon.sh ============================================================================== --- head/www/tomcat85/files/patch-bin__daemon.sh Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/files/patch-bin__daemon.sh Tue Jun 18 21:31:22 2019 (r504502) @@ -1,6 +1,6 @@ --- bin/daemon.sh.orig +++ bin/daemon.sh -@@ -113,12 +113,9 @@ +@@ -115,12 +115,9 @@ test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap @@ -15,10 +15,10 @@ fi # Set the default service-start wait time if necessary test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 -@@ -135,7 +132,7 @@ +@@ -137,7 +134,7 @@ # Add on extra jar files to CLASSPATH - test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:" + test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" -CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" +CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar"