v4 update:
- 4.1.36-> 4.1.39 which includes some security fixes:
  http://tomcat.apache.org/security-4.html
- use the light distribution for JDK 1.4 or later

v5 update:
- 5.5.26 -> 5.5.27 which includes some security fixes:
  http://tomcat.apache.org/security-5.html
  http://tomcat.apache.org/tomcat-5.5-doc/changelog.html

Both tested on i386 with 1.7 b42.

Index: v4/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- v4/Makefile 24 Jun 2008 02:46:21 -0000      1.9
+++ v4/Makefile 1 Jan 2009 19:02:27 -0000
@@ -4,11 +4,11 @@ COMMENT-main= Java servlet 2.3 and Java 
 COMMENT-admin= administration web application
 COMMENT-examples=example applications and documentation
 
-V=             4.1.36
-DISTNAME=      apache-tomcat-${V}
-PKGNAME-main=  tomcat-${V}p2
-PKGNAME-admin= tomcat-admin-${V}p0
-PKGNAME-examples=tomcat-examples-${V}p0
+V=             4.1.39
+DISTNAME=      apache-tomcat-${V}-LE-jdk14
+PKGNAME-main=  tomcat-${V}
+PKGNAME-admin= tomcat-admin-${V}
+PKGNAME-examples=tomcat-examples-${V}
 CATEGORIES=    www
 
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-4/v$V/bin/} \
@@ -21,7 +21,7 @@ MAINTAINER=   Kurt Miller <[email protected]
 MULTI_PACKAGES=        -main -examples -admin
 
 MODULES=       java
-MODJAVA_VER=   1.3+
+MODJAVA_VER=   1.4+
 
 BUILD_DEPENDS= ::archivers/gtar
 
Index: v4/distinfo
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- v4/distinfo 11 Dec 2007 23:40:53 -0000      1.3
+++ v4/distinfo 1 Jan 2009 19:02:27 -0000
@@ -1,5 +1,5 @@
-MD5 (apache-tomcat-4.1.36.tar.gz) = mVA2ww4QpOSXYpjH9+Pqbg==
-RMD160 (apache-tomcat-4.1.36.tar.gz) = I3sqhYGUyu7wd6B5Ug0Ay27ozGQ=
-SHA1 (apache-tomcat-4.1.36.tar.gz) = 1ZRdWAQe6LnyM70PKpLYh/OYlcs=
-SHA256 (apache-tomcat-4.1.36.tar.gz) = 
PdSrJSByFIih41+gKbHL2eiDkU0CTOqUroOU5jmfCI4=
-SIZE (apache-tomcat-4.1.36.tar.gz) = 9579283
+MD5 (apache-tomcat-4.1.39-LE-jdk14.tar.gz) = n8vQiGzKf8mqkXu8Fu62UQ==
+RMD160 (apache-tomcat-4.1.39-LE-jdk14.tar.gz) = DjqxHhgAX8XomYyI1YRJvpVQFkg=
+SHA1 (apache-tomcat-4.1.39-LE-jdk14.tar.gz) = kInoo/+4apgtGv8knSeTYotNabI=
+SHA256 (apache-tomcat-4.1.39-LE-jdk14.tar.gz) = 
qDihUH0MtOkx4aC9PjEhmRDv7y1eNXCmxV51lj1mXaA=
+SIZE (apache-tomcat-4.1.39-LE-jdk14.tar.gz) = 7487165
Index: v4/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/pkg/PLIST-examples,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-examples
--- v4/pkg/PLIST-examples       11 Dec 2007 23:40:53 -0000      1.2
+++ v4/pkg/PLIST-examples       1 Jan 2009 19:02:27 -0000
@@ -961,78 +961,6 @@ webapps/tomcat-docs/jasper/docs/api/reso
 webapps/tomcat-docs/jasper/docs/api/resources/inherit.gif
 webapps/tomcat-docs/jasper/docs/api/serialized-form.html
 webapps/tomcat-docs/jasper/docs/api/stylesheet.css
