From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 5 09:20:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7FE716A4EE for ; Wed, 5 Nov 2003 09:20:22 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 081DA43FF5 for ; Wed, 5 Nov 2003 09:20:20 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hA5HKJFY062334 for ; Wed, 5 Nov 2003 09:20:19 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hA5HKJPl062333; Wed, 5 Nov 2003 09:20:19 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 5 Nov 2003 09:20:19 -0800 (PST) Resent-Message-Id: <200311051720.hA5HKJPl062333@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Angelo Turetta Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A283416A4CF; Wed, 5 Nov 2003 09:19:02 -0800 (PST) Received: from pvi1.rainbownet.com (ip155.a.rainbownet.com [213.174.191.155]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67DA043FF2; Wed, 5 Nov 2003 09:19:01 -0800 (PST) (envelope-from aturetta@commit.it) Received: from pvi1.rainbownet.com (localhost [127.0.0.1]) by pvi1.rainbownet.com (8.12.9/8.12.9) with ESMTP id hA5HJ0rb079939; Wed, 5 Nov 2003 18:19:00 +0100 (CET) (envelope-from aturetta@commit.it) Received: (from root@localhost) by pvi1.rainbownet.com (8.12.9/8.12.9/Submit) id hA5HJ0j7079938; Wed, 5 Nov 2003 18:19:00 +0100 (CET) (envelope-from aturetta@commit.it) Message-Id: <200311051719.hA5HJ0j7079938@pvi1.rainbownet.com> Date: Wed, 5 Nov 2003 18:19:00 +0100 (CET) From: Angelo Turetta To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: znerd@FreeBSD.org Subject: ports/58973: Upgrade www/jakarta-tomcat41 to 4.1.29 and fix package X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Angelo Turetta List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2003 17:20:23 -0000 >Number: 58973 >Category: ports >Synopsis: Upgrade www/jakarta-tomcat41 to 4.1.29 and fix package >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 05 09:20:19 PST 2003 >Closed-Date: >Last-Modified: >Originator: Angelo Turetta >Release: FreeBSD 4.9-PRERELEASE i386 >Organization: Commit - Italy >Environment: System: FreeBSD pvi1.rainbownet.com 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Tue Sep 16 15:40:49 CEST 2003 angelo@pvi1.rainbownet.com:/usr/obj/usr/src/sys/PVI1 i386 >Description: Update port www/jakarta-tomcat41 to version 4.1.29 In the process, fix the packing list to obtain a clean pkg_add/pkg_deinstall sequence (a number of empty directory where not created in previous versions) The generated package now includes directives to fix file/dir ownership after install, so that the installed tree is identical to what you obtain after 'make install' from the port. Obsoletes java/57235 for the part regarding tomcat4.1 Summary of changes to Tomcat since 4.1.27: The Coyote connector (HTTP/1.1 and AJP/1.3) has been upgraded to Coyote 1.1, which is the one used by Tomcat 5.0.x. Upgrade distributed jars: DBCP (1.1) commons-modeler (1.1) Xerces (2.5.0) regexp (1.3). Added support for nesting a Context Listener and a Webapp Loader within a DefaultContext. Minor docs updates. StandardContext: Fix reloading regression. StandardDefaultContext: Fix support for defining ResourceLink. StandardWrapperValve: Fix infinite recursion when logging in certain cases. JNDIRealm: Many bugfixes (18698, 11678, 19864, 20518, 14817, 22236), and allow multiple user patterns. CGI Servlet: Bugfixes (22857, 22858). WebDAV Servlet: Fix bad handling of the destinationPath URL. SecurityClassLoad: Preload a few additional classes from Coyote. MemoryUser: XML-escape the values when writing out the tomcat-users.xml file. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/cvs/freebsd/ports/www/jakarta-tomcat41/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 11 Aug 2003 11:00:04 -0000 1.48 +++ Makefile 5 Nov 2003 17:46:14 -0000 @@ -6,9 +6,9 @@ # PORTNAME= jakarta-tomcat -PORTVERSION= 4.1.27 +PORTVERSION= 4.1.29 CATEGORIES= www java -MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-4/binaries/ \ +MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-4/v${PORTVERSION}/bin/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R} LOG_DIR= ${APP_HOME}/logs -PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat${MAJOR_VER:S/.//} CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl @@ -51,6 +50,7 @@ ${WRKSRC}/conf/server.xml JAR_FILE= bin/bootstrap.jar WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work +PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP} .include Index: distinfo =================================================================== RCS file: /usr/cvs/freebsd/ports/www/jakarta-tomcat41/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 11 Aug 2003 11:00:04 -0000 1.13 +++ distinfo 5 Nov 2003 17:46:14 -0000 @@ -1 +1 @@ -MD5 (jakarta-tomcat-4.1.27.tar.gz) = ef2bcb5a89b0d2c5efd51ba048b33e75 +MD5 (jakarta-tomcat-4.1.29.tar.gz) = 66b03ddd10fb4a9079fe26774436db09 Index: pkg-plist =================================================================== RCS file: /usr/cvs/freebsd/ports/www/jakarta-tomcat41/pkg-plist,v retrieving revision 1.21 diff -u -r1.21 pkg-plist --- pkg-plist 11 Aug 2003 11:00:04 -0000 1.21 +++ pkg-plist 5 Nov 2003 17:46:14 -0000 @@ -21,9 +21,9 @@ %%T%%/common/lib/activation.jar %%T%%/common/lib/ant.jar %%T%%/common/lib/commons-collections.jar -%%T%%/common/lib/commons-dbcp.jar +%%T%%/common/lib/commons-dbcp-1.1.jar %%T%%/common/lib/commons-logging-api.jar -%%T%%/common/lib/commons-pool.jar +%%T%%/common/lib/commons-pool-1.1.jar %%T%%/common/lib/jasper-compiler.jar %%T%%/common/lib/jasper-runtime.jar %%T%%/common/lib/jdbc2_0-stdext.jar @@ -43,6 +43,8 @@ %%T%%/conf/web.xml %%T%%/logs/stderr.log %%T%%/logs/stdout.log +@exec mkdir %D/%%T%%/server || true +@exec mkdir %D/%%T%%/server/classes || true %%T%%/server/lib/catalina-ant.jar %%T%%/server/lib/catalina.jar %%T%%/server/lib/commons-beanutils.jar @@ -51,7 +53,7 @@ %%T%%/server/lib/commons-logging.jar %%T%%/server/lib/commons-modeler.jar %%T%%/server/lib/jaas.jar -%%T%%/server/lib/jakarta-regexp-1.2.jar +%%T%%/server/lib/jakarta-regexp-1.3.jar %%T%%/server/lib/mx4j-jmx.jar %%T%%/server/lib/mx4j.license %%T%%/server/lib/servlets-cgi.renametojar @@ -120,6 +122,7 @@ %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextsAction.class %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.class %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.class +@exec mkdir %D/%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters ||true %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.class %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.class %%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.class @@ -364,6 +367,9 @@ %%T%%/server/webapps/manager/images/tomcat.gif %%T%%/server/webapps/manager/images/void.gif %%T%%/server/webapps/manager/manager-howto.html +@exec mkdir %D/%%T%%/shared || true +@exec mkdir %D/%%T%%/shared/classes || true +@exec mkdir %D/%%T%%/shared/lib || true %%T%%/temp/README.txt %%T%%/webapps/ROOT/WEB-INF/web.xml %%T%%/webapps/ROOT/index.jsp @@ -1230,6 +1236,8 @@ %%T%%/webapps/tomcat-docs/jasper/docs/api/stylesheet.css %%T%%/webapps/tomcat-docs/jk2/common/AJPv13-extensions-proposal.html %%T%%/webapps/tomcat-docs/jk2/common/AJPv13.html +%%T%%/webapps/tomcat-docs/jk2/common/doccontrib.html +%%T%%/webapps/tomcat-docs/jk2/common/tools.html %%T%%/webapps/tomcat-docs/jk2/faq.html %%T%%/webapps/tomcat-docs/jk2/images/corner.gif %%T%%/webapps/tomcat-docs/jk2/images/jakarta.gif @@ -1247,12 +1255,15 @@ %%T%%/webapps/tomcat-docs/jk2/jk/workershowto.html %%T%%/webapps/tomcat-docs/jk2/jk2/confighowto.html %%T%%/webapps/tomcat-docs/jk2/jk2/configtc.html +%%T%%/webapps/tomcat-docs/jk2/jk2/configtccom.html %%T%%/webapps/tomcat-docs/jk2/jk2/configtcex.html %%T%%/webapps/tomcat-docs/jk2/jk2/configweb.html %%T%%/webapps/tomcat-docs/jk2/jk2/configwebcom.html %%T%%/webapps/tomcat-docs/jk2/jk2/configwebex.html %%T%%/webapps/tomcat-docs/jk2/jk2/installhowto.html +%%T%%/webapps/tomcat-docs/jk2/jk2/vhosthowto.html %%T%%/webapps/tomcat-docs/jk2/style.css +@exec mkdir %D/%%T%%/webapps/tomcat-docs/jk2/printer ||true %%T%%/webapps/tomcat-docs/jndi-datasource-examples-howto.html %%T%%/webapps/tomcat-docs/jndi-resources-howto.html %%T%%/webapps/tomcat-docs/manager-howto.html @@ -1441,8 +1452,9 @@ %%T%%/webapps/webdav/index.html %%T%%/webapps/webdav/tomcat-power.gif %%T%%/webapps/webdav/tomcat.gif -@dirrm share/nls/en_US.US-ASCII -@dirrm share/nls/POSIX +@exec mkdir %D/%%T%%/work || true +@exec mkdir %D/%%T%%/common/classes ||true +@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/ @dirrm %%T%%/work @dirrm %%T%%/webapps/webdav/WEB-INF @dirrm %%T%%/webapps/webdav >Release-Note: >Audit-Trail: >Unformatted: