[packages/dokuwiki] Up to 2020-07-29a
glen
glen at pld-linux.org
Thu Mar 30 16:35:24 CEST 2023
commit f350088ea55194fb569bdc7dbae11fd9d43293b9
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Mon Mar 27 11:24:06 2023 +0300
Up to 2020-07-29a
dokuwiki-config.patch | 17 ++++++++----
dokuwiki-http_auth-option.patch | 10 ++++---
dokuwiki-mailtext.patch | 27 ++++++++++---------
dokuwiki-notifyns.patch | 48 +++++++++++++++++----------------
dokuwiki.spec | 35 +++++++++++++-----------
iconsizes-dump.patch | 59 ++++++++++++++++-------------------------
pld-branding.patch | 8 +++---
task-1821.patch | 28 +++++--------------
8 files changed, 110 insertions(+), 122 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 306a2c1..276d2c0 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define subver 2018-04-22c
+%define subver 2020-07-29a
%define ver %(echo %{subver} | tr -d -)
#define snap 1
#define rc_ 1
@@ -12,7 +12,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: 6272e552b9a71a764781bd4182dd2b7d
+# Source0-md5: 86d5d43b07c4bfaf7630c438ae9ce0d7
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: http://glen.alkohol.ee/pld/jude.png
@@ -46,8 +46,8 @@ Patch24: more-buttons.patch
Patch27: iconsizes-dump.patch
URL: https://www.dokuwiki.org/
BuildRequires: fslint
-BuildRequires: rpmbuild(find_lang) >= 1.41
BuildRequires: rpm-php-pearprov >= 4.4.2-11
+BuildRequires: rpmbuild(find_lang) >= 1.41
BuildRequires: rpmbuild(macros) >= 1.693
Requires: php(core) >= %{php_min_version}
Requires: php(session)
@@ -150,7 +150,7 @@ 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} {conf,inc,bin,data}/.htaccess
%{__rm} vendor/.htaccess
# we just don't package deleted files, these get removed automatically on rpm upgrades
@@ -167,14 +167,12 @@ rmdir vendor/geshi
# use system simplepie package
#%{__rm} inc/SimplePie.php
-# flash source on git tarballs
-rm -rf lib/plugins/testing
-rm -rf lib/plugins/*/_test
-
# pagetools - tools for development
%{__rm} -r lib/tpl/dokuwiki/images/pagetools
%{__rm} lib/tpl/dokuwiki/images/pagetools-build*
+%{__sed} -i -e '1 s,#!.*php,#!/usr/bin/php,' bin/*.php
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -339,9 +337,21 @@ exit 0
%{_appdir}/inc/*.php
%{_appdir}/inc/preload.php.dist
%{_appdir}/inc/Action
+%{_appdir}/inc/Cache
+%{_appdir}/inc/ChangeLog
+%{_appdir}/inc/Debug
+%{_appdir}/inc/Extension
%{_appdir}/inc/Form
+%{_appdir}/inc/HTTP
+%{_appdir}/inc/Input
%{_appdir}/inc/Menu
+%{_appdir}/inc/Parsing
+%{_appdir}/inc/Remote
+%{_appdir}/inc/Search
+%{_appdir}/inc/Sitemap
+%{_appdir}/inc/Subscriptions
%{_appdir}/inc/Ui
+%{_appdir}/inc/Utf8
%{_appdir}/inc/parser
# composer generated vendor autoload
@@ -386,24 +396,17 @@ exit 0
%{_appdir}/lib/plugins/authldap/*.php
%{_appdir}/lib/plugins/authldap/*.txt
%{_appdir}/lib/plugins/authldap/conf
-%dir %{_appdir}/lib/plugins/authmysql
-%{_appdir}/lib/plugins/authmysql/*.php
-%{_appdir}/lib/plugins/authmysql/*.txt
-%{_appdir}/lib/plugins/authmysql/conf
%dir %{_appdir}/lib/plugins/authpdo
%{_appdir}/lib/plugins/authpdo/*.php
%{_appdir}/lib/plugins/authpdo/*.txt
%{_appdir}/lib/plugins/authpdo/README
%{_appdir}/lib/plugins/authpdo/conf
-%{_appdir}/lib/plugins/authpgsql/*.php
-%{_appdir}/lib/plugins/authpgsql/conf
-%{_appdir}/lib/plugins/authpgsql/*.txt
-%dir %{_appdir}/lib/plugins/authpgsql
%dir %{_appdir}/lib/plugins/authplain
%{_appdir}/lib/plugins/authplain/*.php
%{_appdir}/lib/plugins/authplain/*.txt
%dir %{_appdir}/lib/plugins/config
%{_appdir}/lib/plugins/config/*.*
+%{_appdir}/lib/plugins/config/core
%{_appdir}/lib/plugins/config/images
%{_appdir}/lib/plugins/config/settings
%dir %{_appdir}/lib/plugins/extension
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 091f87e..f6cf761 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,6 +1,13 @@
---- dokuwiki-2012-06-24/conf/dokuwiki.php 2012-07-07 15:08:02.939975138 +0300
-+++ dokuwiki-2012-09-23/conf/dokuwiki.php 2012-10-13 18:12:31.417612300 +0300
-@@ -19,8 +19,9 @@
+--- dokuwiki-2020-07-29a/conf/dokuwiki.php 2023-03-27 11:52:04.144883301 +0300
++++ dokuwiki-2020-07-29a/conf/dokuwiki.php 2023-03-27 12:03:50.328816007 +0300
+@@ -13,14 +13,15 @@
+
+
+ /* 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
$conf['tagline'] = ''; //tagline in header (if template supports it)
$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it)
@@ -12,8 +19,8 @@
$conf['basedir'] = ''; //absolute dir from serveroot - blank for autodetection
$conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect
$conf['cookiedir'] = ''; //path to use in cookies - blank for basedir
-@@ -139,7 +140,7 @@
- $conf['rss_show_summary'] = 1; //Add revision summary to title? 0|1
+@@ -140,7 +141,7 @@
+ $conf['rss_show_deleted'] = 1; //Show deleted items 0|1
/* Advanced Settings */
-$conf['updatecheck'] = 1; //automatically check for new releases?
diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index c38c600..3b8fbbe 100644
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,13 +1,15 @@
---- dokuwiki-2018-04-22c.org/conf/dokuwiki.php 2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/conf/dokuwiki.php 2022-09-27 22:46:31.557879706 +0200
-@@ -63,6 +63,7 @@ $conf['profileconfirm'] = 1;
+- https://github.com/dokuwiki/dokuwiki/pull/15
+
+--- dokuwiki-2020-07-29a/conf/dokuwiki.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/conf/dokuwiki.php 2023-03-27 11:25:04.212540600 +0300
+@@ -63,6 +63,7 @@
$conf['rememberme'] = 1; //Enable/disable remember me on login
$conf['disableactions'] = ''; //comma separated list of actions to disable
$conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
+$conf['http_auth'] = 1; //allows HTTP authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
$conf['securecookie'] = 1; //never send HTTPS cookies via HTTP
$conf['remote'] = 0; //Enable/disable remote interfaces
- $conf['remoteuser'] = '!!not set!!'; //user/groups that have access to remote interface (comma separated)
+ $conf['remoteuser'] = '!!not set!!'; //user/groups that have access to remote interface (comma separated). leave empty to allow all users
--- dokuwiki-2018-04-22c.org/inc/auth.php 2020-05-01 12:38:20.000000000 +0200
+++ dokuwiki-2018-04-22c/inc/auth.php 2022-09-27 22:46:31.557879706 +0200
@@ -84,7 +84,7 @@ function auth_setup() {
diff --git a/dokuwiki-mailtext.patch b/dokuwiki-mailtext.patch
index 08ef4b6..2e149dc 100644
--- a/dokuwiki-mailtext.patch
+++ b/dokuwiki-mailtext.patch
@@ -1,19 +1,22 @@
---- dokuwiki-2016-06-26a/inc/lang/en/mailtext.txt~ 2016-07-03 19:08:51.000000000 +0300
-+++ dokuwiki-2016-06-26a/inc/lang/en/mailtext.txt 2016-07-12 13:20:56.266379618 +0300
-@@ -1,12 +1,8 @@
+--- dokuwiki-2020-07-29a/inc/lang/en/mailtext.txt~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/inc/lang/en/mailtext.txt 2023-03-27 11:29:31.414021049 +0300
+@@ -1,15 +1,8 @@
-A page in your DokuWiki was added or changed. Here are the details:
-
--Date : @DATE@
--Browser : @BROWSER@
--IP-Address : @IPADDRESS@
--Hostname : @HOSTNAME@
--Old Revision: @OLDPAGE@
--New Revision: @NEWPAGE@
--Edit Summary: @SUMMARY@
--User : @USER@
+-Browser : @BROWSER@
+-IP Address : @IPADDRESS@
+-Hostname : @HOSTNAME@
+-Old Revision : @OLDPAGE@
+-New Revision : @NEWPAGE@
+-Date of New Revision: @DATE@
+-Edit Summary : @SUMMARY@
+-User : @USER@
+-
+-There may be newer changes after this revision. If this
+-happens, a message will be shown on the top of the rev page.
-
+ at SUMMARY@
-+
++
+--- @OLDPAGE@
++++ @NEWPAGE@
@DIFF@
diff --git a/dokuwiki-notifyns.patch b/dokuwiki-notifyns.patch
index 01f7fd6..7144806 100644
--- a/dokuwiki-notifyns.patch
+++ b/dokuwiki-notifyns.patch
@@ -48,36 +48,36 @@
} elseif($who == 'subscribers') {
if(!actionOK('subscribe')) return false; //subscribers enabled?
if($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
---- dokuwiki-2018-04-22c.org/inc/media.php 2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/inc/media.php 2022-09-27 22:46:33.924670225 +0200
-@@ -647,10 +647,11 @@ function media_contentcheck($file,$mime)
+--- dokuwiki-2020-07-29a/inc/media.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/inc/media.php 2023-03-27 11:31:29.468008469 +0300
+@@ -669,10 +669,11 @@
*/
- function media_notify($id,$file,$mime,$old_rev=false){
+ function media_notify($id,$file,$mime,$old_rev=false,$current_rev=false){
global $conf;
- if(empty($conf['notify'])) return false; //notify enabled?
+ $to = notifyNS($id, $conf['notify']);
+ 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);
+ $subscription = new MediaSubscriptionSender();
+- return $subscription->sendMediaDiff($conf['notify'], 'uploadmail', $id, $old_rev, $current_rev);
++ return $subscription->sendMediaDiff($to, 'uploadmail', $id, $old_rev, $current_rev);
}
/**
---- dokuwiki-2018-04-22c.org/inc/subscription.php 2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/inc/subscription.php 2022-09-27 22:46:33.924670225 +0200
-@@ -489,7 +489,8 @@ class Subscription {
- */
- public function send_register($login, $fullname, $email) {
+--- dokuwiki-2020-07-29a/inc/Subscriptions/RegistrationSubscriptionSender.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/inc/Subscriptions/RegistrationSubscriptionSender.php 2023-03-27 11:37:39.640069460 +0300
+@@ -19,7 +19,8 @@
+ public function sendRegister($login, $fullname, $email)
+ {
global $conf;
-- if(empty($conf['registernotify'])) return false;
-+ $to = notifyNS($id, $conf['registernotify']);
-+ if(empty($to)) return false;
+- if (empty($conf['registernotify'])) {
++ $to = notifyNS($id, $conf['registernotify']); // XXX $id undefined
++ if (empty($to)) {
+ return false;
+ }
- $trep = array(
- 'NEWUSER' => $login,
-@@ -498,7 +499,7 @@ class Subscription {
- );
+@@ -30,7 +31,7 @@
+ ];
return $this->send(
- $conf['registernotify'],
@@ -85,13 +85,15 @@
'new_user',
$login,
'registermail',
-@@ -682,7 +683,8 @@ class Subscription {
+--- dokuwiki-2020-07-29a/./inc/Subscriptions/SubscriberManager.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/./inc/Subscriptions/SubscriberManager.php 2023-03-27 11:38:57.900505224 +0300
+@@ -257,7 +257,8 @@
$level = auth_aclcheck($id, $user, $userinfo['grps']);
- if($level >= AUTH_READ) {
-- if(strcasecmp($userinfo['mail'], $conf['notify']) != 0) { //skip user who get notified elsewhere
+ if ($level >= AUTH_READ) {
+- if (strcasecmp($userinfo['mail'], $conf['notify']) != 0) { //skip user who get notified elsewhere
+ $to = notifyNS($id, $conf['notify']);
-+ if(strcasecmp($userinfo['mail'], $to) != 0) { //skip user who get notified elsewhere
++ if (strcasecmp($userinfo['mail'], $to) != 0) { //skip user who get notified elsewhere
$result[$user] = $userinfo['mail'];
}
}
diff --git a/iconsizes-dump.patch b/iconsizes-dump.patch
index f017497..2750bc8 100644
--- a/iconsizes-dump.patch
+++ b/iconsizes-dump.patch
@@ -9,46 +9,33 @@ Status: Rejected by upstream
lib/images/fileicons/index.php | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
-diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php
-index 09b6c9d..ffb41c5 100644
---- a/lib/images/fileicons/index.php
-+++ b/lib/images/fileicons/index.php
-@@ -28,6 +28,13 @@
+--- dokuwiki-2020-07-29a/lib/images/fileicons/index.php~ 2023-03-27 11:49:18.000000000 +0300
++++ dokuwiki-2020-07-29a/lib/images/fileicons/index.php 2023-03-27 11:49:21.510644266 +0300
+@@ -27,15 +27,23 @@
+
</head>
<body>
-
+<?php
+$sizes = isset($_GET['sizes']) ? explode(',', (string)$_GET['sizes']) : array(16, 32);
+?>
-+
-+<?php
-+if (in_array(16, $sizes)) :
-+?>
- <div class="white box">
- <?php
- foreach (glob('*.png') as $img) {
-@@ -45,7 +52,13 @@
- </div>
- <br style="clear: left" />
-+<?php
-+endif;
-+?>
-
-+<?php
-+if (in_array(32, $sizes)) :
-+?>
- <div class="white box">
- <?php
- foreach (glob('32x32/*.png') as $img) {
-@@ -61,7 +74,9 @@
- }
- ?>
+ <?php
+ $fi_list = ''; $fi_list32 = '';
+-foreach (glob('*.png') as $img) {
+- $fi_list .= '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
++if (in_array(16, $sizes)) {
++ foreach (glob('*.png') as $img) {
++ $fi_list .= '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
++ }
+ }
+-foreach (glob('32x32/*.png') as $img) {
+- $fi_list32 .= '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
++if (in_array(32, $sizes)) {
++ foreach (glob('32x32/*.png') as $img) {
++ $fi_list32 .= '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
++ }
+ }
++
+ echo '<div class="white box">
+ '.$fi_list.'
</div>
--
-+<?php
-+endif;
-+?>
-
- </body>
- </html>
diff --git a/pld-branding.patch b/pld-branding.patch
index b407cec..a4654be 100644
--- a/pld-branding.patch
+++ b/pld-branding.patch
@@ -1,5 +1,5 @@
---- 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
+--- dokuwiki-2020-07-29a/lib/tpl/dokuwiki/tpl_footer.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/lib/tpl/dokuwiki/tpl_footer.php 2023-03-27 11:40:09.110901733 +0300
@@ -24,6 +24,8 @@
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
@@ -7,5 +7,5 @@
+ <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="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>
+ src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15"
+ alt="Driven by DokuWiki" /></a>
diff --git a/task-1821.patch b/task-1821.patch
index f7c7eba..a4b0210 100644
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -32,33 +32,17 @@ http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev
'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 @@
- * @return bool true if successfully sent
- */
- public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
-- global $DIFF_INLINESTYLES;
-+ global $DIFF_INLINESTYLES, $INFO;
-
- // prepare replacements (keys not set in hrep will be taken from trep)
-+ $rev2 = $INFO['meta']['date']['modified'];
- $trep = array(
- 'PAGE' => $id,
-- 'NEWPAGE' => wl($id, '', true, '&'),
-+ 'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
- 'SUMMARY' => $summary,
- 'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
- );
-@@ -398,6 +399,7 @@
- if($rev) {
+--- dokuwiki-2020-07-29a/inc/Subscriptions/PageSubscriptionSender.php~ 2023-03-27 11:45:18.000000000 +0300
++++ dokuwiki-2020-07-29a/inc/Subscriptions/PageSubscriptionSender.php 2023-03-27 11:45:20.809303977 +0300
+@@ -39,6 +39,7 @@
+ if ($rev) {
$subject = 'changed';
$trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
-+ $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
++ $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$current_rev",true,'&');
$old_content = rawWiki($id, $rev);
$new_content = rawWiki($id);
-@@ -417,6 +419,7 @@
+@@ -62,6 +63,7 @@
} else {
$subject = 'newpage';
$trep['OLDPAGE'] = '---';
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/f350088ea55194fb569bdc7dbae11fd9d43293b9
More information about the pld-cvs-commit
mailing list