[packages/dokuwiki] up to 2018-04-22 "Greebo"

glen glen at pld-linux.org
Sat Nov 10 19:38:00 CET 2018


commit 392eaabe0f0572c574291ff6123b7b8af52b5c8c
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Nov 10 19:50:23 2018 +0200

    up to 2018-04-22 "Greebo"
    
    php 5.6.0 required

 autoload.patch                 | 11 +++++++
 dokuwiki-config.patch          | 11 -------
 dokuwiki-geshi.patch           | 29 +++++++-----------
 dokuwiki.spec                  | 68 +++++++++++++++++++-----------------------
 fixprivilegeescalationbug.diff | 16 ----------
 pld-branding.patch             | 23 ++++----------
 system-lessphp.patch           | 11 -------
 7 files changed, 58 insertions(+), 111 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index c209c47..243bc90 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,8 +1,8 @@
-%define		subver	2017-02-19e
+%define		subver	2018-04-22a
 %define		ver		%(echo %{subver} | tr -d -)
 #define		snap	1
 #define		rc_	1
-%define		php_min_version 5.3.3
+%define		php_min_version 5.6.0
 %include	/usr/lib/rpm/macros.php
 Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
@@ -13,7 +13,7 @@ License:	GPL v2
 Group:		Applications/WWW
 # Source0Download: https://download.dokuwiki.org/archive
 Source0:	https://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5:	09bf175f28d6e7ff2c2e3be60be8c65f
+# Source0-md5:	18765a29508f96f9882349a304bffc03
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -34,6 +34,7 @@ Source13:	http://mirrors.jenkins-ci.org/art/jenkins-logo/16x16/headshot.png?/jen
 # Source13-md5:	ae892e4ca43ffab88f6e3dca951f3e8a
 Patch66:	%{name}-config.patch
 Patch0:		%{name}-paths.patch
+Patch1:		autoload.patch
 Patch2:		style-width.patch
 Patch4:		%{name}-geshi.patch
 Patch5:		%{name}-http_auth-option.patch
@@ -41,16 +42,13 @@ Patch8:		%{name}-notify-respect-minor.patch
 Patch10:	%{name}-mailtext.patch
 Patch11:	%{name}-notifyns.patch
 Patch19:	pld-branding.patch
-Patch20:	fixprivilegeescalationbug.diff
 Patch21:	task-1821.patch
 Patch24:	more-buttons.patch
-Patch26:	system-lessphp.patch
 Patch27:	iconsizes-dump.patch
 URL:		https://www.dokuwiki.org/
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.693
-Requires:	lessphp >= 0.3.9
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(session)
 Requires:	php(xml)
@@ -131,6 +129,7 @@ test -e data/pages/playground/playground.txt || \
 echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
@@ -138,12 +137,9 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch10 -p1
 %patch11 -p1
 %patch19 -p1
-%patch20 -p1
 %patch21 -p1
-%patch24 -p1
-%patch26 -p1
+#%patch24 -p1
 %patch27 -p1
-
 %patch66 -p1
 
 # package as basenames, upgrade overwrite protected with .rpmnew
@@ -155,24 +151,22 @@ mv conf/mysql.conf.php{.example,}
 find -name _dummy | xargs %{__rm}
 %{__rm} lib/index.html lib/plugins/index.html lib/images/index.html
 %{__rm} {conf,inc,bin,data,inc/lang}/.htaccess
+%{__rm} vendor/.htaccess
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
-# source for security.png
-%{__rm} data/security.xcf
+# source for dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.png
+%{__rm} data/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.xcf
 
 %{__rm} lib/scripts/jquery/update.sh
 
 # use system geshi package
-%{__rm} -r vendor/easybook/geshi
-rmdir vendor/easybook
+%{__rm} -r vendor/geshi/geshi
+rmdir vendor/geshi
 
 # use system simplepie package
 #%{__rm} inc/SimplePie.php
 
-# use system lessphp package
-%{__rm} inc/lessc.inc.php
-
 # flash source on git tarballs
 rm -rf lib/plugins/testing
 rm -rf lib/plugins/*/_test
@@ -184,13 +178,6 @@ rm -rf lib/plugins/*/_test
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-%build
-md5=$(md5sum -b conf/dokuwiki.php | awk '{print $1}')
-if ! grep $md5 install.php; then
-	: update %{name}-config.patch -- it is outdated
-	exit 1
-fi
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir}}
@@ -303,7 +290,7 @@ exit 0
 
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediameta.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins.php
-%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scheme.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scheme.conf
 
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acl.auth.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.local.conf
@@ -312,11 +299,11 @@ exit 0
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/license.local.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.protected.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.local.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql.conf.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smileys.local.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/users.auth.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/userscript.js
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/userstyle.css
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/users.auth.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql.conf.php
 
 %attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/local.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/plugins.local.php
