Date: Tue, 24 Feb 2015 21:22:58 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379842 - in head/www/dokuwiki: . files Message-ID: <201502242122.t1OLMwk3043062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Feb 24 21:22:58 2015 New Revision: 379842 URL: https://svnweb.freebsd.org/changeset/ports/379842 QAT: https://qat.redports.org/buildarchive/r379842/ Log: Update to 2014-09-29c. Added: head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c (contents, props changed) Modified: head/www/dokuwiki/Makefile Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Tue Feb 24 21:13:27 2015 (r379841) +++ head/www/dokuwiki/Makefile Tue Feb 24 21:22:58 2015 (r379842) @@ -3,7 +3,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} Added: head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dokuwiki/files/patch-2014-09-29a-to-2014-09-29c Tue Feb 24 21:22:58 2015 (r379842) @@ -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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502242122.t1OLMwk3043062>