Rediff patches for rpm 4.17

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index 5240da7d4d4f47f4c7fc38edce4862c1d0a6d76c..c38c600a591c0880b86166eb7d4d450ecd079670 100644 (file)
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,16 +1,16 @@
---- dokuwiki-rc2009-01-26/conf/dokuwiki.php~   2009-01-27 12:56:43.000000000 +0200
-+++ dokuwiki-rc2009-01-26/conf/dokuwiki.php    2009-01-27 12:57:04.936215007 +0200
-@@ -75,6 +75,7 @@
+--- 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;
+ $conf['rememberme'] = 1;                 //Enable/disable remember me on login
  $conf['disableactions'] = '';            //comma separated list of actions to disable
- $conf['sneaky_index']   = 0;             //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
  $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
- 
- /* Advanced Options */
---- dokuwiki-2012-07-08/inc/auth.php~  2012-07-07 13:06:48.000000000 +0300
-+++ dokuwiki-2012-07-08/inc/auth.php   2012-07-08 11:21:54.220213692 +0300
-@@ -84,7 +84,7 @@
+ $conf['remote']      = 0;                //Enable/disable remote interfaces
+ $conf['remoteuser']  = '!!not set!!';    //user/groups that have access to remote interface (comma separated)
+--- 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() {
      }
  
      // if no credentials were given try to use HTTP auth (for SSO)

diff --git a/dokuwiki-notifyns.patch b/dokuwiki-notifyns.patch
index 7c192e5ea9676a34f9707338b569232cec687d7b..01f7fd6f9ae4caccde098c006d589543ce350816 100644 (file)
--- a/dokuwiki-notifyns.patch
+++ b/dokuwiki-notifyns.patch
@@ -1,7 +1,7 @@
---- dokuwiki-2013-05-10/inc/common.php~        2013-05-28 22:43:32.565530521 +0300
-+++ dokuwiki-2013-05-10/inc/common.php 2013-05-28 22:47:27.455072897 +0300
-@@ -902,6 +902,34 @@
-   return $date;
+--- 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
+@@ -897,6 +897,34 @@ function gethostsbyaddrs($ips) {
+     }
  }
  
 +
@@ -33,9 +33,9 @@
 +}
 +
  /**
-  * Sends a notify mail on page change
+  * Checks if a given page is currently locked.
   *
-@@ -1162,10 +1162,10 @@
+@@ -1435,10 +1463,10 @@ function notify($id, $who, $rev = '', $s
  
      // decide if there is something to do, eg. whom to mail
      if($who == 'admin') {
@@ -47,10 +47,10 @@
 +        if(empty($to)) return; //notify enabled?
      } elseif($who == 'subscribers') {
          if(!actionOK('subscribe')) return false; //subscribers enabled?
-         if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors
---- 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 @@
+         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)
   */
  function media_notify($id,$file,$mime,$old_rev=false){
      global $conf;
@@ -64,9 +64,9 @@
  }
  
  /**
---- dokuwiki-2013-05-10/inc/subscription.php~  2013-05-10 15:45:54.000000000 +0300
-+++ dokuwiki-2013-05-10/inc/subscription.php   2013-05-28 22:50:30.872112776 +0300
-@@ -484,7 +484,8 @@
+--- 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) {
          global $conf;
@@ -76,7 +76,7 @@
  
          $trep = array(
              'NEWUSER' => $login,
-@@ -493,7 +494,7 @@
+@@ -498,7 +499,7 @@ class Subscription {
          );
  
          return $this->send(
@@ -85,7 +85,7 @@
              'new_user',
              $login,
              'registermail',
-@@ -672,7 +672,8 @@
+@@ -682,7 +683,8 @@ class Subscription {
  
                  $level = auth_aclcheck($id, $user, $userinfo['grps']);
                  if($level >= AUTH_READ) {

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 2b5b4bb578052c8bd9ce778fd9c6aa7d2f8086d7..b9b933ca1e21be8ea79114f76d80ed2cc0937290 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -15,11 +15,9 @@ https://github.com/splitbrain/dokuwiki/pull/108#issuecomment-6833563
  install.php  |   26 ++++++++++++++------------
  2 files changed, 21 insertions(+), 13 deletions(-)
 
-diff --git a/inc/init.php b/inc/init.php
-index 403fbe4..29d96b2 100644
---- a/inc/init.php
-+++ b/inc/init.php
-@@ -23,7 +23,13 @@ if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/
+--- 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/)
@@ -33,12 +31,10 @@ index 403fbe4..29d96b2 100644
 +if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
  
  // check for error reporting override or set error reporting to sane values
- if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
-diff --git a/install.php b/install.php
-index 80e9ad4..fe72513 100644
---- a/install.php
-+++ b/install.php
-@@ -6,8 +6,10 @@
+ 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 @@
   */
  
  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
@@ -49,9 +45,9 @@ index 80e9ad4..fe72513 100644
 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
 +if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
  
- require_once(DOKU_INC.'inc/PassHash.class.php');
- 
-@@ -428,17 +430,17 @@ function check_permissions(){
+ // load and initialize the core system
+ require_once(DOKU_INC.'inc/init.php');
+@@ -492,17 +494,17 @@ function check_permissions(){
  
      $dirs = array(
          'conf'        => DOKU_LOCAL,
@@ -80,5 +76,3 @@ index 80e9ad4..fe72513 100644
      );
  
      $ok = true;
--- 
-1.7.7.4