aboutsummaryrefslogtreecommitdiffstats
path: root/www/dokuwiki
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-06-05 05:50:48 +0800
committerdelphij <delphij@FreeBSD.org>2009-06-05 05:50:48 +0800
commitf10c5f1e1dfe11c402067c8758bb6b17163a14a7 (patch)
tree0213d96290437b9fba6cc3244809f8c4fda11008 /www/dokuwiki
parente5c85615f0a37e268c198e71b247502ed8c1d53c (diff)
downloadfreebsd-ports-gnome-f10c5f1e1dfe11c402067c8758bb6b17163a14a7.tar.gz
freebsd-ports-gnome-f10c5f1e1dfe11c402067c8758bb6b17163a14a7.tar.zst
freebsd-ports-gnome-f10c5f1e1dfe11c402067c8758bb6b17163a14a7.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
Diffstat (limited to 'www/dokuwiki')
-rw-r--r--www/dokuwiki/Makefile2
-rw-r--r--www/dokuwiki/files/patch-FS#170033
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(