Attachment 97910 Details for Bug 136727 – file.diff

[patch] file.diff

file.diff (text/plain), 9.54 KB, created by Mike Jakubik on 2009-07-13 21:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Jakubik

Created: 2009-07-13 21:50:01 UTC

Size: 9.54 KB

patch

obsolete

>diff -urN tomcat6.orig/Makefile tomcat6/Makefile
>--- tomcat6.orig/Makefile       2008-12-29 22:21:58.000000000 -0500
>+++ tomcat6/Makefile    2009-07-13 16:38:35.000000000 -0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=      apache-tomcat
>-PORTVERSION=   6.0.18
>+PORTVERSION=   6.0.20
> CATEGORIES=    www java
> MASTER_SITES=  ${MASTER_SITE_APACHE}
> MASTER_SITE_SUBDIR=    tomcat/tomcat-6/v${PORTVERSION}/bin
>diff -urN tomcat6.orig/distinfo tomcat6/distinfo
>--- tomcat6.orig/distinfo       2008-12-09 02:13:59.000000000 -0500
>+++ tomcat6/distinfo    2009-07-13 16:38:35.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (apache-tomcat-6.0.18.tar.gz) = 8354e156f097158f8d7b699078fd39c1
>-SHA256 (apache-tomcat-6.0.18.tar.gz) = bbbf01a91587c7133b8555abf415d72610f233c42544dc9f819df7382e7791b2
>-SIZE (apache-tomcat-6.0.18.tar.gz) = 6142197
>+MD5 (apache-tomcat-6.0.20.tar.gz) = 5944999abe79d01dc2ee7776d9d57873
>+SHA256 (apache-tomcat-6.0.20.tar.gz) = a443c1720dc25d0963dd47b299b4c5e81d51462147c351f18e5c59bf7646046e
>+SIZE (apache-tomcat-6.0.20.tar.gz) = 5998298
>diff -urN tomcat6.orig/pkg-plist tomcat6/pkg-plist
>--- tomcat6.orig/pkg-plist      2008-12-09 02:13:59.000000000 -0500
>+++ tomcat6/pkg-plist   2009-07-13 16:38:35.000000000 -0400
>@@ -60,7 +60,6 @@
> apache-tomcat6.0/webapps/ROOT/tomcat.gif
> apache-tomcat6.0/webapps/ROOT/tomcat.svg
> apache-tomcat6.0/webapps/docs/BUILDING.txt
>-apache-tomcat6.0/webapps/docs/NOTICE
> apache-tomcat6.0/webapps/docs/RELEASE-NOTES.txt
> apache-tomcat6.0/webapps/docs/RUNNING.txt
> apache-tomcat6.0/webapps/docs/WEB-INF/web.xml
>@@ -71,14 +70,6 @@
> apache-tomcat6.0/webapps/docs/appdev/index.html
> apache-tomcat6.0/webapps/docs/appdev/installation.html
> apache-tomcat6.0/webapps/docs/appdev/introduction.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/deployment.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/docs/appdev/build.xml.txt
>-apache-tomcat6.0/webapps/docs/appdev/printer/docs/appdev/web.xml.txt
>-apache-tomcat6.0/webapps/docs/appdev/printer/index.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/installation.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/introduction.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/processes.html
>-apache-tomcat6.0/webapps/docs/appdev/printer/source.html
> apache-tomcat6.0/webapps/docs/appdev/processes.html
> apache-tomcat6.0/webapps/docs/appdev/sample/build.xml
> apache-tomcat6.0/webapps/docs/appdev/sample/docs/README.txt
>@@ -94,10 +85,6 @@
> apache-tomcat6.0/webapps/docs/apr.html
> apache-tomcat6.0/webapps/docs/architecture/index.html
> apache-tomcat6.0/webapps/docs/architecture/overview.html
>-apache-tomcat6.0/webapps/docs/architecture/printer/index.html
>-apache-tomcat6.0/webapps/docs/architecture/printer/overview.html
>-apache-tomcat6.0/webapps/docs/architecture/printer/requestProcess.html
>-apache-tomcat6.0/webapps/docs/architecture/printer/startup.html
> apache-tomcat6.0/webapps/docs/architecture/requestProcess.html
> apache-tomcat6.0/webapps/docs/architecture/requestProcess/requestProcess.pdf
> apache-tomcat6.0/webapps/docs/architecture/requestProcess/roseModel.mdl
>@@ -128,34 +115,9 @@
> apache-tomcat6.0/webapps/docs/config/host.html
> apache-tomcat6.0/webapps/docs/config/http.html
> apache-tomcat6.0/webapps/docs/config/index.html
>+apache-tomcat6.0/webapps/docs/config/listeners.html
> apache-tomcat6.0/webapps/docs/config/loader.html
> apache-tomcat6.0/webapps/docs/config/manager.html
>-apache-tomcat6.0/webapps/docs/config/printer/ajp.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-channel.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-deployer.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-interceptor.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-listener.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-manager.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-membership.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-receiver.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-sender.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster-valve.html
>-apache-tomcat6.0/webapps/docs/config/printer/cluster.html
>-apache-tomcat6.0/webapps/docs/config/printer/context.html
>-apache-tomcat6.0/webapps/docs/config/printer/engine.html
>-apache-tomcat6.0/webapps/docs/config/printer/executor.html
>-apache-tomcat6.0/webapps/docs/config/printer/globalresources.html
>-apache-tomcat6.0/webapps/docs/config/printer/host.html
>-apache-tomcat6.0/webapps/docs/config/printer/http.html
>-apache-tomcat6.0/webapps/docs/config/printer/index.html
>-apache-tomcat6.0/webapps/docs/config/printer/loader.html
>-apache-tomcat6.0/webapps/docs/config/printer/manager.html
>-apache-tomcat6.0/webapps/docs/config/printer/realm.html
>-apache-tomcat6.0/webapps/docs/config/printer/resources.html
>-apache-tomcat6.0/webapps/docs/config/printer/server.html
>-apache-tomcat6.0/webapps/docs/config/printer/service.html
>-apache-tomcat6.0/webapps/docs/config/printer/systemprops.html
>-apache-tomcat6.0/webapps/docs/config/printer/valve.html
> apache-tomcat6.0/webapps/docs/config/realm.html
> apache-tomcat6.0/webapps/docs/config/resources.html
> apache-tomcat6.0/webapps/docs/config/server.html
>@@ -177,16 +139,6 @@
> apache-tomcat6.0/webapps/docs/funcspecs/fs-memory-realm.html
> apache-tomcat6.0/webapps/docs/funcspecs/index.html
> apache-tomcat6.0/webapps/docs/funcspecs/mbean-names.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-admin-apps.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-admin-objects.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-admin-opers.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-default.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-invoker.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-jdbc-realm.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-jndi-realm.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/fs-memory-realm.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/index.html
>-apache-tomcat6.0/webapps/docs/funcspecs/printer/mbean-names.html
> apache-tomcat6.0/webapps/docs/html-manager-howto.html
> apache-tomcat6.0/webapps/docs/images/add.gif
> apache-tomcat6.0/webapps/docs/images/asf-logo.gif
>@@ -209,41 +161,6 @@
> apache-tomcat6.0/webapps/docs/maven-jars.html
> apache-tomcat6.0/webapps/docs/mbeans-descriptor-howto.html
> apache-tomcat6.0/webapps/docs/monitoring.html
>-apache-tomcat6.0/webapps/docs/printer/BUILDING.txt
>-apache-tomcat6.0/webapps/docs/printer/NOTICE
>-apache-tomcat6.0/webapps/docs/printer/RUNNING.txt
>-apache-tomcat6.0/webapps/docs/printer/aio.html
>-apache-tomcat6.0/webapps/docs/printer/apr.html
>-apache-tomcat6.0/webapps/docs/printer/balancer-howto.html
>-apache-tomcat6.0/webapps/docs/printer/building.html
>-apache-tomcat6.0/webapps/docs/printer/cgi-howto.html
>-apache-tomcat6.0/webapps/docs/printer/changelog.html
>-apache-tomcat6.0/webapps/docs/printer/class-loader-howto.html
>-apache-tomcat6.0/webapps/docs/printer/cluster-howto.html
>-apache-tomcat6.0/webapps/docs/printer/connectors.html
>-apache-tomcat6.0/webapps/docs/printer/default-servlet.html
>-apache-tomcat6.0/webapps/docs/printer/deployer-howto.html
>-apache-tomcat6.0/webapps/docs/printer/developers.html
>-apache-tomcat6.0/webapps/docs/printer/extras.html
>-apache-tomcat6.0/webapps/docs/printer/html-manager-howto.html
>-apache-tomcat6.0/webapps/docs/printer/index.html
>-apache-tomcat6.0/webapps/docs/printer/introduction.html
>-apache-tomcat6.0/webapps/docs/printer/jasper-howto.html
>-apache-tomcat6.0/webapps/docs/printer/jndi-datasource-examples-howto.html
>-apache-tomcat6.0/webapps/docs/printer/jndi-resources-howto.html
>-apache-tomcat6.0/webapps/docs/printer/logging.html
>-apache-tomcat6.0/webapps/docs/printer/manager-howto.html
>-apache-tomcat6.0/webapps/docs/printer/maven-jars.html
>-apache-tomcat6.0/webapps/docs/printer/mbeans-descriptor-howto.html
>-apache-tomcat6.0/webapps/docs/printer/monitoring.html
>-apache-tomcat6.0/webapps/docs/printer/proxy-howto.html
>-apache-tomcat6.0/webapps/docs/printer/realm-howto.html
>-apache-tomcat6.0/webapps/docs/printer/security-manager-howto.html
>-apache-tomcat6.0/webapps/docs/printer/setup.html
>-apache-tomcat6.0/webapps/docs/printer/ssi-howto.html
>-apache-tomcat6.0/webapps/docs/printer/ssl-howto.html
>-apache-tomcat6.0/webapps/docs/printer/virtual-hosting-howto.html
>-apache-tomcat6.0/webapps/docs/printer/windows-service-howto.html
> apache-tomcat6.0/webapps/docs/proxy-howto.html
> apache-tomcat6.0/webapps/docs/realm-howto.html
> apache-tomcat6.0/webapps/docs/security-manager-howto.html
>@@ -631,15 +548,11 @@
> @dirrm apache-tomcat6.0/webapps/examples/WEB-INF
> @dirrm apache-tomcat6.0/webapps/examples
> @dirrm apache-tomcat6.0/webapps/docs/tribes
>-@dirrm apache-tomcat6.0/webapps/docs/printer
> @dirrm apache-tomcat6.0/webapps/docs/images
>-@dirrm apache-tomcat6.0/webapps/docs/funcspecs/printer
> @dirrm apache-tomcat6.0/webapps/docs/funcspecs
>-@dirrm apache-tomcat6.0/webapps/docs/config/printer
> @dirrm apache-tomcat6.0/webapps/docs/config
> @dirrm apache-tomcat6.0/webapps/docs/architecture/startup
> @dirrm apache-tomcat6.0/webapps/docs/architecture/requestProcess
>-@dirrm apache-tomcat6.0/webapps/docs/architecture/printer
> @dirrm apache-tomcat6.0/webapps/docs/architecture
> @dirrm apache-tomcat6.0/webapps/docs/appdev/sample/web/images
> @dirrm apache-tomcat6.0/webapps/docs/appdev/sample/web/WEB-INF
>@@ -648,9 +561,6 @@
> @dirrm apache-tomcat6.0/webapps/docs/appdev/sample/src
> @dirrm apache-tomcat6.0/webapps/docs/appdev/sample/docs
> @dirrm apache-tomcat6.0/webapps/docs/appdev/sample
>-@dirrm apache-tomcat6.0/webapps/docs/appdev/printer/docs/appdev
>-@dirrm apache-tomcat6.0/webapps/docs/appdev/printer/docs
>-@dirrm apache-tomcat6.0/webapps/docs/appdev/printer
> @dirrm apache-tomcat6.0/webapps/docs/appdev
> @dirrm apache-tomcat6.0/webapps/docs/api
> @dirrm apache-tomcat6.0/webapps/docs/WEB-INF

Actions: View | Diff

Attachments on bug 136727: 97910