Up to 2022-07-31a, requires php 7.2

diff --git a/autoload.patch b/autoload.patch
index c1107b02d3899eb5b197a9d90f03dd5adf5b8cd3..162bb17c8343b172014708a580f474630469511f 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,11 +1,14 @@
---- 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();
+--- dokuwiki-2022-07-31a/vendor/composer/autoload_real.php~    2022-09-03 20:15:22.000000000 +0300
++++ dokuwiki-2022-07-31a/vendor/composer/autoload_real.php     2023-03-30 17:57:54.803967426 +0300
+@@ -28,8 +28,11 @@
+         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
          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';
++              // autoload_static.php patching is annoying and not worth the effort
++              if (0) {
+         require __DIR__ . '/autoload_static.php';
+         call_user_func(\Composer\Autoload\ComposerStaticInita19a915ee98347a0c787119619d2ff9b::getInitializer($loader));
++              }
+ 
+         $loader->register(true);
  

diff --git a/dokuwiki-notify-respect-minor.patch b/dokuwiki-notify-respect-minor.patch
index 47579bbc86a04f5e52f71fe652614dc874f56bde..d16f21aa90fb5d3dd97f9d5c2ca18e42d17ef55a 100644 (file)
--- a/dokuwiki-notify-respect-minor.patch
+++ b/dokuwiki-notify-respect-minor.patch
@@ -1,10 +1,12 @@
---- dokuwiki-2013-02-01/inc/common.php~        2013-01-28 00:59:02.000000000 +0200
-+++ dokuwiki-2013-02-01/inc/common.php 2013-02-01 01:29:08.204212401 +0200
-@@ -1110,6 +1110,7 @@
+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'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
+     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') {
+     } elseif ($who == 'subscribers') {

diff --git a/dokuwiki-notifyns.patch b/dokuwiki-notifyns.patch
index 7144806590bb202d4290b918008f5df12623b2af..6531099ec0721b9e437020a65bc7336f7955e799 100644 (file)
--- a/dokuwiki-notifyns.patch
+++ b/dokuwiki-notifyns.patch
@@ -1,5 +1,5 @@
---- dokuwiki-2018-04-22c.org/inc/common.php    2022-09-27 22:46:33.691324681 +0200
-+++ dokuwiki-2018-04-22c/inc/common.php        2022-09-27 22:46:33.924670225 +0200
+--- dokuwiki-2022-07-31a/inc/common.php~       2023-03-30 18:04:18.000000000 +0300
++++ dokuwiki-2022-07-31a/inc/common.php        2023-03-30 18:05:59.000277451 +0300
 @@ -897,6 +897,34 @@ function gethostsbyaddrs($ips) {
      }
  }
