svn commit: r382162 - in branches/2015Q1/www/dokuwiki: . files
Xin LI
delphij at FreeBSD.org
Tue Mar 24 19:32:10 UTC 2015
Author: delphij
Date: Tue Mar 24 19:32:07 2015
New Revision: 382162
URL: https://svnweb.freebsd.org/changeset/ports/382162
QAT: https://qat.redports.org/buildarchive/r382162/
Log:
Update to 2014-09-29d.
Approved by: ports-secteam@
Added:
branches/2015Q1/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c
- copied unchanged from r379842, head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c
branches/2015Q1/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d
- copied unchanged from r382024, head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d
Modified:
branches/2015Q1/www/dokuwiki/Makefile
branches/2015Q1/www/dokuwiki/pkg-descr
branches/2015Q1/www/dokuwiki/pkg-plist
Directory Properties:
branches/2015Q1/ (props changed)
Modified: branches/2015Q1/www/dokuwiki/Makefile
==============================================================================
--- branches/2015Q1/www/dokuwiki/Makefile Tue Mar 24 19:16:35 2015 (r382161)
+++ branches/2015Q1/www/dokuwiki/Makefile Tue Mar 24 19:32:07 2015 (r382162)
@@ -3,11 +3,10 @@
PORTNAME= dokuwiki
PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g}
-PORTREVISION= 1
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/
DISTNAME= ${DIST_VER}
-EXTRACT_SUFX= .tgz
MAINTAINER= delphij at FreeBSD.org
COMMENT= Simple and easy to use wiki, no database required
@@ -19,6 +18,8 @@ USE_PHP= gd mbstring openssl pcre sessio
NO_BUILD= YES
WANT_PHP_WEB= YES
+USES= cpe tar:tgz
+
SUB_FILES= pkg-message
SUB_LIST+= PORTNAME=${PORTNAME}
SHAREOWN= ${WWWOWN}
Copied: branches/2015Q1/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c (from r379842, head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q1/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c Tue Mar 24 19:32:07 2015 (r382162, copy of r379842, head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c)
@@ -0,0 +1,87 @@
+diff -u -r -N VERSION VERSION
+--- VERSION 2014-10-08 00:59:23.000000000 -0700
++++ VERSION 2015-02-24 12:01:05.000000000 -0800
+@@ -1 +1 @@
+-2014-09-29a "Hrun"
++2014-09-29c "Hrun"
+diff -u -r -N conf/mime.conf conf/mime.conf
+--- conf/mime.conf 2014-10-08 00:59:23.000000000 -0700
++++ conf/mime.conf 2015-02-24 12:01:05.000000000 -0800
+@@ -9,7 +9,6 @@
+ png image/png
+ ico image/vnd.microsoft.icon
+
+-swf application/x-shockwave-flash
+ mp3 audio/mpeg
+ ogg audio/ogg
+ wav audio/wav
+@@ -66,3 +65,7 @@
+ #xml text/xml
+ #csv text/csv
+
++# Also flash may be able to execute arbitrary scripts in the website's
++# context
++#swf application/x-shockwave-flash
++
+diff -u -r -N data/pages/playground/playground.txt data/pages/playground/playground.txt
+--- data/pages/playground/playground.txt 1969-12-31 16:00:00.000000000 -0800
++++ data/pages/playground/playground.txt 2015-02-24 12:33:06.000000000 -0800
+@@ -0,0 +1 @@
++====== PlayGround ======
+diff -u -r -N doku.php doku.php
+--- doku.php 2014-10-08 00:59:23.000000000 -0700
++++ doku.php 2015-02-24 12:01:05.000000000 -0800
+@@ -9,7 +9,7 @@
+ */
+
+ // update message version
+-$updateVersion = 46.1;
++$updateVersion = 46.3;
+
+ // xdebug_start_profiling();
+
+diff -u -r -N lib/plugins/acl/remote.php lib/plugins/acl/remote.php
+--- lib/plugins/acl/remote.php 2014-10-08 00:59:23.000000000 -0700
++++ lib/plugins/acl/remote.php 2015-02-24 12:01:05.000000000 -0800
+@@ -17,12 +17,39 @@
+ );
+ }
+
+- function addAcl($scope, $user, $level){
++ /**
++ * Add a new entry to ACL config
++ *
++ * @param string $scope
++ * @param string $user
++ * @param int $level see also inc/auth.php
++ * @throws RemoteAccessDeniedException
++ * @return bool
++ */
++ public function addAcl($scope, $user, $level){
++ if(!auth_isadmin()) {
++ throw new RemoteAccessDeniedException('You are not allowed to access ACLs, superuser permission is required', 114);
++ }
++
++ /** @var admin_plugin_acl $apa */
+ $apa = plugin_load('admin', 'acl');
+ return $apa->_acl_add($scope, $user, $level);
+ }
+
+- function delAcl($scope, $user){
++ /**
++ * Remove an entry from ACL config
++ *
++ * @param string $scope
++ * @param string $user
++ * @throws RemoteAccessDeniedException
++ * @return bool
++ */
++ public function delAcl($scope, $user){
++ if(!auth_isadmin()) {
++ throw new RemoteAccessDeniedException('You are not allowed to access ACLs, superuser permission is required', 114);
++ }
++
++ /** @var admin_plugin_acl $apa */
+ $apa = plugin_load('admin', 'acl');
+ return $apa->_acl_del($scope, $user);
+ }
Copied: branches/2015Q1/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d (from r382024, head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q1/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d Tue Mar 24 19:32:07 2015 (r382162, copy of r382024, head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d)
@@ -0,0 +1,50 @@
+diff -ur VERSION VERSION
+--- VERSION 2015-02-24 12:01:05.000000000 -0800
++++ VERSION 2015-03-19 12:29:53.000000000 -0700
+@@ -1 +1 @@
+-2014-09-29c "Hrun"
++2014-09-29d "Hrun"
+diff -ur doku.php doku.php
+--- doku.php 2015-02-24 12:01:05.000000000 -0800
++++ doku.php 2015-03-19 12:29:53.000000000 -0700
+@@ -9,7 +9,7 @@
+ */
+
+ // update message version
+-$updateVersion = 46.3;
++$updateVersion = 46.4;
+
+ // xdebug_start_profiling();
+
+diff -ur lib/plugins/usermanager/admin.php lib/plugins/usermanager/admin.php
+--- lib/plugins/usermanager/admin.php 2015-02-24 12:01:05.000000000 -0800
++++ lib/plugins/usermanager/admin.php 2015-03-19 12:29:53.000000000 -0700
+@@ -191,9 +191,9 @@
+ */
+ $groups = join(', ',$grps);
+ ptln(" <tr class=\"user_info\">");
+- ptln(" <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
++ ptln(" <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".hsc($user)."]\" ".$delete_disable." /></td>");
+ if ($editable) {
+- ptln(" <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1,
++ ptln(" <td><a href=\"".wl($ID,array('fn[edit]['.$user.']' => 1,
+ 'do' => 'admin',
+ 'page' => 'usermanager',
+ 'sectok' => getSecurityToken())).
+@@ -325,7 +325,7 @@
+
+ // save current $user, we need this to access details if the name is changed
+ if ($user)
+- ptln(" <input type=\"hidden\" name=\"userid_old\" value=\"".$user."\" />",$indent);
++ ptln(" <input type=\"hidden\" name=\"userid_old\" value=\"".hsc($user)."\" />",$indent);
+
+ $this->_htmlFilterSettings($indent+10);
+
+@@ -370,6 +370,7 @@
+ $fieldtype = 'text';
+ $autocomp = '';
+ }
++ $value = hsc($value);
+
+ echo "<tr $class>";
+ echo "<td><label for=\"$id\" >$label: </label></td>";
Modified: branches/2015Q1/www/dokuwiki/pkg-descr
==============================================================================
--- branches/2015Q1/www/dokuwiki/pkg-descr Tue Mar 24 19:16:35 2015 (r382161)
+++ branches/2015Q1/www/dokuwiki/pkg-descr Tue Mar 24 19:32:07 2015 (r382162)
@@ -5,4 +5,4 @@ makes sure the datafiles remain readable
creation of structured texts.
All data is stored in plain text files - no database is required.
-WWW: https://wiki.splitbrain.org/wiki:dokuwiki
+WWW: https://www.dokuwiki.org/
Modified: branches/2015Q1/www/dokuwiki/pkg-plist
==============================================================================
--- branches/2015Q1/www/dokuwiki/pkg-plist Tue Mar 24 19:16:35 2015 (r382161)
+++ branches/2015Q1/www/dokuwiki/pkg-plist Tue Mar 24 19:32:07 2015 (r382162)
@@ -36,6 +36,7 @@
%%WWWDIR%%/data/media_attic/_dummy
%%WWWDIR%%/data/media_meta/_dummy
%%WWWDIR%%/data/meta/_dummy
+%%WWWDIR%%/data/pages/playground/playground.txt
%%WWWDIR%%/data/pages/wiki/dokuwiki.txt
%%WWWDIR%%/data/pages/wiki/syntax.txt
%%WWWDIR%%/data/pages/wiki/welcome.txt
More information about the svn-ports-all
mailing list