-webapps/tomcat-docs/jk/
-webapps/tomcat-docs/jk/ajp/
-webapps/tomcat-docs/jk/ajp/ajpv13a.html
-webapps/tomcat-docs/jk/ajp/ajpv13ext.html
-webapps/tomcat-docs/jk/ajp/printer/
-webapps/tomcat-docs/jk/ajp/printer/ajpv13a.html
-webapps/tomcat-docs/jk/ajp/printer/ajpv13ext.html
-webapps/tomcat-docs/jk/generic_howto/
-webapps/tomcat-docs/jk/generic_howto/loadbalancers.html
-webapps/tomcat-docs/jk/generic_howto/printer/
-webapps/tomcat-docs/jk/generic_howto/printer/loadbalancers.html
-webapps/tomcat-docs/jk/generic_howto/printer/quick.html
-webapps/tomcat-docs/jk/generic_howto/printer/workers.html
-webapps/tomcat-docs/jk/generic_howto/quick.html
-webapps/tomcat-docs/jk/generic_howto/workers.html
-webapps/tomcat-docs/jk/images/
-webapps/tomcat-docs/jk/images/add.gif
-webapps/tomcat-docs/jk/images/code.gif
-webapps/tomcat-docs/jk/images/design.gif
-webapps/tomcat-docs/jk/images/docs.gif
-webapps/tomcat-docs/jk/images/fix.gif
-webapps/tomcat-docs/jk/images/jakarta-logo.gif
-webapps/tomcat-docs/jk/images/printer.gif
-webapps/tomcat-docs/jk/images/tomcat.gif
-webapps/tomcat-docs/jk/images/update.gif
-webapps/tomcat-docs/jk/images/void.gif
-webapps/tomcat-docs/jk/index.html
-webapps/tomcat-docs/jk/miscellaneous/
-webapps/tomcat-docs/jk/miscellaneous/changelog.html
-webapps/tomcat-docs/jk/miscellaneous/doccontrib.html
-webapps/tomcat-docs/jk/miscellaneous/faq.html
-webapps/tomcat-docs/jk/miscellaneous/jkstatustasks.html
-webapps/tomcat-docs/jk/miscellaneous/printer/
-webapps/tomcat-docs/jk/miscellaneous/printer/changelog.html
-webapps/tomcat-docs/jk/miscellaneous/printer/doccontrib.html
-webapps/tomcat-docs/jk/miscellaneous/printer/faq.html
-webapps/tomcat-docs/jk/miscellaneous/printer/jkstatustasks.html
-webapps/tomcat-docs/jk/miscellaneous/printer/reporttools.html
-webapps/tomcat-docs/jk/miscellaneous/reporttools.html
-webapps/tomcat-docs/jk/news/
-webapps/tomcat-docs/jk/news/20041100.html
-webapps/tomcat-docs/jk/news/20050101.html
-webapps/tomcat-docs/jk/news/20060101.html
-webapps/tomcat-docs/jk/news/20070301.html
-webapps/tomcat-docs/jk/news/printer/
-webapps/tomcat-docs/jk/news/printer/20041100.html
-webapps/tomcat-docs/jk/news/printer/20050101.html
-webapps/tomcat-docs/jk/news/printer/20060101.html
-webapps/tomcat-docs/jk/news/printer/20070301.html
-webapps/tomcat-docs/jk/printer/
-webapps/tomcat-docs/jk/printer/index.html
-webapps/tomcat-docs/jk/reference/
-webapps/tomcat-docs/jk/reference/apache.html
-webapps/tomcat-docs/jk/reference/iis.html
-webapps/tomcat-docs/jk/reference/printer/
-webapps/tomcat-docs/jk/reference/printer/apache.html
-webapps/tomcat-docs/jk/reference/printer/iis.html
-webapps/tomcat-docs/jk/reference/printer/status.html
-webapps/tomcat-docs/jk/reference/printer/uriworkermap.html
-webapps/tomcat-docs/jk/reference/printer/workers.html
-webapps/tomcat-docs/jk/reference/status.html
-webapps/tomcat-docs/jk/reference/uriworkermap.html
-webapps/tomcat-docs/jk/reference/workers.html
-webapps/tomcat-docs/jk/style.css
-webapps/tomcat-docs/jk/webserver_howto/
-webapps/tomcat-docs/jk/webserver_howto/apache.html
-webapps/tomcat-docs/jk/webserver_howto/iis.html
-webapps/tomcat-docs/jk/webserver_howto/nes.html
-webapps/tomcat-docs/jk/webserver_howto/printer/
-webapps/tomcat-docs/jk/webserver_howto/printer/apache.html
-webapps/tomcat-docs/jk/webserver_howto/printer/iis.html
-webapps/tomcat-docs/jk/webserver_howto/printer/nes.html
 webapps/tomcat-docs/jndi-datasource-examples-howto.html
 webapps/tomcat-docs/jndi-resources-howto.html
 webapps/tomcat-docs/manager-howto.html
Index: v4/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- v4/pkg/PLIST-main   11 Dec 2007 23:40:53 -0000      1.2
+++ v4/pkg/PLIST-main   1 Jan 2009 19:02:27 -0000
@@ -68,6 +68,7 @@ share/examples/tomcat/web.xml
 tomcat/
 tomcat/BUILDING.txt
 tomcat/LICENSE
+tomcat/NOTICE
 tomcat/README.OpenBSD
 tomcat/README.txt
 tomcat/RELEASE-NOTES-4.1.txt
