up to 2013-05-10a hotfix

The hotfix released 2013-06-16 contains the following fixes:

- Several fixes related to the new Auth-Plugins (especially LDAP, AD and MySQL)
- Improvements to the random password generator and introduction of AUTH_PASSWORD_GENERATE
- Better password reset tokens
- A fix for image rescaling (Precondition failed problem)
_ A fix related to Internet Explorer's compatibility mode

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 655d6fad48637b5a5df08eededc8238fca3028cb..a1958e14ba9c1239dc093081f32cf70c5cb12b14 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define                subver  2013-05-10
+%define                subver  2013-05-10a
 %define                ver             %(echo %{subver} | tr -d -)
 #define                snap    1
 #define                rc_     1
@@ -8,11 +8,11 @@ Summary:      PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       2
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 9cb5bb79c0445df849845b586e872677
+# Source0-md5: 4d6330ec652d7ed706a6b555a0b8adb8
 #Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
 #Source0:      http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
 Source1:       %{name}-apache.conf
@@ -29,7 +29,6 @@ Source9:      http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
 Source10:      pld.gif
 Source11:      http://glen.alkohol.ee/pld/astah.png
 # Source11-md5:        b1c999e6988440c9e2af6a12e9a56451
-Patch100:      git-fixes.patch
 Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
 Patch1:                system-jquery.patch
@@ -134,7 +133,6 @@ test -e VERSION || echo %{subver}-git > VERSION
 install -d data/pages/playground
 touch data/pages/playground/playground.txt
 %endif
-%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

diff --git a/git-fixes.patch b/git-fixes.patch
deleted file mode 100644 (file)
index 4819127..0000000
--- a/git-fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/inc/auth.php b/inc/auth.php
-index 9f180fc..af9f35b 100644
---- a/inc/auth.php
-+++ b/inc/auth.php
-@@ -54,8 +54,8 @@ function auth_setup() {
-       } elseif ('auth' . $conf['authtype'] === $plugin) {
-         // matches old auth backends (pre-Weatherwax)
-         $auth = $plugin_controller->load('auth', $plugin);
--        msg('Your authtype setting is deprecated. You must set $conf[\'authconfig\'] = ' . "auth" . $conf['authtype']
--             . ' in your config (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1,'','',MSG_ADMINS_ONLY);
-+        msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = "auth' . $conf['authtype'] . '"'
-+             . ' in your configuration (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1,'','',MSG_ADMINS_ONLY);
-       }
-     }
- 
-diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
-index d07f9c8..d530d59 100644
---- a/lib/plugins/authldap/conf/default.php
-+++ b/lib/plugins/authldap/conf/default.php
-@@ -16,4 +16,4 @@ $conf['bindpw']      = '';
- $conf['userscope']  = 'sub';
- $conf['groupscope'] = 'sub';
- $conf['groupkey']   = 'cn';
--$conf['debug']      = array('onoff');
-\ No newline at end of file
-+$conf['debug']      = 0;
-\ No newline at end of file
-diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
-index 647f3d9..427bea2 100644
---- a/lib/plugins/authmysql/conf/default.php
-+++ b/lib/plugins/authmysql/conf/default.php
-@@ -7,7 +7,7 @@ $conf['password']         = '';
- $conf['database']         = '';
- $conf['debug']            = 0;
- $conf['forwardClearPass'] = 0;
--$conf['TablesToLock']     = '';
-+$conf['TablesToLock']     = array();
- $conf['checkPass']        = '';
- $conf['getUserInfo']      = '';
- $conf['getGroups']        = '';