Bug 58973 - Upgrade www/jakarta-tomcat41 to 4.1.29 and fix package
Summary: Upgrade www/jakarta-tomcat41 to 4.1.29 and fix package
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ernst de Haan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-11-05 17:20 UTC by Angelo Turetta
Modified: 2004-05-18 15:30 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (311 bytes, patch)
2003-11-05 17:20 UTC, Angelo Turetta
no flags Details | Diff
file.diff (4.39 KB, patch)
2003-11-05 17:20 UTC, Angelo Turetta
no flags Details | Diff
tomcat4130.diff (2.29 KB, patch)
2004-05-18 15:22 UTC, Angelo Turetta
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Angelo Turetta 2003-11-05 17:20:19 UTC
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.

Fix: 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 <bsd.port.pre.mk>
Comment 1 Kirill Ponomarev freebsd_committer freebsd_triage 2003-11-05 19:32:43 UTC
Responsible Changed
From-To: freebsd-ports-bugs->znerd

Over to maintainer
Comment 2 Ernst de Haan freebsd_committer freebsd_triage 2003-11-21 06:53:56 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 Angelo Turetta 2003-11-22 17:19:41 UTC
Ernst,

I noticed your recent commits to 4.1.x.

The problem is that you didn't initially apply the part of my patch that updated Makefile. 
It's not only the version number.

Sure the main repository is no more http://www.apache.org/dist/jakarta/tomcat-4/binaries/.
While maybe the PLIST_SUB additions have been centralized in bsd.ports.mk, but I didn't check.
       WWWOWN=${USER} WWWGRP=${GROUP}
(without these additions, the generated package would be still broken)

Thanks for your help,
Angelo Turetta
Comment 4 Angelo Turetta 2004-05-18 15:22:28 UTC
Ernst,

As I said in my message on Nov 22 (yes, it's about 6 months ago), your commit missed a 
required change to the Makefile for Tomcat41: without it, the pkg-plist substitution is not 
correct.

By the way, I introduced a small change in order to reuse the WWWOWN & WWWGRP standard 
Makefile vars from bsd.port.mk in place of the non-standard ones used by this port.

Please find attached the patch you might commit.

Thanks for attention,
Angelo Turetta