@@ -87,22 +88,13 @@ tomcat/bin/tool-wrapper.sh
 tomcat/common/
 tomcat/common/classes/
 tomcat/common/endorsed/
-tomcat/common/endorsed/xercesImpl.jar
-tomcat/common/endorsed/xml-apis.jar
 tomcat/common/lib/
-tomcat/common/lib/activation.jar
 tomcat/common/lib/ant-launcher.jar
 tomcat/common/lib/ant.jar
 tomcat/common/lib/commons-collections-3.2.jar
-tomcat/common/lib/commons-dbcp-1.2.1.jar
-tomcat/common/lib/commons-logging-api-1.1.jar
-tomcat/common/lib/commons-pool-1.3.jar
+tomcat/common/lib/commons-logging-api-1.1.1.jar
 tomcat/common/lib/jasper-compiler.jar
 tomcat/common/lib/jasper-runtime.jar
-tomcat/common/lib/jdbc2_0-stdext.jar
-tomcat/common/lib/jndi.jar
-tomcat/common/lib/jta.jar
-tomcat/common/lib/mail.jar
 tomcat/common/lib/naming-common.jar
 tomcat/common/lib/naming-factory.jar
 tomcat/common/lib/naming-resources.jar
@@ -114,12 +106,11 @@ tomcat/server/lib/catalina-ant.jar
 tomcat/server/lib/catalina.jar
 tomcat/server/lib/commons-beanutils.jar
 tomcat/server/lib/commons-digester-1.8.jar
-tomcat/server/lib/commons-fileupload-1.1.1.jar
+tomcat/server/lib/commons-fileupload-1.2.jar
 tomcat/server/lib/commons-io-1.3.jar
-tomcat/server/lib/commons-logging-1.1.jar
-tomcat/server/lib/commons-modeler-2.0.jar
-tomcat/server/lib/jaas.jar
-tomcat/server/lib/jakarta-regexp-1.4.jar
+tomcat/server/lib/commons-logging-1.1.1.jar
+tomcat/server/lib/commons-modeler-2.0.1.jar
+tomcat/server/lib/jakarta-regexp-1.5.jar
 tomcat/server/lib/mx4j.jar
 tomcat/server/lib/mx4j.license
 tomcat/server/lib/servlets-cgi.renametojar
Index: v5/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- v5/Makefile 26 Mar 2008 13:07:04 -0000      1.7
+++ v5/Makefile 1 Jan 2009 19:02:27 -0000
@@ -4,10 +4,10 @@ COMMENT-main= Java servlet 2.4 and Java 
 COMMENT-admin= administration web application
 COMMENT-examples=example applications and documentation
 
-V=             5.5.26
+V=             5.5.27
 DISTNAME=      apache-tomcat-${V}
 PKGNAME=       tomcat-${V}
-PKGNAME-main=  tomcat-${V}p0
+PKGNAME-main=  tomcat-${V}
 PKGNAME-admin= tomcat-admin-${V}
 PKGNAME-examples=tomcat-examples-${V}
 CATEGORIES=    www
