===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/Makefile /usr/home/chinsan/project/dokuwiki/Makefile --- /usr/ports/www/dokuwiki/Makefile Wed Oct 4 01:28:39 2006 +++ /usr/home/chinsan/project/dokuwiki/Makefile Sat Oct 7 20:49:59 2006 @@ -7,7 +7,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= http://www.splitbrain.org/_media/projects/dokuwiki/ \ http://dev.splitbrain.org/browse/snapshots/ @@ -17,7 +17,7 @@ MAINTAINER= chinsan@FreeBSD.org COMMENT= A simple and easy to use wiki, no database required -DIST_VER= ${PORTNAME}-2006-03-09 +DIST_VER= ${PORTNAME}-2006-03-09e USE_PHP= gd mbstring pcre session xml zlib NO_BUILD= YES WANT_PHP_WEB= YES diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/distinfo /usr/home/chinsan/project/dokuwiki/distinfo --- /usr/ports/www/dokuwiki/distinfo Sat Jun 10 03:57:54 2006 +++ /usr/home/chinsan/project/dokuwiki/distinfo Sat Oct 7 20:50:23 2006 @@ -1,3 +1,3 @@ -MD5 (dokuwiki-2006-03-09.tgz) = 73db29a2e92f5708d91cf1a535290000 -SHA256 (dokuwiki-2006-03-09.tgz) = 1976d90c2a32dcc2d3a6644f8a7f09d152bc3ebcb7fd09aaf0aacaca68dd7507 -SIZE (dokuwiki-2006-03-09.tgz) = 835163 +MD5 (dokuwiki-2006-03-09e.tgz) = d6d3aa9e2f32ebbdb04ee07cd84a19e5 +SHA256 (dokuwiki-2006-03-09e.tgz) = 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93 +SIZE (dokuwiki-2006-03-09e.tgz) = 835945 diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/files/patch-lib-exe-fetch.php /usr/home/chinsan/project/dokuwiki/files/patch-lib-exe-fetch.php --- /usr/ports/www/dokuwiki/files/patch-lib-exe-fetch.php Sat Sep 30 13:36:26 2006 +++ /usr/home/chinsan/project/dokuwiki/files/patch-lib-exe-fetch.php Thu Jan 1 08:00:00 1970 @@ -1,24 +0,0 @@ ---- lib/exe/fetch.php.bak Fri Mar 10 04:32:34 2006 -+++ lib/exe/fetch.php Fri Sep 29 12:54:09 2006 -@@ -21,8 +21,8 @@ - //get input - $MEDIA = getID('media',false); // no cleaning - maybe external - $CACHE = calc_cache($_REQUEST['cache']); -- $WIDTH = $_REQUEST['w']; -- $HEIGHT = $_REQUEST['h']; -+ $WIDTH = (int) $_REQUEST['w']; -+ $HEIGHT = (int) $_REQUEST['h']; - list($EXT,$MIME) = mimetype($MEDIA); - if($EXT === false){ - $EXT = 'unknown'; -@@ -198,6 +198,10 @@ - $info = getimagesize($file); - if(!$h) $h = round(($w * $info[1]) / $info[0]); - -+ /* -+ * This is the fix for http://bugs.splitbrain.org/?do=details&id=924 -+ */ -+ if($w > 2000 || $h > 2000) return $file; - - //cache - $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext); diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/pkg-plist /usr/home/chinsan/project/dokuwiki/pkg-plist --- /usr/ports/www/dokuwiki/pkg-plist Sat Jun 24 05:09:31 2006 +++ /usr/home/chinsan/project/dokuwiki/pkg-plist Sat Oct 7 20:55:57 2006 @@ -2,6 +2,7 @@ %%DOKUWIKI_DIR%%/COPYING %%DOKUWIKI_DIR%%/README %%DOKUWIKI_DIR%%/VERSION +%%DOKUWIKI_DIR%%/bin/.htaccess %%DOKUWIKI_DIR%%/bin/dwpage.php %%DOKUWIKI_DIR%%/bin/indexer.php %%DOKUWIKI_DIR%%/bin/wantedpages.php @@ -29,6 +30,7 @@ %%DOKUWIKI_DIR%%/data/pages/wiki/syntax.txt %%DOKUWIKI_DIR%%/doku.php %%DOKUWIKI_DIR%%/feed.php +%%DOKUWIKI_DIR%%/inc/.htaccess %%DOKUWIKI_DIR%%/inc/DifferenceEngine.php %%DOKUWIKI_DIR%%/inc/HTTPClient.php %%DOKUWIKI_DIR%%/inc/JSON.php ===> Done