aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2010-01-14 07:30:43 +0800
committerdelphij <delphij@FreeBSD.org>2010-01-14 07:30:43 +0800
commit2105a93c895d488d036a56392325557903c64ef3 (patch)
tree7172ac32f3a9f75980a5f7cce32b78d00697cd94
parent2bcf7e75138fc20d24511e9b5904abf442fa2227 (diff)
downloadfreebsd-ports-gnome-2105a93c895d488d036a56392325557903c64ef3.tar.gz
freebsd-ports-gnome-2105a93c895d488d036a56392325557903c64ef3.tar.zst
freebsd-ports-gnome-2105a93c895d488d036a56392325557903c64ef3.zip
Fix a minor information leak issue which will expose directories outside
the wiki root (not their contents though). This commit actually upgraded the port to 2009-12-25b by adding the patch file. For details please consult: http://bugs.splitbrain.org/index.php?do=details&task_id=1847 Sponsored by: iXsystems, Inc.
-rw-r--r--www/dokuwiki/Makefile1
-rw-r--r--www/dokuwiki/files/patch-20091225b39
2 files changed, 40 insertions, 0 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 4a4608ac4875..80caece35efe 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dokuwiki
PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g}
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.splitbrain.org/_media/projects/dokuwiki/ \
LOCAL/chinsan/${PORTNAME}
diff --git a/www/dokuwiki/files/patch-20091225b b/www/dokuwiki/files/patch-20091225b
new file mode 100644
index 000000000000..0c31c2ec4f10
--- /dev/null
+++ b/www/dokuwiki/files/patch-20091225b
@@ -0,0 +1,39 @@
+diff -u -r -N VERSION VERSION
+--- VERSION 2009-12-25 02:14:45.000000000 -0800
++++ VERSION 2010-01-13 09:21:13.000000000 -0800
+@@ -1 +1 @@
+-2009-12-25 "Lemming"
++2009-12-25b "Lemming"
+diff -u -r -N conf/msg conf/msg
+--- conf/msg 2009-12-25 02:14:41.000000000 -0800
++++ conf/msg 2010-01-13 08:25:37.000000000 -0800
+@@ -1,4 +1,4 @@
+-23
++24
+ 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
+diff -u -r -N lib/plugins/acl/ajax.php lib/plugins/acl/ajax.php
+--- lib/plugins/acl/ajax.php 2009-12-25 02:14:41.000000000 -0800
++++ lib/plugins/acl/ajax.php 2010-01-13 08:25:37.000000000 -0800
+@@ -16,9 +16,11 @@
+ require_once(DOKU_INC.'inc/common.php');
+ require_once(DOKU_INC.'inc/pageutils.php');
+ require_once(DOKU_INC.'inc/auth.php');
+-//close sesseion
++//close session
+ session_write_close();
+
++if(!auth_isadmin()) die('forbidden');
++
+ $ID = getID();
+
+ if(!auth_isadmin) die('for admins only');
+@@ -42,6 +44,7 @@
+ if($ns == '*'){
+ $ns ='';
+ }
++ $ns = cleanID($ns);
+ $lvl = count(explode(':',$ns));
+ $ns = utf8_encodeFN(str_replace(':','/',$ns));
+