@@ -328,6 +315,7 @@ exit 0
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/smileys.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/wordblock.conf
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/manifest.json
 
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
@@ -342,6 +330,7 @@ exit 0
 %attr(755,root,root) %{_appdir}/bin/dwpage.php
 %attr(755,root,root) %{_appdir}/bin/gittool.php
 %attr(755,root,root) %{_appdir}/bin/indexer.php
+%attr(755,root,root) %{_appdir}/bin/plugin.php
 %attr(755,root,root) %{_appdir}/bin/render.php
 %attr(755,root,root) %{_appdir}/bin/striplangs.php
 %attr(755,root,root) %{_appdir}/bin/wantedpages.php
@@ -349,7 +338,9 @@ exit 0
 %dir %{_appdir}/inc
 %{_appdir}/inc/*.php
 %{_appdir}/inc/preload.php.dist
+%{_appdir}/inc/Action
 %{_appdir}/inc/Form
+%{_appdir}/inc/Menu
 %{_appdir}/inc/Ui
 %{_appdir}/inc/parser
 
@@ -361,17 +352,21 @@ exit 0
 
 # bundled packages
 # verbose files to detect new addons
-%dir %{_appdir}/vendor/splitbrain
-%{_appdir}/vendor/splitbrain/php-archive
-
+%dir %{_appdir}/vendor/aziraphale
+%dir %{_appdir}/vendor/marcusschwarz
+%dir %{_appdir}/vendor/openpsa
 %dir %{_appdir}/vendor/paragonie
-%{_appdir}/vendor/paragonie/random_compat
-
 %dir %{_appdir}/vendor/phpseclib
-%{_appdir}/vendor/phpseclib/phpseclib
-
 %dir %{_appdir}/vendor/simplepie
+%dir %{_appdir}/vendor/splitbrain
+%{_appdir}/vendor/aziraphale/email-address-validator
+%{_appdir}/vendor/marcusschwarz/lesserphp
+%{_appdir}/vendor/openpsa/universalfeedcreator
+%{_appdir}/vendor/paragonie/random_compat
+%{_appdir}/vendor/phpseclib/phpseclib
 %{_appdir}/vendor/simplepie/simplepie
+%{_appdir}/vendor/splitbrain/php-archive
+%{_appdir}/vendor/splitbrain/php-cli
 
 %dir %{_appdir}/lib
 # allow plugins dir permission change to allow installation of plugins from admin
@@ -461,16 +456,15 @@ exit 0
 %dir %attr(770,root,http) %{_localstatedir}/tmp
 
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki-128.png
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki.svg
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/dokuwiki.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/syntax.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/welcome.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/security.png
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.png
 
 %dir %attr(770,root,http) %{_cachedir}
 
 %files setup
 %defattr(644,root,root,755)
 %{_appdir}/install.php
-
-
diff --git a/autoload.patch b/autoload.patch
new file mode 100644
index 0000000..c1107b0
--- /dev/null
+++ b/autoload.patch
@@ -0,0 +1,11 @@
+--- dokuwiki-2018-04-22a/vendor/composer/autoload_real.php~	2018-05-03 09:36:13.000000000 +0300
++++ dokuwiki-2018-04-22a/vendor/composer/autoload_real.php	2018-11-10 19:37:33.858380525 +0200
+@@ -23,7 +23,7 @@
+         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+         spl_autoload_unregister(array('ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b', 'loadClassLoader'));
+ 
+-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
++        $useStaticLoader = false; // autoload_static.php patching is annoying and not worth the effort
+         if ($useStaticLoader) {
+             require_once __DIR__ . '/autoload_static.php';
+ 
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 4a83cbc..091f87e 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -21,14 +21,3 @@
  $conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
  $conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
  $conf['sepchar']     = '_';              //word separator character in page names; may be a
---- dokuwiki-2017-02-19b/install.php~	2017-03-28 20:41:51.000000000 +0300
-+++ dokuwiki-2017-02-19b/install.php	2017-03-28 20:42:11.826302856 +0300
-@@ -63,7 +63,7 @@
-     '2014-05-05'   => '263c76af309fbf083867c18a34ff5214',
-     '2015-08-10'   => '263c76af309fbf083867c18a34ff5214',
-     '2016-06-26'   => 'fd3abb6d89853dacb032907e619fbd73',
--    '2017-02-19'   => 'e4f2f5a34c9dbcd96a5ecc8f2df25bd9'
-+    '2017-02-19'   => '4539002f3259ae01819a4ce1c2647a0c',
- );
- 
- 
diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index 15f5ce7..3c3e6da 100644
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -1,20 +1,11 @@
---- dokuwiki-2015-08-10/vendor/composer/autoload_classmap.php~	2015-08-10 11:06:28.000000000 +0300
-+++ dokuwiki-2015-08-10/vendor/composer/autoload_classmap.php	2015-08-11 15:17:48.771838877 +0300
-@@ -6,5 +6,5 @@
- $baseDir = dirname($vendorDir);
- 
- return array(
--    'GeSHi' => $vendorDir . '/easybook/geshi/geshi.php',
+--- dokuwiki-2018-04-22a/vendor/composer/autoload_classmap.php~	2018-05-03 09:36:13.000000000 +0300
++++ dokuwiki-2018-04-22a/vendor/composer/autoload_classmap.php	2018-11-10 19:33:46.746455638 +0200
+@@ -14,7 +14,7 @@
+     'FeedImage' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedImage.php',
+     'FeedItem' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedItem.php',
+     'GPXCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php',
+-    'GeSHi' => $vendorDir . '/geshi/geshi/src/geshi.php',
 +    'GeSHi' => '/usr/share/php/geshi.php',
- );
---- dokuwiki-2017-02-19c/vendor/composer/autoload_static.php~	2017-08-11 17:32:50.000000000 +0300
-+++ dokuwiki-2017-02-19c/vendor/composer/autoload_static.php	2017-08-18 09:01:48.034574467 +0300
-@@ -44,7 +44,7 @@
-     );
- 
-     public static $classMap = array (
--        'GeSHi' => __DIR__ . '/..' . '/easybook/geshi/geshi.php',
-+        'GeSHi' => '/usr/share/php/geshi.php',
-     );
- 
-     public static function getInitializer(ClassLoader $loader)
+     'HTMLCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php',
+     'HtmlDescribable' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
+     'JSCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
diff --git a/fixprivilegeescalationbug.diff b/fixprivilegeescalationbug.diff
deleted file mode 100644
index a878110..0000000
--- a/fixprivilegeescalationbug.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fixprivilegeescalationbug.dpatch by Matti Pöllä <mpo at iki.fi>
-##
-## DP: Hotfix for privilege escalation bug.
-
- at DPATCH@
---- dokuwiki-rc2010-10-07/inc/actions.php~	2010-10-07 21:38:37.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/actions.php	2010-10-07 21:40:42.379139693 +0300
-@@ -149,6 +149,7 @@
-     global $conf;
-     global $license;
- 
-+    $ACT = act_permcheck($ACT);
-     //call template FIXME: all needed vars available?
-     $headers[] = 'Content-Type: text/html; charset=utf-8';
-     trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
diff --git a/pld-branding.patch b/pld-branding.patch
index 340b8d8..b407cec 100644
--- a/pld-branding.patch
+++ b/pld-branding.patch
@@ -1,22 +1,11 @@
---- dokuwiki-2012-06-23/conf/dokuwiki.php~	2012-06-23 13:07:26.000000000 +0300
-+++ dokuwiki-2012-06-23/conf/dokuwiki.php	2012-06-23 13:07:43.700694458 +0300
-@@ -13,7 +13,7 @@
- 
- 
- /* Basic Settings */
--$conf['title']       = 'DokuWiki';        //what to show in the title
-+$conf['title']       = 'PLD Linux DokuWiki'; //what to show in the title
- $conf['start']       = 'start';           //name of start page
- $conf['lang']        = 'en';              //your language
- $conf['template']    = 'dokuwiki';         //see lib/tpl directory
---- dokuwiki/lib/tpl/dokuwiki/tpl_footer.php~	2012-09-10 18:15:12.000000000 +0300
-+++ dokuwiki/lib/tpl/dokuwiki/tpl_footer.php	2012-09-16 18:27:15.717037872 +0300
+--- dokuwiki-2018-04-22a/lib/tpl/dokuwiki/tpl_footer.php~	2018-05-03 09:36:13.000000000 +0300
++++ dokuwiki-2018-04-22a/lib/tpl/dokuwiki/tpl_footer.php	2018-11-10 19:38:54.422610684 +0200
 @@ -24,6 +24,8 @@
