From b6f7dce2e66d2ef713e0a6fbac241f2b1c4af2db Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 8 Jun 2009 21:31:11 +0000 Subject: [PATCH] Pullup ticket #2789 - requested by adrianp apache-tomcat6: security update Revisions pulled up: - www/apache-tomcat6/Makefile 1.2 - www/apache-tomcat6/PLIST 1.2 - www/apache-tomcat6/distinfo 1.2 --- Module Name: pkgsrc Committed By: adrianp Date: Sat Jun 6 17:34:08 UTC 2009 Modified Files: pkgsrc/www/apache-tomcat6: Makefile PLIST distinfo Log Message: Update from .18->.20 In brief: 46933: Update StringManager to use Java 5 features. Patch provided by Jens Kapitza. (markt) 46990: Fix synchronization issues reported by FindBugs. Patch provided by Sebb. (markt) Allow huge request body packets for AJP13. (rjung) Manager application prints FAIL if application was deployed but failed to start (fhanik) When shutdown port is disabled, print user friendly message and not a stack trace. (fhanik) The invoker servlet has been deprecated and will be removed in Tomcat 7 onwards. (markt) 45154 Implement SEND_FILE behavior for SSL connections using NIO (fhanik) For full details see: http://tomcat.apache.org/tomcat-6.0-doc/changelog.html --- www/apache-tomcat6/Makefile | 2 +- www/apache-tomcat6/PLIST | 94 +------------------------------------ www/apache-tomcat6/distinfo | 6 +-- 3 files changed, 6 insertions(+), 96 deletions(-) diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile index ac63b81b46a0..a530de4a1bba 100644 --- a/www/apache-tomcat6/Makefile +++ b/www/apache-tomcat6/Makefile @@ -22,7 +22,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" -TOMCAT_VER= 6.0.18 +TOMCAT_VER= 6.0.20 TOMCAT_HOME= ${PREFIX}/share/tomcat EGDIR= ${PREFIX}/share/examples/tomcat DOCDIR= ${PREFIX}/share/doc/tomcat diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST index 0162a714750f..4b61e03d6f85 100644 --- a/www/apache-tomcat6/PLIST +++ b/www/apache-tomcat6/PLIST @@ -1,7 +1,7 @@ @comment $NetBSD$ share/doc/tomcat/LICENSE -share/doc/tomcat/NOTICE share/doc/tomcat/RELEASE-NOTES +share/doc/tomcat/NOTICE share/doc/tomcat/RUNNING.txt share/examples/rc.d/tomcat share/examples/tomcat/catalina.policy @@ -51,7 +51,6 @@ share/tomcat/webapps/ROOT/tomcat-power.gif share/tomcat/webapps/ROOT/tomcat.gif share/tomcat/webapps/ROOT/tomcat.svg share/tomcat/webapps/docs/BUILDING.txt -share/tomcat/webapps/docs/NOTICE share/tomcat/webapps/docs/RELEASE-NOTES.txt share/tomcat/webapps/docs/RUNNING.txt share/tomcat/webapps/docs/WEB-INF/web.xml @@ -62,14 +61,6 @@ share/tomcat/webapps/docs/appdev/deployment.html share/tomcat/webapps/docs/appdev/index.html share/tomcat/webapps/docs/appdev/installation.html share/tomcat/webapps/docs/appdev/introduction.html -share/tomcat/webapps/docs/appdev/printer/deployment.html -share/tomcat/webapps/docs/appdev/printer/docs/appdev/build.xml.txt -share/tomcat/webapps/docs/appdev/printer/docs/appdev/web.xml.txt -share/tomcat/webapps/docs/appdev/printer/index.html -share/tomcat/webapps/docs/appdev/printer/installation.html -share/tomcat/webapps/docs/appdev/printer/introduction.html -share/tomcat/webapps/docs/appdev/printer/processes.html -share/tomcat/webapps/docs/appdev/printer/source.html share/tomcat/webapps/docs/appdev/processes.html share/tomcat/webapps/docs/appdev/sample/build.xml share/tomcat/webapps/docs/appdev/sample/docs/README.txt @@ -85,10 +76,6 @@ share/tomcat/webapps/docs/appdev/web.xml.txt share/tomcat/webapps/docs/apr.html share/tomcat/webapps/docs/architecture/index.html share/tomcat/webapps/docs/architecture/overview.html -share/tomcat/webapps/docs/architecture/printer/index.html -share/tomcat/webapps/docs/architecture/printer/overview.html -share/tomcat/webapps/docs/architecture/printer/requestProcess.html -share/tomcat/webapps/docs/architecture/printer/startup.html share/tomcat/webapps/docs/architecture/requestProcess.html share/tomcat/webapps/docs/architecture/requestProcess/requestProcess.pdf share/tomcat/webapps/docs/architecture/requestProcess/roseModel.mdl @@ -119,34 +106,9 @@ share/tomcat/webapps/docs/config/globalresources.html share/tomcat/webapps/docs/config/host.html share/tomcat/webapps/docs/config/http.html share/tomcat/webapps/docs/config/index.html +share/tomcat/webapps/docs/config/listeners.html share/tomcat/webapps/docs/config/loader.html share/tomcat/webapps/docs/config/manager.html -share/tomcat/webapps/docs/config/printer/ajp.html -share/tomcat/webapps/docs/config/printer/cluster-channel.html -share/tomcat/webapps/docs/config/printer/cluster-deployer.html -share/tomcat/webapps/docs/config/printer/cluster-interceptor.html -share/tomcat/webapps/docs/config/printer/cluster-listener.html -share/tomcat/webapps/docs/config/printer/cluster-manager.html -share/tomcat/webapps/docs/config/printer/cluster-membership.html -share/tomcat/webapps/docs/config/printer/cluster-receiver.html -share/tomcat/webapps/docs/config/printer/cluster-sender.html -share/tomcat/webapps/docs/config/printer/cluster-valve.html -share/tomcat/webapps/docs/config/printer/cluster.html -share/tomcat/webapps/docs/config/printer/context.html -share/tomcat/webapps/docs/config/printer/engine.html -share/tomcat/webapps/docs/config/printer/executor.html -share/tomcat/webapps/docs/config/printer/globalresources.html -share/tomcat/webapps/docs/config/printer/host.html -share/tomcat/webapps/docs/config/printer/http.html -share/tomcat/webapps/docs/config/printer/index.html -share/tomcat/webapps/docs/config/printer/loader.html -share/tomcat/webapps/docs/config/printer/manager.html -share/tomcat/webapps/docs/config/printer/realm.html -share/tomcat/webapps/docs/config/printer/resources.html -share/tomcat/webapps/docs/config/printer/server.html -share/tomcat/webapps/docs/config/printer/service.html -share/tomcat/webapps/docs/config/printer/systemprops.html -share/tomcat/webapps/docs/config/printer/valve.html share/tomcat/webapps/docs/config/realm.html share/tomcat/webapps/docs/config/resources.html share/tomcat/webapps/docs/config/server.html @@ -168,16 +130,6 @@ share/tomcat/webapps/docs/funcspecs/fs-jndi-realm.html share/tomcat/webapps/docs/funcspecs/fs-memory-realm.html share/tomcat/webapps/docs/funcspecs/index.html share/tomcat/webapps/docs/funcspecs/mbean-names.html -share/tomcat/webapps/docs/funcspecs/printer/fs-admin-apps.html -share/tomcat/webapps/docs/funcspecs/printer/fs-admin-objects.html -share/tomcat/webapps/docs/funcspecs/printer/fs-admin-opers.html -share/tomcat/webapps/docs/funcspecs/printer/fs-default.html -share/tomcat/webapps/docs/funcspecs/printer/fs-invoker.html -share/tomcat/webapps/docs/funcspecs/printer/fs-jdbc-realm.html -share/tomcat/webapps/docs/funcspecs/printer/fs-jndi-realm.html -share/tomcat/webapps/docs/funcspecs/printer/fs-memory-realm.html -share/tomcat/webapps/docs/funcspecs/printer/index.html -share/tomcat/webapps/docs/funcspecs/printer/mbean-names.html share/tomcat/webapps/docs/html-manager-howto.html share/tomcat/webapps/docs/images/add.gif share/tomcat/webapps/docs/images/asf-logo.gif @@ -200,41 +152,6 @@ share/tomcat/webapps/docs/manager-howto.html share/tomcat/webapps/docs/maven-jars.html share/tomcat/webapps/docs/mbeans-descriptor-howto.html share/tomcat/webapps/docs/monitoring.html -share/tomcat/webapps/docs/printer/BUILDING.txt -share/tomcat/webapps/docs/printer/NOTICE -share/tomcat/webapps/docs/printer/RUNNING.txt -share/tomcat/webapps/docs/printer/aio.html -share/tomcat/webapps/docs/printer/apr.html -share/tomcat/webapps/docs/printer/balancer-howto.html -share/tomcat/webapps/docs/printer/building.html -share/tomcat/webapps/docs/printer/cgi-howto.html -share/tomcat/webapps/docs/printer/changelog.html -share/tomcat/webapps/docs/printer/class-loader-howto.html -share/tomcat/webapps/docs/printer/cluster-howto.html -share/tomcat/webapps/docs/printer/connectors.html -share/tomcat/webapps/docs/printer/default-servlet.html -share/tomcat/webapps/docs/printer/deployer-howto.html -share/tomcat/webapps/docs/printer/developers.html -share/tomcat/webapps/docs/printer/extras.html -share/tomcat/webapps/docs/printer/html-manager-howto.html -share/tomcat/webapps/docs/printer/index.html -share/tomcat/webapps/docs/printer/introduction.html -share/tomcat/webapps/docs/printer/jasper-howto.html -share/tomcat/webapps/docs/printer/jndi-datasource-examples-howto.html -share/tomcat/webapps/docs/printer/jndi-resources-howto.html -share/tomcat/webapps/docs/printer/logging.html -share/tomcat/webapps/docs/printer/manager-howto.html -share/tomcat/webapps/docs/printer/maven-jars.html -share/tomcat/webapps/docs/printer/mbeans-descriptor-howto.html -share/tomcat/webapps/docs/printer/monitoring.html -share/tomcat/webapps/docs/printer/proxy-howto.html -share/tomcat/webapps/docs/printer/realm-howto.html -share/tomcat/webapps/docs/printer/security-manager-howto.html -share/tomcat/webapps/docs/printer/setup.html -share/tomcat/webapps/docs/printer/ssi-howto.html -share/tomcat/webapps/docs/printer/ssl-howto.html -share/tomcat/webapps/docs/printer/virtual-hosting-howto.html -share/tomcat/webapps/docs/printer/windows-service-howto.html share/tomcat/webapps/docs/proxy-howto.html share/tomcat/webapps/docs/realm-howto.html share/tomcat/webapps/docs/security-manager-howto.html @@ -621,15 +538,11 @@ share/tomcat/webapps/manager/xform.xsl @dirrm share/tomcat/webapps/examples/WEB-INF @dirrm share/tomcat/webapps/examples @dirrm share/tomcat/webapps/docs/tribes -@dirrm share/tomcat/webapps/docs/printer @dirrm share/tomcat/webapps/docs/images -@dirrm share/tomcat/webapps/docs/funcspecs/printer @dirrm share/tomcat/webapps/docs/funcspecs -@dirrm share/tomcat/webapps/docs/config/printer @dirrm share/tomcat/webapps/docs/config @dirrm share/tomcat/webapps/docs/architecture/startup @dirrm share/tomcat/webapps/docs/architecture/requestProcess -@dirrm share/tomcat/webapps/docs/architecture/printer @dirrm share/tomcat/webapps/docs/architecture @dirrm share/tomcat/webapps/docs/appdev/sample/web/images @dirrm share/tomcat/webapps/docs/appdev/sample/web/WEB-INF @@ -638,9 +551,6 @@ share/tomcat/webapps/manager/xform.xsl @dirrm share/tomcat/webapps/docs/appdev/sample/src @dirrm share/tomcat/webapps/docs/appdev/sample/docs @dirrm share/tomcat/webapps/docs/appdev/sample -@dirrm share/tomcat/webapps/docs/appdev/printer/docs/appdev -@dirrm share/tomcat/webapps/docs/appdev/printer/docs -@dirrm share/tomcat/webapps/docs/appdev/printer @dirrm share/tomcat/webapps/docs/appdev @dirrm share/tomcat/webapps/docs/api @dirrm share/tomcat/webapps/docs/WEB-INF diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo index 1729311d3284..e7bc45bcce30 100644 --- a/www/apache-tomcat6/distinfo +++ b/www/apache-tomcat6/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (apache-tomcat-6.0.18.tar.gz) = b4c98ee2d524a82ee126b6e990006504cbf5fdb7 -RMD160 (apache-tomcat-6.0.18.tar.gz) = 92a119a2dd90269b4141e0de47c79fbeb9ca9161 -Size (apache-tomcat-6.0.18.tar.gz) = 6142197 bytes +SHA1 (apache-tomcat-6.0.20.tar.gz) = 4f9d2650d1e4a5a7d053f78b73c2509e64ae6dfc +RMD160 (apache-tomcat-6.0.20.tar.gz) = e075b3fdce115843ed2c50b52cb05dd38a15ea0e +Size (apache-tomcat-6.0.20.tar.gz) = 5998298 bytes -- 2.41.0