From: Elan Ruusamäe Date: Tue, 11 Aug 2015 13:02:36 +0000 (+0300) Subject: up to 2015-08-10, uses composer to load extra deps X-Git-Tag: auto/th/dokuwiki-20150810a-1~4 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=94aee04268ea44280b76ab3f78208ef9bb81fa2e;p=packages%2Fdokuwiki.git up to 2015-08-10, uses composer to load extra deps --- diff --git a/adldap.patch b/adldap.patch index 73b20a9..a1213a5 100644 --- a/adldap.patch +++ b/adldap.patch @@ -1,11 +1,13 @@ ---- dokuwiki-2013-03-05/./lib/plugins/authad/auth.php~ 2013-03-03 21:16:43.000000000 +0200 -+++ dokuwiki-2013-03-05/./lib/plugins/authad/auth.php 2013-03-05 12:41:35.995501610 +0200 -@@ -2,7 +2,7 @@ +--- dokuwiki-2015-08-10/./lib/plugins/authad/auth.php~ 2015-08-10 11:06:28.000000000 +0300 ++++ dokuwiki-2015-08-10/./lib/plugins/authad/auth.php 2015-08-11 15:26:57.947057496 +0300 +@@ -2,8 +2,8 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php'); -+require_once '/usr/share/php/adLDAP.php'; +-require_once(DOKU_PLUGIN.'authad/adLDAP/classes/adLDAPUtils.php'); ++require_once '/usr/share/php/adLDAP/adLDAP.php'; ++require_once '/usr/share/php/adLDAP/classes/adLDAPUtils.php'; /** * Active Directory authentication backend for DokuWiki diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch index e868c51..d87641d 100644 --- a/dokuwiki-config.patch +++ b/dokuwiki-config.patch @@ -21,14 +21,14 @@ $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-2014-05-06/install.php~ 2014-05-08 11:32:46.919361482 +0300 -+++ dokuwiki-2014-05-06/install.php 2014-05-08 11:33:23.585438490 +0300 -@@ -59,7 +59,7 @@ - '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3', +--- dokuwiki-2015-08-10/install.php~ 2015-08-11 15:43:04.236120609 +0300 ++++ dokuwiki-2015-08-10/install.php 2015-08-11 15:43:07.236076584 +0300 +@@ -60,7 +60,7 @@ '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', '2013-12-08' => '263c76af309fbf083867c18a34ff5214', -- '2014-05-05' => '263c76af309fbf083867c18a34ff5214', -+ '2014-05-05' => '5527d61a24b4feb0ade5a952848108fb', + '2014-05-05' => '263c76af309fbf083867c18a34ff5214', +- '2015-08-10' => '263c76af309fbf083867c18a34ff5214' ++ '2015-08-10' => '5527d61a24b4feb0ade5a952848108fb' ); diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch index 916c4c1..cec596b 100644 --- a/dokuwiki-geshi.patch +++ b/dokuwiki-geshi.patch @@ -1,31 +1,9 @@ ---- dokuwiki-2012-07-08/./inc/parserutils.php~ 2012-07-07 13:06:48.000000000 +0300 -+++ dokuwiki-2012-07-08/./inc/parserutils.php 2012-07-08 11:20:06.395684716 +0300 -@@ -748,14 +748,14 @@ - $cache = getCacheName($language.$code,".code"); - $ctime = @filemtime($cache); - if($ctime && !$INPUT->bool('purge') && -- $ctime > filemtime(DOKU_INC.'inc/geshi.php') && // geshi changed -- $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && // language syntax definition changed -+ $ctime > filemtime('/usr/share/php/geshi.php') && // geshi changed -+ $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') && // language syntax definition changed - $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed - $highlighted_code = io_readFile($cache, false); +--- 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); - } else { - -- $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi'); -+ $geshi = new GeSHi($code, $language); - $geshi->set_encoding('utf-8'); - $geshi->enable_classes(); - $geshi->set_header_type(GESHI_HEADER_PRE); ---- dokuwiki-2013-02-01/inc/load.php~ 2013-01-28 00:59:02.000000000 +0200 -+++ dokuwiki-2013-02-01/inc/load.php 2013-02-01 01:27:39.317193573 +0200 -@@ -70,7 +70,7 @@ - 'IXR_Client' => DOKU_INC.'inc/IXR_Library.php', - 'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php', - 'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php', -- 'GeSHi' => DOKU_INC.'inc/geshi.php', -+ 'GeSHi' => '/usr/share/php/geshi.php', - 'Tar' => DOKU_INC.'inc/Tar.class.php', - 'TarLib' => DOKU_INC.'inc/TarLib.class.php', - 'ZipLib' => DOKU_INC.'inc/ZipLib.class.php', + return array( +- 'GeSHi' => $vendorDir . '/easybook/geshi/geshi.php', ++ 'GeSHi' => '/usr/share/php/geshi.php', + ); diff --git a/dokuwiki-nice_exit.patch b/dokuwiki-nice_exit.patch deleted file mode 100644 index 3b1e58d..0000000 --- a/dokuwiki-nice_exit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dokuwiki/inc/init.php~ 2009-11-10 15:31:11.000000000 +0200 -+++ dokuwiki/inc/init.php 2009-11-10 15:31:51.307528750 +0200 -@@ -526,7 +526,7 @@ - - - EOT; -- exit; -+ exit(1); - } - - diff --git a/dokuwiki.spec b/dokuwiki.spec index 6450a24..d1be250 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -1,19 +1,19 @@ -%define subver 2014-09-29d +%define subver 2015-08-10 %define ver %(echo %{subver} | tr -d -) #define snap 1 #define rc_ 1 -%define php_min_version 5.2.4 +%define php_min_version 5.3.3 %include /usr/lib/rpm/macros.php Summary: PHP-based Wiki webapplication Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP Name: dokuwiki Version: %{ver} -Release: 1 +Release: 0.1 License: GPL v2 Group: Applications/WWW # Source0Download: http://download.dokuwiki.org/archive Source0: http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz -# Source0-md5: 2bf2d6c242c00e9c97f0647e71583375 +# Source0-md5: 675594518c378f43b32204c4b9073ffd Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Source3: http://glen.alkohol.ee/pld/jude.png @@ -32,14 +32,11 @@ Patch66: %{name}-config.patch Patch0: %{name}-paths.patch Patch1: system-jquery.patch Patch2: style-width.patch -Patch3: undeprecate.patch Patch4: %{name}-geshi.patch Patch5: %{name}-http_auth-option.patch -Patch6: %{name}-nice_exit.patch Patch8: %{name}-notify-respect-minor.patch Patch10: %{name}-mailtext.patch Patch11: %{name}-notifyns.patch -Patch14: interwiki-outputonly.patch Patch15: simplepie.patch Patch19: pld-branding.patch Patch20: fixprivilegeescalationbug.diff @@ -70,12 +67,12 @@ Requires: webapps Requires: webserver(access) Requires: webserver(alias) Requires: webserver(php) +Suggests: php(gd) Suggests: php-adldap >= 4.0.4 -Suggests: php-gd Obsoletes: dokuwiki-plugin-jquery Conflicts: dokuwiki-plugin-icalevents < 20120909 # can use gz compression to store attic pages -Suggests: php-zlib +Suggests: php(zlib) BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -141,14 +138,11 @@ echo '====== PlayGround ======' > data/pages/playground/playground.txt %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch8 -p1 %patch10 -p1 %patch11 -p1 -%patch14 -p1 %patch15 -p1 %patch19 -p1 %patch20 -p1 @@ -177,8 +171,8 @@ find -name _dummy | xargs %{__rm} %{__rm} data/security.xcf # use system geshi package -%{__rm} inc/geshi.php -%{__rm} -r inc/geshi +%{__rm} -r vendor/easybook/geshi +rmdir vendor/easybook # use system adldap package %{__rm} -r lib/plugins/authad/adLDAP @@ -242,7 +236,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/smileys.local.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/userscript.js touch $RPM_BUILD_ROOT%{_sysconfdir}/userstyle.css -ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif +# https://github.com/splitbrain/dokuwiki/pull/1247 +#ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/eventum.gif cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/cacti.gif cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/nagios.gif @@ -371,12 +366,14 @@ exit 0 %dir %{_appdir}/inc %{_appdir}/inc/*.php %{_appdir}/inc/preload.php.dist +%{_appdir}/inc/Form %{_appdir}/inc/parser %dir %{_appdir}/lib # allow plugins dir permission change to allow installation of plugins from admin # however does not work with rpm 4.5 %dir %config %verify(not group mode) %{_appdir}/lib/plugins + %{_appdir}/lib/plugins/*.php %dir %{_appdir}/lib/plugins/acl %{_appdir}/lib/plugins/acl/*.* @@ -419,10 +416,14 @@ exit 0 %{_appdir}/lib/plugins/info/*.* %dir %{_appdir}/lib/plugins/popularity %{_appdir}/lib/plugins/popularity/*.* +%dir %{_appdir}/lib/plugins/styling +%{_appdir}/lib/plugins/styling/README +%{_appdir}/lib/plugins/styling/*.* %{_appdir}/lib/images %{_appdir}/lib/scripts %{_appdir}/lib/styles +# TODO: fix langs for templates (duplicate files otherwise) %{_appdir}/lib/tpl %{_appdir}/lib/exe diff --git a/interwiki-outputonly.patch b/interwiki-outputonly.patch deleted file mode 100644 index a0fe435..0000000 --- a/interwiki-outputonly.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- dokuwiki-2014-05-06/inc/parser/xhtml.php~ 2014-05-08 11:24:44.093792329 +0300 -+++ dokuwiki-2014-05-06/inc/parser/xhtml.php 2014-05-08 11:25:15.469954476 +0300 -@@ -689,7 +689,7 @@ - - /** - */ -- function interwikilink($match, $name = null, $wikiName, $wikiUri) { -+ function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly = false) { - global $conf; - - $link = array(); -@@ -598,7 +598,11 @@ - $link['title'] = htmlspecialchars($link['url']); - - //output formatted -- $this->doc .= $this->_formatLink($link); -+ if($returnonly){ -+ return $this->_formatLink($link); -+ }else{ -+ $this->doc .= $this->_formatLink($link); -+ } - } - - /** diff --git a/more-buttons.patch b/more-buttons.patch index d1e6cc0..7cebd34 100644 --- a/more-buttons.patch +++ b/more-buttons.patch @@ -1,6 +1,6 @@ ---- dokuwiki/lib/tpl/dokuwiki/tpl_header.php 2012-09-01 22:54:16.816853164 +0300 -+++ dokuwiki-2012-09-01/lib/tpl/dokuwiki/tpl_header.php 2012-09-01 23:14:51.484803869 +0300 -@@ -64,6 +64,19 @@ +--- dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php~ 2015-08-11 15:39:31.799253674 +0300 ++++ dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php 2015-08-11 15:39:49.525658460 +0300 +@@ -66,6 +66,19 @@