-             src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
-         <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
+             src="<?php echo tpl_basedir(); ?>images/button-html5.png" width="80" height="15" alt="Valid HTML5" /></a>
+         <a href="//jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
              src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
-+        <a href="http://www.pld-linux.org/" title="PLD Linux" <?php echo $target?>><img
++        <a href="https://www.pld-linux.org/" title="PLD Linux" <?php echo $target?>><img
 +            src="<?php echo tpl_basedir(); ?>images/button-pld.png" width="80" height="15" alt="PLD Linux" /></a>
-         <a href="http://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
+         <a href="https://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
              src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
      </div>
diff --git a/system-lessphp.patch b/system-lessphp.patch
deleted file mode 100644
index e3df984..0000000
--- a/system-lessphp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dokuwiki-2017-02-19b/inc/load.php~	2017-03-28 20:41:05.000000000 +0300
-+++ dokuwiki-2017-02-19b/inc/load.php	2017-03-28 20:41:30.364262022 +0300
-@@ -83,7 +83,7 @@
-         'RemoteAPI'             => DOKU_INC.'inc/remote.php',
-         'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php',
-         'Subscription'          => DOKU_INC.'inc/subscription.php',
--        'lessc'                 => DOKU_INC.'inc/lessc.inc.php',
-+        'lessc'                 => '/usr/share/php/lessc.inc.php',
- 
-         'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
-         'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/392eaabe0f0572c574291ff6123b7b8af52b5c8c



More information about the pld-cvs-commit mailing list