From 87424c971d07b6e0dc7ec598c2a46e286d7d78f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 9 May 2014 11:10:43 +0300 Subject: [PATCH] up to 2014-05-05 "Ponder Stibbons" --- dokuwiki-config.patch | 12 ++++++------ dokuwiki-notifyns.patch | 14 +++++++------- dokuwiki.spec | 23 ++++++++++++----------- interwiki-outputonly.patch | 8 ++++---- system-jquery.patch | 15 +++++++-------- task-1821.patch | 37 +++++++++++++++++-------------------- 6 files changed, 53 insertions(+), 56 deletions(-) diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch index be6ae2f..e868c51 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-2013-12-08/install.php~ 2013-12-18 23:05:54.321131662 +0200 -+++ dokuwiki-2013-12-08/install.php 2013-12-18 23:06:30.110557953 +0200 -@@ -58,7 +58,7 @@ - '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', +--- 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', '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', -- '2013-12-08' => '263c76af309fbf083867c18a34ff5214', -+ '2013-12-08' => '5527d61a24b4feb0ade5a952848108fb', + '2013-12-08' => '263c76af309fbf083867c18a34ff5214', +- '2014-05-05' => '263c76af309fbf083867c18a34ff5214', ++ '2014-05-05' => '5527d61a24b4feb0ade5a952848108fb', ); diff --git a/dokuwiki-notifyns.patch b/dokuwiki-notifyns.patch index 1e92e6c..7c192e5 100644 --- a/dokuwiki-notifyns.patch +++ b/dokuwiki-notifyns.patch @@ -48,19 +48,19 @@ } elseif($who == 'subscribers') { if(!actionOK('subscribe')) return false; //subscribers enabled? if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors ---- dokuwiki-2013-05-10/inc/media.php~ 2013-05-10 15:45:54.000000000 +0300 -+++ dokuwiki-2013-05-10/inc/media.php 2013-05-28 22:49:27.423136743 +0300 -@@ -551,10 +551,11 @@ +--- dokuwiki-2014-05-06/inc/media.php~ 2014-05-06 15:09:52.000000000 +0300 ++++ dokuwiki-2014-05-06/inc/media.php 2014-05-08 11:24:16.977561680 +0300 +@@ -573,10 +573,11 @@ */ function media_notify($id,$file,$mime,$old_rev=false){ global $conf; -- if(empty($conf['notify'])) return; //notify enabled? +- if(empty($conf['notify'])) return false; //notify enabled? + $to = notifyNS($id, $conf['notify']); -+ if(empty($to)) return; //notify enabled? ++ if(empty($to)) return false; //notify enabled? $subscription = new Subscription(); -- return $subscription->send_media_diff($conf['notify'], 'uploadmail', $id, $old_rev, ''); -+ return $subscription->send_media_diff($to, 'uploadmail', $id, $old_rev, ''); +- return $subscription->send_media_diff($conf['notify'], 'uploadmail', $id, $old_rev); ++ return $subscription->send_media_diff($to, 'uploadmail', $id, $old_rev); } /** diff --git a/dokuwiki.spec b/dokuwiki.spec index ee10bc4..6575ce3 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -1,4 +1,4 @@ -%define subver 2013-12-08 +%define subver 2014-05-05 %define ver %(echo %{subver} | tr -d -) #define snap 1 #define rc_ 1 @@ -12,7 +12,7 @@ Release: 1 License: GPL v2 Group: Applications/WWW Source0: http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz -# Source0-md5: 620b7fed511e643ad05ad13207baa502 +# Source0-md5: 9bc798f823f1907664d769f3d1f588b7 Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Source3: http://glen.alkohol.ee/pld/jude.png @@ -50,7 +50,7 @@ Patch26: system-lessphp.patch URL: https://www.dokuwiki.org/ BuildRequires: fslint BuildRequires: rpm-php-pearprov >= 4.4.2-11 -BuildRequires: rpmbuild(macros) >= 1.520 +BuildRequires: rpmbuild(macros) >= 1.693 Requires: jquery >= 1.8 #Requires: jquery >= 1.9.1 Requires: jquery-cookie @@ -127,7 +127,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że pozostawienie plików instalacyjnych mogłoby być niebezpieczne. %prep -%setup -q -n %{name}-%{?rc_:rc}%{subver} %{?snap:-c} +%setup -q -n %{name}-%{?rc_:rc}2014-05-06 %{?snap:-c} %if 0%{?snap:1} mv *-dokuwiki-*/* . test -e VERSION || echo %{subver}-git > VERSION @@ -190,8 +190,7 @@ find -name _dummy | xargs %{__rm} # flash source on git tarballs rm -rf lib/_fla rm -rf lib/plugins/testing -rm -rf lib/plugins/config/_test -rm -rf lib/plugins/usermanager/_test +rm -r lib/plugins/*/_test # use system packages %{__rm} lib/scripts/jquery/update.sh @@ -359,10 +358,11 @@ exit 0 %{_appdir}/index.php %dir %{_appdir}/bin %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/render.php -%attr(755,root,root) %{_appdir}/bin/wantedpages.php %attr(755,root,root) %{_appdir}/bin/striplangs.php +%attr(755,root,root) %{_appdir}/bin/wantedpages.php %dir %{_appdir}/inc %{_appdir}/inc/*.php @@ -373,6 +373,7 @@ exit 0 # 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/*.* %{_appdir}/lib/plugins/acl/pix @@ -399,9 +400,10 @@ exit 0 %{_appdir}/lib/plugins/config/*.* %{_appdir}/lib/plugins/config/images %{_appdir}/lib/plugins/config/settings -%dir %{_appdir}/lib/plugins/plugin -%{_appdir}/lib/plugins/plugin/*.* -%{_appdir}/lib/plugins/plugin/classes +%dir %{_appdir}/lib/plugins/extension +%{_appdir}/lib/plugins/extension/*.* +%{_appdir}/lib/plugins/extension/helper +%{_appdir}/lib/plugins/extension/images %dir %{_appdir}/lib/plugins/revert %{_appdir}/lib/plugins/revert/*.* %dir %{_appdir}/lib/plugins/safefnrecode @@ -413,7 +415,6 @@ exit 0 %{_appdir}/lib/plugins/info/*.* %dir %{_appdir}/lib/plugins/popularity %{_appdir}/lib/plugins/popularity/*.* -%{_appdir}/lib/plugins/*.php %{_appdir}/lib/images %{_appdir}/lib/scripts diff --git a/interwiki-outputonly.patch b/interwiki-outputonly.patch index 27fe9a5..a0fe435 100644 --- a/interwiki-outputonly.patch +++ b/interwiki-outputonly.patch @@ -1,9 +1,9 @@ ---- dokuwiki-rc2013-10-28/inc/parser/xhtml.php~ 2013-11-13 22:20:29.920364255 +0200 -+++ dokuwiki-rc2013-10-28/inc/parser/xhtml.php 2013-11-13 22:20:52.460009959 +0200 -@@ -686,7 +686,7 @@ +--- 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; diff --git a/system-jquery.patch b/system-jquery.patch index 4cf4f10..3ccb4fa 100644 --- a/system-jquery.patch +++ b/system-jquery.patch @@ -1,16 +1,15 @@ ---- dokuwiki-2013-05-10/lib/exe/js.php 2013-05-28 11:51:39.656021911 +0300 -+++ dokuwiki-2013-05-10/lib/exe/js.php 2013-05-28 16:22:44.737594377 +0300 -@@ -40,10 +40,9 @@ +--- dokuwiki-2014-05-06/lib/exe/js.php~ 2014-05-06 15:09:52.000000000 +0300 ++++ dokuwiki-2014-05-06/lib/exe/js.php 2014-05-08 11:22:58.838818098 +0300 +@@ -40,9 +40,9 @@ // array of core files $files = array( - DOKU_INC."lib/scripts/jquery/jquery$min.js", - DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', - DOKU_INC."lib/scripts/jquery/jquery-ui$min.js", -- DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js", + "/usr/share/jquery/jquery$min.js", -+ '/usr/share/jquery/cookie/cookie.js', -+ '/usr/share/jquery/ui/jquery-ui.js', ++ "/usr/share/jquery/cookie/cookie.js", ++ "/usr/share/jquery/ui/jquery-ui.js", + DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js", + DOKU_INC.'inc/lang/'.$conf['lang'].'/jquery.ui.datepicker.js', DOKU_INC."lib/scripts/fileuploader.js", - DOKU_INC."lib/scripts/fileuploaderextended.js", - DOKU_INC.'lib/scripts/helpers.js', diff --git a/task-1821.patch b/task-1821.patch index 4854d20..f7c7eba 100644 --- a/task-1821.patch +++ b/task-1821.patch @@ -4,37 +4,34 @@ TODO: use rev1, rev2 http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside ---- dokuwiki-2012-07-16/inc/html.php~ 2012-07-16 11:47:58.000000000 +0300 -+++ dokuwiki-2012-07-16/inc/html.php 2012-07-16 11:53:24.640163788 +0300 -@@ -1086,9 +1086,13 @@ - // given as rev and rev2 parameters, with rev2 being optional. Or in an - // array in rev2. +--- dokuwiki-2014-05-06/inc/html.php 2014-05-08 11:27:02.548232655 +0300 ++++ dokuwiki-2014-05-06/inc/html.php 2014-05-08 11:27:02.548232655 +0300 +@@ -1134,7 +1134,13 @@ $rev1 = $REV; -- + $rev2 = $INPUT->ref('rev2'); -- if(is_array($rev2)){ +- if(is_array($rev2)) { + + // handle $r1 + $r2, see DW #1821 + if ($INPUT->has('r1') && $INPUT->has('r2')) { + $rev1 = $INPUT->int('r1'); + $rev2 = $INPUT->int('r2'); ++ + } elseif(is_array($rev2)){ $rev1 = (int) $rev2[0]; $rev2 = (int) $rev2[1]; ---- dokuwiki-20110329/inc/html.php~ 2011-03-29 09:20:42.000000000 +0300 -+++ dokuwiki-20110329/inc/html.php 2011-03-29 09:21:51.507042136 +0300 -@@ -1030,8 +1030,8 @@ - - $diffurl = wl($ID, array( - 'do' => 'diff', -- 'rev2[0]' => $l_rev, -- 'rev2[1]' => $r_rev, -+ 'r1' => $l_rev, -+ 'r2' => $r_rev, - 'difftype' => $type, - )); - ptln('
'.$lang['difflink'].''); +@@ -1458,8 +1464,8 @@ + } else { + $urlparam = array( + 'do' => 'diff', +- 'rev2[0]' => $lrev, +- 'rev2[1]' => $rrev, ++ 'r1' => $lrev, ++ 'r2' => $rrev, + 'difftype' => $difftype, + ); + } --- dokuwiki/inc/subscription.php 2013-05-29 22:02:46.801329978 +0300 +++ dokuwiki/inc/subscription.php 2013-05-29 23:04:29.374883349 +0300 @@ -384,12 +384,13 @@ -- 2.44.0