@@ -35,32 +35,32 @@
  /**
   * Checks if a given page is currently locked.
   *
-@@ -1435,10 +1463,10 @@ function notify($id, $who, $rev = '', $s
+@@ -1346,10 +1346,10 @@
  
      // 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'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
+     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'];
 +        $to  = notifyNS($id, $conf['notify']);
-+        if(empty($to)) return; //notify enabled?
-     } elseif($who == 'subscribers') {
-         if(!actionOK('subscribe')) return false; //subscribers enabled?
-         if($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
---- 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 @@
++        if (empty($to)) return false; //notify enabled?
+     } elseif ($who == 'subscribers') {
+         if (!actionOK('subscribe')) return false; //subscribers enabled?
+         if ($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
+--- dokuwiki-2022-07-31a/inc/media.php~        2022-09-03 20:15:22.000000000 +0300
++++ dokuwiki-2022-07-31a/inc/media.php 2023-03-30 18:08:07.797735926 +0300
+@@ -668,10 +668,11 @@
   */
  function media_notify($id,$file,$mime,$old_rev=false,$current_rev=false){
      global $conf;
--    if(empty($conf['notify'])) return false; //notify enabled?
+-    if(empty($conf['notify'])) return; //notify enabled?
 +    $to = notifyNS($id, $conf['notify']);
-+    if(empty($to)) return false; //notify enabled?
++    if (empty($to)) return; //notify enabled?
  
      $subscription = new MediaSubscriptionSender();
--    return $subscription->sendMediaDiff($conf['notify'], 'uploadmail', $id, $old_rev, $current_rev);
-+    return $subscription->sendMediaDiff($to, 'uploadmail', $id, $old_rev, $current_rev);
+-    $subscription->sendMediaDiff($conf['notify'], 'uploadmail', $id, $old_rev, $current_rev);
++    $subscription->sendMediaDiff($to, 'uploadmail', $id, $old_rev, $current_rev);
  }
  
  /**

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index b9b933ca1e21be8ea79114f76d80ed2cc0937290..0dac1c2ef1b3e4ffaf443ee1286a8d0d0f47dce1 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -32,47 +32,45 @@ https://github.com/splitbrain/dokuwiki/pull/108#issuecomment-6833563
  
  // 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-2018-04-22c.org/install.php       2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/install.php   2022-09-27 22:46:28.397714335 +0200
-@@ -15,8 +15,10 @@
+--- 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_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_INC')) define('DOKU_INC', dirname(__FILE__) . '/');
+-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/');
  
  // load and initialize the core system
- require_once(DOKU_INC.'inc/init.php');
-@@ -492,17 +494,17 @@ function check_permissions(){
- 
+ 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',
--        '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'
-+        'data'        => DOKU_DATA,
-+        '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',
+         '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'
++        'locks'       => DOKU_DATA . 'locks',
++        'index'       => DOKU_DATA . 'index',
++        'tmp'         => DOKU_DATA . 'tmp'
      );
  
      $ok = true;

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 276d2c0fced7fea4a7551fecdd7564ec6ede9fbd..0e1f15c7b1eeb35820029d5862bcba933873b737 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,8 +1,8 @@
-%define                subver  2020-07-29a
+%define                subver  2022-07-31a
 %define                ver             %(echo %{subver} | tr -d -)
 #define                snap    1
 #define                rc_     1
-%define                php_min_version 5.6.0
+%define                php_min_version 7.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://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 86d5d43b07c4bfaf7630c438ae9ce0d7
+# Source0-md5: 4459ea99e3a4ce2b767482f505724dcc
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -137,7 +137,7 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch10 -p1
 %patch11 -p1
 %patch19 -p1
-%patch21 -p1
+#%patch21 -p1
 #%patch24 -p1
 %patch27 -p1
 %patch66 -p1
@@ -152,6 +152,9 @@ 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/testing
+%{__rm} -r lib/plugins/*/_test
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
@@ -340,7 +343,9 @@ exit 0
 %{_appdir}/inc/Cache
 %{_appdir}/inc/ChangeLog
 %{_appdir}/inc/Debug
+%{_appdir}/inc/Exception
 %{_appdir}/inc/Extension
+%{_appdir}/inc/File
 %{_appdir}/inc/Form
 %{_appdir}/inc/HTTP
 %{_appdir}/inc/Input
@@ -363,20 +368,21 @@ exit 0
 # bundled packages
 # verbose files to detect new addons
 %dir %{_appdir}/vendor/aziraphale
+%dir %{_appdir}/vendor/kissifrot
 %dir %{_appdir}/vendor/marcusschwarz
 %dir %{_appdir}/vendor/openpsa
-%dir %{_appdir}/vendor/paragonie
 %dir %{_appdir}/vendor/phpseclib
 %dir %{_appdir}/vendor/simplepie
 %dir %{_appdir}/vendor/splitbrain
 %{_appdir}/vendor/aziraphale/email-address-validator
+%{_appdir}/vendor/kissifrot/php-ixr
 %{_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
+%{_appdir}/vendor/splitbrain/slika
 
 %dir %{_appdir}/lib
 # allow plugins dir permission change to allow installation of plugins from admin
@@ -413,6 +419,8 @@ exit 0
 %{_appdir}/lib/plugins/extension/*.*
 %{_appdir}/lib/plugins/extension/helper
 %{_appdir}/lib/plugins/extension/images
+%dir %{_appdir}/lib/plugins/logviewer
+%{_appdir}/lib/plugins/logviewer/*.*
 %dir %{_appdir}/lib/plugins/revert
 %{_appdir}/lib/plugins/revert/*.*
 %dir %{_appdir}/lib/plugins/safefnrecode