diff options
| author | Xin LI <delphij@FreeBSD.org> | 2009-06-04 21:50:48 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2009-06-04 21:50:48 +0000 |
| commit | 07831aeffcee3b6c51fb6a4e3846d4bc39da39b1 (patch) | |
| tree | e348a49ffa35594b4cb837ffc46574158ae6d20c /www/dokuwiki | |
| parent | 9025fdead5c317113a1afa379f39f0f0f9dbc48c (diff) | |
| download | ports-07831aeffcee3b6c51fb6a4e3846d4bc39da39b1.tar.gz ports-07831aeffcee3b6c51fb6a4e3846d4bc39da39b1.zip | |
Apply a vendor security fix (2009-02-14b) for a local file disclosure
vulnerability.
Security: 4f838b74-50a1-11de-b01f-001c2514716c
With hat: ports-security
Notes
Notes:
svn path=/head/; revision=235175
Diffstat (limited to 'www/dokuwiki')
| -rw-r--r-- | www/dokuwiki/Makefile | 2 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-FS#1700 | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index 0d5a0e4e02b1..1964760c6986 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -7,7 +7,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.splitbrain.org/_media/projects/dokuwiki/ \ LOCAL/chinsan/${PORTNAME} diff --git a/www/dokuwiki/files/patch-FS#1700 b/www/dokuwiki/files/patch-FS#1700 new file mode 100644 index 000000000000..7b414845891d --- /dev/null +++ b/www/dokuwiki/files/patch-FS#1700 @@ -0,0 +1,33 @@ +--- VERSION 2009-02-14 04:13:26.000000000 -0800 ++++ VERSION 2009-05-26 07:56:56.000000000 -0700 +@@ -1 +1 @@ +-2009-02-14 ++2009-02-14b +--- conf/msg 2009-02-14 04:13:24.000000000 -0800 ++++ conf/msg 2009-05-26 07:56:29.000000000 -0700 +@@ -1,4 +1,4 @@ +-17 ++18 + The first line of this file contains a number, indicating + which notification messages should not be displayed. This + is the only information sent to dokuwiki.org when the +--- inc/init.php 2009-02-14 04:13:24.000000000 -0800 ++++ inc/init.php 2009-05-26 07:54:37.000000000 -0700 +@@ -10,6 +10,9 @@ + } + define('DOKU_START_TIME', delta_time()); + ++ global $config_cascade; ++ $config_cascade = ''; ++ + // if available load a preload config file + $preload = fullpath(dirname(__FILE__)).'/preload.php'; + if (@file_exists($preload)) include($preload); +@@ -42,7 +45,6 @@ + global $cache_metadata; $cache_metadata = array(); + + //set the configuration cascade - but only if its not already been set in preload.php +- global $config_cascade; + if (empty($config_cascade)) { + $config_cascade = array( + 'main' => array( |