[packages/dokuwiki] Up to 2026-07-14c
arekm
arekm at pld-linux.org
Wed Oct 21 01:52:25 CEST 2026
commit 01f41679a4d0b26992ac1c249af772ed5c52221c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Oct 21 00:00:34 2026 +0200
Up to 2026-07-14c
dokuwiki-apache.conf | 8 +--
dokuwiki-config.patch | 9 +--
dokuwiki-http_auth-option.patch | 14 ++---
dokuwiki-mailtext.patch | 7 +--
dokuwiki-notification-diffurl.patch | 25 ++++++++
dokuwiki-notify-respect-minor.patch | 12 ----
dokuwiki-paths.patch | 120 ++++++++++++++++++------------------
dokuwiki-system-geshi.patch | 37 +++++++++++
dokuwiki.spec | 41 +++++-------
iconsizes-dump.patch | 42 ++++++-------
pld-branding.patch | 6 +-
preload.php | 4 +-
style-width.patch | 6 +-
task-1821.patch | 52 ----------------
tokenauth-lowercase-header.patch | 10 ---
15 files changed, 183 insertions(+), 210 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index a5dec4d..e9a7b59 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,8 +1,8 @@
-%define subver 2023-04-04a
+%define subver 2026-07-14c
%define ver %(echo %{subver} | tr -d -)
#define snap 1
#define rc_ 1
-%define php_min_version 7.2
+%define php_min_version 8.2
Summary: PHP-based Wiki webapplication
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
@@ -12,7 +12,7 @@ License: GPL v2
Group: Applications/WWW
# Source0Download: https://download.dokuwiki.org/archive
Source0: https://github.com/dokuwiki/dokuwiki/releases/download/release-%{subver}/dokuwiki-%{subver}.tgz
-# Source0-md5: 8a68393e689bf6d1130bfe660a19fc6b
+# Source0-md5: 7fe581ad8609205fd6a733b9e8ddd70c
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: http://glen.alkohol.ee/pld/jude.png
@@ -36,14 +36,11 @@ Patch66: %{name}-config.patch
Patch0: %{name}-paths.patch
Patch2: style-width.patch
Patch5: %{name}-http_auth-option.patch
-Patch8: %{name}-notify-respect-minor.patch
Patch10: %{name}-mailtext.patch
Patch19: pld-branding.patch
-Patch21: task-1821.patch
Patch27: iconsizes-dump.patch
-Patch28: https://github.com/dokuwiki/dokuwiki/pull/2432.diff
-# Patch28-md5: 5afbddfdd2b5c3a72377ead41da555af
-Patch29: tokenauth-lowercase-header.patch
+Patch30: %{name}-notification-diffurl.patch
+Patch31: %{name}-system-geshi.patch
URL: https://www.dokuwiki.org/
BuildRequires: fslint
BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -130,13 +127,11 @@ echo '====== PlayGround ======' > data/pages/playground/playground.txt
%patch -P0 -p1
%patch -P2 -p1
%patch -P5 -p1
-%patch -P8 -p1
%patch -P10 -p1
%patch -P19 -p1
-#%%patch21 -p1
%patch -P27 -p1
-%patch -P28 -p1
-%patch -P29 -p1
+%patch -P30 -p1
+%patch -P31 -p1
%patch -P66 -p1
# package as basenames, upgrade overwrite protected with .rpmnew
@@ -149,8 +144,6 @@ find -name _dummy | xargs %{__rm}
%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html
%{__rm} {conf,inc,bin,data}/.htaccess
%{__rm} vendor/.htaccess
-%{__rm} lib/plugins/styling/.travis.yml
-%{__rm} -r lib/plugins/*/_test
# we just don't package deleted files, these get removed automatically on rpm upgrades
%{__rm} data/deleted.files
@@ -160,12 +153,7 @@ find -name _dummy | xargs %{__rm}
%{__rm} lib/scripts/jquery/update.sh
# use system geshi package
-%{__rm} -r vendor/geshi/geshi
-install -d vendor/geshi/geshi/src
-%{__ln} -snf %{php_data_dir}/geshi.php vendor/geshi/geshi/src/geshi.php
-
-# generic vendor cleanup
-%{__rm} -v vendor/*/*/composer.*
+%{__rm} -r vendor/geshi
# use system simplepie package
#%{__rm} inc/SimplePie.php
@@ -339,6 +327,7 @@ exit 0
%{_appdir}/inc/Debug
%{_appdir}/inc/Exception
%{_appdir}/inc/Extension
+%{_appdir}/inc/Feed
%{_appdir}/inc/File
%{_appdir}/inc/Form
%{_appdir}/inc/HTTP
@@ -349,6 +338,7 @@ exit 0
%{_appdir}/inc/Search
%{_appdir}/inc/Sitemap
%{_appdir}/inc/Subscriptions
+%{_appdir}/inc/TreeBuilder
%{_appdir}/inc/Ui
%{_appdir}/inc/Utf8
%{_appdir}/inc/parser
@@ -362,20 +352,22 @@ exit 0
# bundled packages
# verbose files to detect new addons
%dir %{_appdir}/vendor/aziraphale
-%dir %{_appdir}/vendor/geshi
%dir %{_appdir}/vendor/kissifrot
-%dir %{_appdir}/vendor/marcusschwarz
%dir %{_appdir}/vendor/openpsa
+%dir %{_appdir}/vendor/paragonie
+%dir %{_appdir}/vendor/php81_bc
%dir %{_appdir}/vendor/phpseclib
%dir %{_appdir}/vendor/simplepie
%dir %{_appdir}/vendor/splitbrain
%{_appdir}/vendor/aziraphale/email-address-validator
-%{_appdir}/vendor/geshi/geshi
%{_appdir}/vendor/kissifrot/php-ixr
-%{_appdir}/vendor/marcusschwarz/lesserphp
%{_appdir}/vendor/openpsa/universalfeedcreator
+%{_appdir}/vendor/paragonie/constant_time_encoding
+%{_appdir}/vendor/paragonie/random_compat
+%{_appdir}/vendor/php81_bc/strftime
%{_appdir}/vendor/phpseclib/phpseclib
%{_appdir}/vendor/simplepie/simplepie
+%{_appdir}/vendor/splitbrain/lesserphp
%{_appdir}/vendor/splitbrain/php-archive
%{_appdir}/vendor/splitbrain/php-cli
%{_appdir}/vendor/splitbrain/php-jsstrip
@@ -414,7 +406,6 @@ exit 0
%{_appdir}/lib/plugins/config/settings
%dir %{_appdir}/lib/plugins/extension
%{_appdir}/lib/plugins/extension/*.*
-%{_appdir}/lib/plugins/extension/helper
%{_appdir}/lib/plugins/extension/images
%dir %{_appdir}/lib/plugins/logviewer
%{_appdir}/lib/plugins/logviewer/*.*
diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index dad8b75..50f9a02 100644
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -20,13 +20,13 @@ Alias /dokuwiki /usr/share/dokuwiki
## to your document root.
RewriteBase /dokuwiki
- RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L]
- RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L]
- RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L]
+ RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L,B]
+ RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L,B]
+ RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L,B]
RewriteRule ^$ doku.php [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule (.*) doku.php?id=$1 [QSA,L]
+ RewriteRule (.*) doku.php?id=$1 [QSA,L,B]
RewriteRule ^index.php$ doku.php
</IfModule>
</Directory>
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 8401d68..7109834 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,6 +1,6 @@
---- 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,16 @@
+--- a/conf/dokuwiki.php
++++ b/conf/dokuwiki.php
+@@ -13,15 +13,17 @@
/* Basic Settings */
@@ -9,6 +9,7 @@
$conf['start'] = 'start'; //name of start page
$conf['lang'] = 'en'; //your language
$conf['template'] = 'dokuwiki'; //see lib/tpl directory
+ $conf['syntax'] = 'dw'; //syntax flavor: 'dw', 'md', 'dw+md', 'md+dw'
$conf['tagline'] = ''; //tagline in header (if template supports it)
$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it)
-$conf['license'] = 'cc-by-nc-sa'; //see conf/license.php
@@ -20,7 +21,7 @@
$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
-@@ -140,7 +142,7 @@
+@@ -142,7 +144,7 @@
$conf['rss_show_deleted'] = 1; //Show deleted items 0|1
/* Advanced Settings */
diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index 462b139..c995867 100644
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,18 +1,18 @@
- 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 @@
+--- a/conf/dokuwiki.php
++++ b/conf/dokuwiki.php
+@@ -66,6 +66,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['samesitecookie'] = 'Lax'; //SameSite attribute for cookies (Lax|Strict|None|Empty)
$conf['remote'] = 0; //Enable/disable remote interfaces
- $conf['remoteuser'] = '!!not set!!'; //user/groups that have access to remote interface (comma separated). leave empty to allow all users
---- dokuwiki-2023-04-04/inc/auth.php~ 2023-04-04 19:21:21.000000000 +0300
-+++ dokuwiki-2023-04-04/inc/auth.php 2023-04-05 15:43:33.873377532 +0300
-@@ -75,7 +75,7 @@
+--- a/inc/auth.php
++++ b/inc/auth.php
+@@ -90,7 +90,7 @@
}
// if no credentials were given try to use HTTP auth (for SSO)
diff --git a/dokuwiki-mailtext.patch b/dokuwiki-mailtext.patch
index 2e149dc..df65df9 100644
--- a/dokuwiki-mailtext.patch
+++ b/dokuwiki-mailtext.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/inc/lang/en/mailtext.txt
++++ b/inc/lang/en/mailtext.txt
@@ -1,15 +1,8 @@
-A page in your DokuWiki was added or changed. Here are the details:
-
@@ -14,9 +14,8 @@
-
-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-notification-diffurl.patch b/dokuwiki-notification-diffurl.patch
new file mode 100644
index 0000000..565d0a4
--- /dev/null
+++ b/dokuwiki-notification-diffurl.patch
@@ -0,0 +1,25 @@
+upstream notification templates have no link to the diff; add @DIFFPAGE@ for the PLD mailtext template
+
+--- a/inc/Subscriptions/PageSubscriptionSender.php
++++ b/inc/Subscriptions/PageSubscriptionSender.php
+@@ -36,6 +36,12 @@
+ if ($rev) {
+ $subject = 'changed';
+ $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
++ $trep['DIFFPAGE'] = wl(
++ $id,
++ ['do' => 'diff', 'rev2[0]' => $rev, 'rev2[1]' => $current_rev],
++ true,
++ '&'
++ );
+
+ $old_content = rawWiki($id, $rev);
+ $new_content = rawWiki($id);
+@@ -59,6 +65,7 @@
+ } else {
+ $subject = 'newpage';
+ $trep['OLDPAGE'] = '---';
++ $trep['DIFFPAGE'] = '---';
+ $tdiff = rawWiki($id);
+ $hdiff = nl2br(hsc($tdiff));
+ }
diff --git a/dokuwiki-notify-respect-minor.patch b/dokuwiki-notify-respect-minor.patch
deleted file mode 100644
index d16f21a..0000000
--- a/dokuwiki-notify-respect-minor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstream: https://github.com/dokuwiki/dokuwiki/pull/2651
-
---- dokuwiki-2022-07-31a/inc/common.php~ 2022-09-03 20:15:22.000000000 +0300
-+++ dokuwiki-2022-07-31a/inc/common.php 2023-03-30 18:03:39.419419351 +0300
-@@ -1319,6 +1319,7 @@
- // decide if there is something to do, eg. whom to mail
- if ($who == 'admin') {
- if (empty($conf['notify'])) return false; //notify enabled?
-+ if ($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
- $tpl = 'mailtext';
- $to = $conf['notify'];
- } elseif ($who == 'subscribers') {
diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 0dac1c2..edfd0e0 100644
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -1,76 +1,76 @@
From f835e03e88ba3cb8de941c7cd0862c57afe22da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
Date: Sun, 24 Jun 2012 12:23:30 +0300
-Subject: [PATCH] introduce DOKU_DATA and DOKU_CACHE variables for packaging
+Subject: [PATCH] make installer use FHS locations
-add new constants, that makes packaging (rpm, deb) dokuwiki better fit
-to [FHS standards](http://www.pathname.com/fhs/pub/fhs-2.3.html):
-- DOKU_DATA - /var/lib/dokuwiki/
-- DOKU_CACHE - /var/cache/dokuwiki/
+The installer must write its configuration to /etc/webapps/dokuwiki and
+check the data directories from the config, which point outside the
+application directory (see FHS).
-Currently upstream is not interested of merging this:
+Upstream is not interested in merging this:
https://github.com/splitbrain/dokuwiki/pull/108#issuecomment-6833563
---
- inc/init.php | 8 +++++++-
- install.php | 26 ++++++++++++++------------
- 2 files changed, 21 insertions(+), 13 deletions(-)
-
---- dokuwiki-2018-04-22c.org/inc/init.php 2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/inc/init.php 2022-09-27 22:46:28.397714335 +0200
-@@ -30,7 +30,13 @@ if(!defined('DOKU_INC')) define('DOKU_IN
- if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-
- // define config path (packagers may want to change this to /etc/dokuwiki/)
--if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
-+if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
-+
-+// define path where variable data is saved (packagers may want to change this to /var/lib/dokuwiki/)
-+if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
-+
-+// define path where cache data saved (packagers may want to change this to /var/cache/dokuwiki/)
-+if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
+--- a/install.php
++++ b/install.php
+@@ -13,8 +13,7 @@
+ use dokuwiki\PassHash;
- // check for error reporting override or set error reporting to sane values
- if (!defined('DOKU_E_LEVEL') && file_exists(DOKU_CONF.'report_e_all')) {
---- dokuwiki-2022-07-31a/install.php~ 2022-09-03 20:15:22.000000000 +0300
-+++ dokuwiki-2022-07-31a/install.php 2023-03-30 17:55:35.143109306 +0300
-@@ -16,8 +16,10 @@
- */
-
- if (!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/');
+ if (!defined('DOKU_INC')) define('DOKU_INC', __DIR__ . '/');
-if (!defined('DOKU_CONF')) define('DOKU_CONF', DOKU_INC . 'conf/');
-if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_INC . 'conf/');
-+if (!defined('DOKU_CONF')) define('DOKU_CONF', '/etc/webapps/dokuwiki/');
-+if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_CONF);
-+if (!defined('DOKU_DATA')) define('DOKU_DATA', '/var/lib/dokuwiki/');
-+if (!defined('DOKU_CACHE')) define('DOKU_CACHE', '/var/cache/dokuwiki/');
++if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', '/etc/webapps/dokuwiki/');
// load and initialize the core system
require_once(DOKU_INC . 'inc/init.php');
-@@ -540,16 +540,16 @@
- $dirs = array(
- 'conf' => DOKU_LOCAL,
- 'data' => DOKU_INC . 'data',
-- 'pages' => DOKU_INC . 'data/pages',
-- 'attic' => DOKU_INC . 'data/attic',
-- 'media' => DOKU_INC . 'data/media',
+@@ -374,6 +373,7 @@
+ function store_data($d)
+ {
+ global $LC;
++ global $conf;
+ $ok = true;
+ $d['policy'] = (int)$d['policy'];
+
+@@ -466,7 +466,7 @@
+
+ // enable popularity submission
+ if (isset($d['pop']) && $d['pop']) {
+- @touch(DOKU_INC . 'data/cache/autosubmit.txt');
++ @touch($conf['cachedir'] . '/autosubmit.txt');
+ }
+
+ // disable auth plugins til needed
+@@ -560,22 +560,23 @@
+ */
+ function check_permissions()
+ {
++ global $conf;
+ global $error;
+ global $lang;
+
+ $dirs = [
+ 'conf' => DOKU_LOCAL,
+- 'data' => DOKU_INC . 'data',
+- 'pages' => DOKU_INC . 'data/pages',
+- 'attic' => DOKU_INC . 'data/attic',
+- 'media' => DOKU_INC . 'data/media',
- 'media_attic' => DOKU_INC . 'data/media_attic',
-- 'media_meta' => DOKU_INC . 'data/media_meta',
-- 'meta' => DOKU_INC . 'data/meta',
-- 'cache' => DOKU_INC . 'data/cache',
-- 'locks' => DOKU_INC . 'data/locks',
-- 'index' => DOKU_INC . 'data/index',
-- 'tmp' => DOKU_INC . 'data/tmp'
-+ 'pages' => DOKU_DATA . 'pages',
-+ 'attic' => DOKU_DATA . 'attic',
-+ 'media' => DOKU_DATA . 'media',
-+ 'media_attic' => DOKU_DATA . 'media_attic',
-+ 'media_meta' => DOKU_DATA . 'media_meta',
-+ 'meta' => DOKU_DATA . 'meta',
-+ 'cache' => DOKU_CACHE,
-+ 'locks' => DOKU_DATA . 'locks',
-+ 'index' => DOKU_DATA . 'index',
-+ 'tmp' => DOKU_DATA . 'tmp'
- );
+- 'media_meta' => DOKU_INC . 'data/media_meta',
+- 'meta' => DOKU_INC . 'data/meta',
+- 'cache' => DOKU_INC . 'data/cache',
+- 'locks' => DOKU_INC . 'data/locks',
+- 'index' => DOKU_INC . 'data/index',
+- 'tmp' => DOKU_INC . 'data/tmp'
++ 'data' => $conf['savedir'],
++ 'pages' => $conf['datadir'],
++ 'attic' => $conf['olddir'],
++ 'media' => $conf['mediadir'],
++ 'media_attic' => $conf['mediaolddir'],
++ 'media_meta' => $conf['mediametadir'],
++ 'meta' => $conf['metadir'],
++ 'cache' => $conf['cachedir'],
++ 'locks' => $conf['lockdir'],
++ 'index' => $conf['indexdir'],
++ 'tmp' => $conf['tmpdir']
+ ];
$ok = true;
diff --git a/dokuwiki-system-geshi.patch b/dokuwiki-system-geshi.patch
new file mode 100644
index 0000000..ae52ffd
--- /dev/null
+++ b/dokuwiki-system-geshi.patch
@@ -0,0 +1,37 @@
+use the packaged GeSHi instead of the bundled copy; the composer autoloader
+and the syntax highlight cache invalidation must point at the packaged
+/usr/share/php/geshi.php
+---
+--- a/vendor/composer/autoload_classmap.php
++++ b/vendor/composer/autoload_classmap.php
+@@ -15,7 +15,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',
+ 'HTMLCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php',
+ 'HtmlDescribable' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
+ 'JSCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
+--- a/vendor/composer/autoload_static.php
++++ b/vendor/composer/autoload_static.php
+@@ -133,7 +133,7 @@
+ 'FeedImage' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedImage.php',
+ 'FeedItem' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedItem.php',
+ 'GPXCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php',
+- 'GeSHi' => __DIR__ . '/..' . '/geshi/geshi/src/geshi.php',
++ 'GeSHi' => '/usr/share/php/geshi.php',
+ 'HTMLCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php',
+ 'HtmlDescribable' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
+ 'JSCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
+--- a/inc/parserutils.php
++++ b/inc/parserutils.php
+@@ -708,7 +708,7 @@
+ $ctime = @filemtime($cache);
+ if (
+ $ctime && !$INPUT->bool('purge') &&
+- $ctime > filemtime(DOKU_INC . 'vendor/composer/installed.json') && // libraries changed
++ $ctime > filemtime('/usr/share/php/geshi.php') && // libraries changed
+ $ctime > filemtime(reset($config_cascade['main']['default']))
+ ) { // dokuwiki changed
+ $highlighted_code = io_readFile($cache, false);
diff --git a/iconsizes-dump.patch b/iconsizes-dump.patch
index 2750bc8..44dff33 100644
--- a/iconsizes-dump.patch
+++ b/iconsizes-dump.patch
@@ -4,38 +4,32 @@ Date: Tue, 9 Jun 2015 11:16:12 +0300
Subject: [PATCH] fileicons: allow specify what sizes to dump
URL: https://github.com/splitbrain/dokuwiki/pull/1187
Status: Rejected by upstream
-
---
- lib/images/fileicons/index.php | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
---- 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>
+--- a/lib/images/fileicons/index.php
++++ b/lib/images/fileicons/index.php
+@@ -29,13 +29,21 @@
<body>
-+<?php
-+$sizes = isset($_GET['sizes']) ? explode(',', (string)$_GET['sizes']) : array(16, 32);
-+?>
<?php
- $fi_list = ''; $fi_list32 = '';
++$sizes = isset($_GET['sizes']) ? explode(',', (string)$_GET['sizes']) : [16, 32];
++?>
++
++<?php
+ $fi_list = '';
+ $fi_list32 = '';
-foreach (glob('*.png') as $img) {
-- $fi_list .= '<img src="'.$img.'" alt="'.$img.'" title="'.$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('*.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.'" /> ';
+- $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.'" /> ';
-+ }
++ foreach (glob('32x32/*.png') as $img) {
++ $fi_list32 .= '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" /> ';
++ }
}
-+
echo '<div class="white box">
- '.$fi_list.'
- </div>
+ ' . $fi_list . '
diff --git a/pld-branding.patch b/pld-branding.patch
index a4654be..5a89dd3 100644
--- a/pld-branding.patch
+++ b/pld-branding.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/lib/tpl/dokuwiki/tpl_footer.php
++++ b/lib/tpl/dokuwiki/tpl_footer.php
+@@ -25,6 +25,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
src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
diff --git a/preload.php b/preload.php
index 8eadbdb..f169aba 100644
--- a/preload.php
+++ b/preload.php
@@ -6,8 +6,8 @@
* DokuWiki directory hierarchy.
*/
-define('DOKU_LOCAL', '/etc/webapps/dokuwiki/');
-define('DOKU_CONF', dirname(__DIR__) . '/conf/');
+if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', '/etc/webapps/dokuwiki/');
+if (!defined('DOKU_CONF')) define('DOKU_CONF', dirname(__DIR__) . '/conf/');
$config_cascade = array(
'main' => array(
diff --git a/style-width.patch b/style-width.patch
index 2062c9c..a706317 100644
--- a/style-width.patch
+++ b/style-width.patch
@@ -1,6 +1,6 @@
---- dokuwiki-rc2013-10-28/lib/tpl/dokuwiki/style.ini~ 2013-10-28 21:28:57.000000000 +0200
-+++ dokuwiki-rc2013-10-28/lib/tpl/dokuwiki/style.ini 2013-11-13 22:20:04.340766336 +0200
-@@ -78,8 +78,8 @@
+--- a/lib/tpl/dokuwiki/style.ini
++++ b/lib/tpl/dokuwiki/style.ini
+@@ -80,8 +80,8 @@
__missing__ = "#d30" ; @ini_missing
; site and sidebar widths
diff --git a/task-1821.patch b/task-1821.patch
deleted file mode 100644
index a4b0210..0000000
--- a/task-1821.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-adds: @DIFFPAGE@ placeholder to templates
-
-TODO:
-use rev1, rev2
-http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
-
---- 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)) {
-+
-+ // 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];
-
-@@ -1458,8 +1464,8 @@
- } else {
- $urlparam = array(
- 'do' => 'diff',
-- 'rev2[0]' => $lrev,
-- 'rev2[1]' => $rrev,
-+ 'r1' => $lrev,
-+ 'r2' => $rrev,
- 'difftype' => $difftype,
- );
- }
---- 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=$current_rev",true,'&');
-
- $old_content = rawWiki($id, $rev);
- $new_content = rawWiki($id);
-@@ -62,6 +63,7 @@
- } else {
- $subject = 'newpage';
- $trep['OLDPAGE'] = '---';
-+ $trep['DIFFPAGE']= '---';
- $tdiff = rawWiki($id);
- $hdiff = nl2br(hsc($tdiff));
- }
diff --git a/tokenauth-lowercase-header.patch b/tokenauth-lowercase-header.patch
deleted file mode 100644
index b835e2b..0000000
--- a/tokenauth-lowercase-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dokuwiki-2023-04-04/inc/auth.php~ 2023-04-28 23:43:03.000000000 +0300
-+++ dokuwiki-2023-04-04/inc/auth.php 2023-04-29 00:53:43.324078441 +0300
-@@ -177,6 +177,7 @@
- // Authorization headers are not in $_SERVER for mod_php
- $headers = apache_request_headers();
- if(isset($headers['Authorization'])) $header = $headers['Authorization'];
-+ if(!$header && isset($headers['authorization'])) $header = $headers['authorization'];
- } else {
- $header = $INPUT->server->str('HTTP_AUTHORIZATION');
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/01f41679a4d0b26992ac1c249af772ed5c52221c
More information about the pld-cvs-commit
mailing list