Index: v5/distinfo
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- v5/distinfo 13 Feb 2008 13:48:22 -0000      1.5
+++ v5/distinfo 1 Jan 2009 19:02:27 -0000
@@ -1,15 +1,15 @@
-MD5 (apache-tomcat-5.5.26-admin.tar.gz) = rs0Eb1aj1Ld/RsUJEJ+ikg==
-MD5 (apache-tomcat-5.5.26-fulldocs.tar.gz) = nry/n53gbsp7cWFxs7Oc6w==
-MD5 (apache-tomcat-5.5.26.tar.gz) = 19GsFQWilcowTcTotbr96w==
-RMD160 (apache-tomcat-5.5.26-admin.tar.gz) = wcG9hP+0FfQZTb0YOjU0M8pNjIQ=
-RMD160 (apache-tomcat-5.5.26-fulldocs.tar.gz) = zL5VjrRJeaLgfAuYOhlfuI1GU3Y=
-RMD160 (apache-tomcat-5.5.26.tar.gz) = hYSdHpwl/vkPWQZeOOt8eIEGBW0=
-SHA1 (apache-tomcat-5.5.26-admin.tar.gz) = P9+oOPT5Y06nbwvMtf/odcd2sCE=
-SHA1 (apache-tomcat-5.5.26-fulldocs.tar.gz) = QxhAUJeKeQeLqcKAimBDexByP4k=
-SHA1 (apache-tomcat-5.5.26.tar.gz) = cmCyRglMx2xCxnuROwr4VFCv7rY=
-SHA256 (apache-tomcat-5.5.26-admin.tar.gz) = 
3bbzdEyhIKBthu3MAV6p1XYS9sIFZWUs25SEFUAzpCM=
-SHA256 (apache-tomcat-5.5.26-fulldocs.tar.gz) = 
3HtRlVUk0W2xbRK5YenY5Cv2CQypj1hlW6hL+Eax2FY=
-SHA256 (apache-tomcat-5.5.26.tar.gz) = 
exw8EBdYT1nSsx8qhe8u4l3gPm47kXZCzvTUFFDc2LA=
-SIZE (apache-tomcat-5.5.26-admin.tar.gz) = 2399602
-SIZE (apache-tomcat-5.5.26-fulldocs.tar.gz) = 3055186
-SIZE (apache-tomcat-5.5.26.tar.gz) = 6372195
+MD5 (apache-tomcat-5.5.27-admin.tar.gz) = npbHCZ0pfBt0G3RKMNtT2A==
+MD5 (apache-tomcat-5.5.27-fulldocs.tar.gz) = aG7v4+PyLY6bE7kMs2t5VA==
+MD5 (apache-tomcat-5.5.27.tar.gz) = 5Xb+2M5mwy7lKV1fdyexOA==
+RMD160 (apache-tomcat-5.5.27-admin.tar.gz) = z8CgUsruyvHlYU3aTvuiAvG2QQI=
+RMD160 (apache-tomcat-5.5.27-fulldocs.tar.gz) = RpfGwmaOiH2Qa0kwxKadm4T0rjY=
+RMD160 (apache-tomcat-5.5.27.tar.gz) = VHm7fdnAovnjep7t1f78YqVxiKY=
+SHA1 (apache-tomcat-5.5.27-admin.tar.gz) = sFjgxDYQx8upXSem8iKViAt/vkI=
+SHA1 (apache-tomcat-5.5.27-fulldocs.tar.gz) = ZS8oD8pd0u3Wqa6sf6zi1lBuvVI=
+SHA1 (apache-tomcat-5.5.27.tar.gz) = Zs9+GmfXpUw9MeW/RfBtQXOvjO4=
+SHA256 (apache-tomcat-5.5.27-admin.tar.gz) = 
gmUcU8xEG/rWFx7IeVVng+Powj1IHk5JeSmGfdAucBQ=
+SHA256 (apache-tomcat-5.5.27-fulldocs.tar.gz) = 
yz2pK2Yw4stvoC4m6jG4SY8syETVqdeGzwK+9IYCW5U=
+SHA256 (apache-tomcat-5.5.27.tar.gz) = 
sfqIFogZY86UhrDUXtDZRsuYueBNvcb9MfxUtq83iro=
+SIZE (apache-tomcat-5.5.27-admin.tar.gz) = 2401560
+SIZE (apache-tomcat-5.5.27-fulldocs.tar.gz) = 3062903
+SIZE (apache-tomcat-5.5.27.tar.gz) = 6478912
Index: v5/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-examples,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-examples
--- v5/pkg/PLIST-examples       13 Feb 2008 13:48:22 -0000      1.4
+++ v5/pkg/PLIST-examples       1 Jan 2009 19:02:28 -0000
@@ -801,6 +801,7 @@ webapps/tomcat-docs/catalina/docs/api/or
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedGetClassLoader.html
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
 
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-frame.html
@@ -1466,11 +1467,13 @@ webapps/tomcat-docs/config/printer/realm
 webapps/tomcat-docs/config/printer/resources.html
 webapps/tomcat-docs/config/printer/server.html
 webapps/tomcat-docs/config/printer/service.html
+webapps/tomcat-docs/config/printer/systemprops.html
 webapps/tomcat-docs/config/printer/valve.html
 webapps/tomcat-docs/config/realm.html
 webapps/tomcat-docs/config/resources.html
 webapps/tomcat-docs/config/server.html
 webapps/tomcat-docs/config/service.html
+webapps/tomcat-docs/config/systemprops.html
 webapps/tomcat-docs/config/valve.html
 webapps/tomcat-docs/connectors.html
 webapps/tomcat-docs/default-servlet.html
Index: v5/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- v5/pkg/PLIST-main   13 Feb 2008 13:48:22 -0000      1.4
+++ v5/pkg/PLIST-main   1 Jan 2009 19:02:28 -0000
@@ -163,6 +163,7 @@ tomcat/server/webapps/manager/WEB-INF/
 tomcat/server/webapps/manager/WEB-INF/lib/
 tomcat/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
 tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.2.jar
+tomcat/server/webapps/manager/WEB-INF/lib/commons-io-1.4.jar
 tomcat/server/webapps/manager/WEB-INF/web.xml
 tomcat/server/webapps/manager/html-manager-howto.html
 tomcat/server/webapps/manager/images/

Reply via email to