diff options
| author | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-10-09 17:06:42 +0000 |
|---|---|---|
| committer | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-10-09 17:06:42 +0000 |
| commit | c8565321dd06f75accae54d82634c438a9dbd5f0 (patch) | |
| tree | b7e53a4df7b02b9767207f76f0eaa6b89a13d054 /www | |
| parent | fefe2fb57aee07ed837c919ea036b3c148649361 (diff) | |
| download | ports-c8565321dd06f75accae54d82634c438a9dbd5f0.tar.gz ports-c8565321dd06f75accae54d82634c438a9dbd5f0.zip | |
upgrade of www/dokuwiki to release 2006-03-09e, as it fixes a bunch of urgent security bugs
PR: ports/103982
Submitted by: Tomas Verbaitis <tomasv_AT_megalogika dot lt>
Reviewed by: chinsan
Approved by: maintainer (chinsan)
Notes
Notes:
svn path=/head/; revision=175114
Diffstat (limited to 'www')
| -rw-r--r-- | www/dokuwiki/Makefile | 4 | ||||
| -rw-r--r-- | www/dokuwiki/distinfo | 6 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-lib-exe-fetch.php | 24 | ||||
| -rw-r--r-- | www/dokuwiki/pkg-plist | 2 |
4 files changed, 7 insertions, 29 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index 57aa5477ee2e..4605cdb780c8 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -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 @@ EXTRACT_SUFX= .tgz 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 --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo index e38c54a01889..f443def37fd3 100644 --- a/www/dokuwiki/distinfo +++ b/www/dokuwiki/distinfo @@ -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 --git a/www/dokuwiki/files/patch-lib-exe-fetch.php b/www/dokuwiki/files/patch-lib-exe-fetch.php deleted file mode 100644 index 6210e59c9ea3..000000000000 --- a/www/dokuwiki/files/patch-lib-exe-fetch.php +++ /dev/null @@ -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 --git a/www/dokuwiki/pkg-plist b/www/dokuwiki/pkg-plist index bf5ee1739683..667b0c1dbdd2 100644 --- a/www/dokuwiki/pkg-plist +++ b/www/dokuwiki/pkg-plist @@ -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 |