Attachment 39126 Details for Bug 61766 – patch

[patch] patch

patch (text/plain), 6.21 KB, created by Jason Li on 2004-01-23 05:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Li

Created: 2004-01-23 05:00:31 UTC

Size: 6.21 KB

patch

obsolete

>diff -ru resin3.orig/Makefile resin3/Makefile
>--- resin3.orig/Makefile	Fri Nov 21 05:44:13 2003
>+++ resin3/Makefile	Fri Jan 23 12:13:53 2004
>@@ -8,8 +8,7 @@
> #
> 
> PORTNAME=	resin
>-PORTVERSION=	3.0.3
>-PORTREVISION=	1
>+PORTVERSION=	3.0.6
> CATEGORIES=	www java
> MASTER_SITES=	http://www.caucho.com/download/
> 
>diff -ru resin3.orig/distinfo resin3/distinfo
>--- resin3.orig/distinfo	Mon Sep 29 20:57:59 2003
>+++ resin3/distinfo	Fri Jan 23 12:13:53 2004
>@@ -1 +1 @@
>-MD5 (resin-3.0.3.tar.gz) = 3ac2280481f81a3ffd4b395498e32dc6
>+MD5 (resin-3.0.6.tar.gz) = 032fc45db04945a95cb080fda1b8f216
>diff -ru resin3.orig/files/patch-apache-Makefile.in resin3/files/patch-apache-Makefile.in
>--- resin3.orig/files/patch-apache-Makefile.in	Fri Nov 21 05:44:14 2003
>+++ resin3/files/patch-apache-Makefile.in	Fri Jan 23 12:13:53 2004
>@@ -1,6 +1,6 @@
> --- src/c/plugin/apache/Makefile.in.orig	Thu Nov 13 09:27:52 2003
> +++ src/c/plugin/apache/Makefile.in	Thu Nov 13 09:28:36 2003
>-@@ -28,8 +28,7 @@
>+@@ -29,8 +29,7 @@
>  	$(CC) -c $(INCLUDES) $(CFLAGS) $<
>  
>  install	:
>Only in resin3.orig/files: patch-apache2
>diff -ru resin3.orig/files/patch-resin.conf resin3/files/patch-resin.conf
>--- resin3.orig/files/patch-resin.conf	Mon Sep 29 20:57:59 2003
>+++ resin3/files/patch-resin.conf	Fri Jan 23 12:13:53 2004
>@@ -1,11 +1,11 @@
>---- conf/resin.conf.orig	Mon Sep 29 10:29:29 2003
>-+++ conf/resin.conf	Mon Sep 29 10:29:48 2003
>-@@ -37,7 +37,7 @@
>+--- conf/resin.conf.orig	Wed Jan 21 01:46:58 2004
>++++ conf/resin.conf	Fri Jan 23 12:09:34 2004
>+@@ -63,7 +63,7 @@
>      </class-loader>
>  
>      
>--    <http id='' host='*' port='8080'/>
>-+    <http id='' host='*' port='%%PORT%%'/>
>+-    <http id="" host="*" port="8080"/>
>++    <http id="" host="*" port="%%PORT%%"/>
>  
>      <!--
>         - SSL port configuration:
>diff -ru resin3.orig/pkg-plist resin3/pkg-plist
>--- resin3.orig/pkg-plist	Fri Nov 21 08:28:47 2003
>+++ resin3/pkg-plist	Fri Jan 23 12:47:15 2004
>@@ -1,13 +1,6 @@
>-%%APP_NAME%%/doc/beta.xtp
> %%APP_NAME%%/doc/changes-1.xtp
> %%APP_NAME%%/doc/changes.xtp
>-%%APP_NAME%%/doc/errata.xtp
>-%%APP_NAME%%/doc/features.xtp
>-%%APP_NAME%%/doc/future.xtp
>-%%APP_NAME%%/doc/index.xtp
>-%%APP_NAME%%/doc/href-map.xml
>-%%APP_NAME%%/doc/toc.xml
>-%%APP_NAME%%/doc/images/caucho-blue.gif
>+%%APP_NAME%%/doc/css/default.css
> %%APP_NAME%%/doc/images/apache_srun.gif
> %%APP_NAME%%/doc/images/appserver.gif
> %%APP_NAME%%/doc/images/background.gif
>@@ -15,6 +8,7 @@
> %%APP_NAME%%/doc/images/ball8.gif
> %%APP_NAME%%/doc/images/bean.gif
> %%APP_NAME%%/doc/images/bean1.gif
>+%%APP_NAME%%/doc/images/caucho-white.jpg
> %%APP_NAME%%/doc/images/caucho.gif
> %%APP_NAME%%/doc/images/compiler.gif
> %%APP_NAME%%/doc/images/file.gif
>@@ -24,6 +18,7 @@
> %%APP_NAME%%/doc/images/iis_srun.gif
> %%APP_NAME%%/doc/images/jndi_tree.gif
> %%APP_NAME%%/doc/images/jsp.gif
>+%%APP_NAME%%/doc/images/left_background.gif
> %%APP_NAME%%/doc/images/logo.gif
> %%APP_NAME%%/doc/images/pixel.gif
> %%APP_NAME%%/doc/images/resin_powered.gif
>@@ -34,64 +29,70 @@
> %%APP_NAME%%/doc/images/style.gif
> %%APP_NAME%%/doc/images/webserver.gif
> %%APP_NAME%%/doc/images/website_srun.gif
>-%%APP_NAME%%/doc/images/caucho.jpg
>-%%APP_NAME%%/doc/images/.xvpics/background.gif
>-%%APP_NAME%%/doc/images/.xvpics/left_background.gif
>-%%APP_NAME%%/doc/images/caucho-white.jpg
>-%%APP_NAME%%/doc/images/left_background.gif
>-%%APP_NAME%%/lib/resin.jar
>-%%APP_NAME%%/lib/jsdk24.jar
>-%%APP_NAME%%/lib/jta_101.jar
>+%%APP_NAME%%/doc/index.xtp
>+%%APP_NAME%%/doc/toc.xml
>+%%APP_NAME%%/lib/dom.jar
> %%APP_NAME%%/lib/isorelax.jar
>-%%APP_NAME%%/lib/jmx.jar
> %%APP_NAME%%/lib/jca-15.jar
>+%%APP_NAME%%/lib/jmx-12.jar
>+%%APP_NAME%%/lib/jsdk-24.jar
> %%APP_NAME%%/lib/jstl-11.jar
>+%%APP_NAME%%/lib/jta-101.jar
>+%%APP_NAME%%/lib/license.jar
>+%%APP_NAME%%/lib/resin.jar
> %%APP_NAME%%/lib/webutil.jar
>+%%APP_NAME%%/libexec/libresin.so
>+%%APP_NAME%%/libexec/libresinssl.so
> %%APP_NAME%%/xsl/caucho/comment.xsl
> %%APP_NAME%%/xsl/caucho/contents.xsl
> %%APP_NAME%%/xsl/caucho/control.xsl
> %%APP_NAME%%/xsl/caucho/debug.xsl
> %%APP_NAME%%/xsl/caucho/defaultcopy.xsl
> %%APP_NAME%%/xsl/caucho/format.xsl
>-%%APP_NAME%%/xsl/caucho/newstyle.xsl
>-%%APP_NAME%%/xsl/caucho/weblog.xsl
> %%APP_NAME%%/xsl/caucho/fun.xsl
> %%APP_NAME%%/xsl/caucho/href.xsl
> %%APP_NAME%%/xsl/caucho/include.xsl
>+%%APP_NAME%%/xsl/caucho/newstyle.xsl
> %%APP_NAME%%/xsl/caucho/nodeinfo.xsl
> %%APP_NAME%%/xsl/caucho/toc.xsl
> %%APP_NAME%%/xsl/caucho/viewfile.xsl
>+%%APP_NAME%%/xsl/caucho/weblog.xsl
> %%APP_NAME%%/xsl/caucho_default.xsl
> %%APP_NAME%%/xsl/caucho_header.xsl
> %%APP_NAME%%/xsl/caucho_subpage.xsl
> %%APP_NAME%%/xsl/default.xsl
> %%APP_NAME%%/xsl/doc_header.xsl
> %%APP_NAME%%/xsl/header.xsl
>+%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl
>+%%APP_NAME%%/xsl/js/caucho/format.xsl
>+%%APP_NAME%%/xsl/js/caucho/weblog.xsl
> %%APP_NAME%%/xsl/js_header.xsl
> %%APP_NAME%%/xsl/new_doc_header.xsl
> %%APP_NAME%%/xsl/search.xsl
> %%APP_NAME%%/xsl/subpage.xsl
>-%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl
>-%%APP_NAME%%/xsl/js/caucho/format.xsl
>-%%APP_NAME%%/xsl/js/caucho/weblog.xsl
>-%%APP_NAME%%/libexec/libresin.so
>-%%APP_NAME%%/libexec/libresinssl.so
>+%%APP_NAME%%/xsl/tools/indexer.xsl
> etc/app-default.xml
> etc/rc.d/%%APP_NAME%%.sh
> sbin/%%APP_NAME%%ctl
> %%MOD_DIR%%/mod_caucho.so
> %%APACHE%%@exec %%APXS%% -e -a -n caucho %f
> %%APACHE%%@unexec %%APXS%% -e -A -n caucho %f
>-@dirrm %%APP_NAME%%/doc/images/.xvpics
>-@dirrm %%APP_NAME%%/doc/images
>-@dirrm %%APP_NAME%%/doc
>-@dirrm %%APP_NAME%%/lib
>-@dirrm %%APP_NAME%%/xsl/caucho
>+@dirrm share/nls/en_US.US-ASCII
>+@dirrm share/nls/POSIX
>+@dirrm %%APP_NAME%%/xsl/tools
> @dirrm %%APP_NAME%%/xsl/js/caucho
> @dirrm %%APP_NAME%%/xsl/js
>+@dirrm %%APP_NAME%%/xsl/caucho
> @dirrm %%APP_NAME%%/xsl
>+@dirrm %%APP_NAME%%/libexec/apache-2.0
>+@dirrm %%APP_NAME%%/libexec/apache-1.3
> @dirrm %%APP_NAME%%/libexec
>-@dirrm %%APP_NAME%%
>+@dirrm %%APP_NAME%%/lib
>+@dirrm %%APP_NAME%%/doc/images
>+@dirrm %%APP_NAME%%/doc/css
>+@dirrm %%APP_NAME%%/doc
>+@dirrm resin3
> @unexec if cmp -s %D/etc/%%APP_NAME%%.xml %D/etc/%%APP_NAME%%.xml-dist; then rm -f %D/etc/%%APP_NAME%%.xml; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%.xml must be removed manually; fi
> etc/%%APP_NAME%%.xml-dist
> @exec if test -f %B/%%APP_NAME%%.xml ; then echo Keeping %B/%%APP_NAME%%.xml intact from previous installation; else cp %F %B/%%APP_NAME%%.xml; fi
>+
>Only in resin3.orig: resin3

Actions: View | Diff

Attachments on bug 61766: 39126