- update to today snapshot (20091110)

Changed files:
    cliapps.patch -> 1.2
    dokuwiki-config.patch -> 1.8
    dokuwiki-geshi.patch -> 1.4
    dokuwiki-http_auth-option.patch -> 1.4
    dokuwiki-mail-headerencodequotes.patch -> 1.3
    dokuwiki-nice_exit.patch -> 1.2
    dokuwiki-paths.patch -> 1.5
    dokuwiki.spec -> 1.57

diff --git a/cliapps.patch b/cliapps.patch
index fe251a0ac48232b3728a79b96f6e0f0207d5bc05..878abb351f2f630155c3520945f018489334530f 100644 (file)
--- a/cliapps.patch
+++ b/cliapps.patch
@@ -1,16 +1,3 @@
---- dokuwiki/bin/dwpage.php    2009-02-14 14:13:24.000000000 +0200
-+++ dokuwiki/bin/dwpage.php    2009-08-07 15:09:50.000000000 +0300
-@@ -1,8 +1,9 @@
- #!/usr/bin/php -d short_open_tag=on
- <?php
--#------------------------------------------------------------------------------
- if ('cli' != php_sapi_name()) die();
- 
-+#------------------------------------------------------------------------------
-+ini_set('memory_limit','128M');
- if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
- require_once DOKU_INC.'inc/init.php';
- require_once DOKU_INC.'inc/common.php';
 --- dokuwiki/bin/indexer.php   2009-02-14 14:13:24.000000000 +0200
 +++ dokuwiki/bin/indexer.php   2009-08-07 15:04:00.000000000 +0300
 @@ -1,7 +1,9 @@

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 93a78ba53f3bbcc2f558e34933f16a0e5dc6092b..e2b0f32236ce1837f04e38f944c9505ad8530620 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -9,14 +9,13 @@
  $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
  
  /* Display Options */
-Tylko w dokuwiki-rc2009-02-06.new/conf: dokuwiki.php~
---- dokuwiki-rc2009-02-06/install.php  2009-02-06 09:10:45.000000000 +0100
-+++ dokuwiki-rc2009-02-06.new/install.php      2009-02-07 10:55:11.166843399 +0100
-@@ -45,6 +45,7 @@
+--- dokuwiki/install.php~      2009-11-10 15:24:36.000000000 +0200
++++ dokuwiki/install.php       2009-11-10 15:25:06.540902430 +0200
+@@ -46,6 +46,7 @@
      '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
      '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
-     'rc2009-02-06' => 'ec8c04210732a14fdfce0f7f6eead865',
-+    'rc2009-02-06-pld' => '1544625eba520a785fe663839b88596f', # md5sum -b conf/dokuwiki.php
+     '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
++    '2009-02-14-pld'   => 'f2ea17d864c3d7995418e58b85dbb8d0',
  );
  
  

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index 5069d4e9ad328978981f42520e6dfb5cd195e13c..f981af989d9dc32fb58c0fdd3e3ac31f6d527b03 100644 (file)
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -1,23 +1,23 @@
---- dokuwiki-rc2009-01-26/inc/parserutils.php~ 2009-01-27 12:53:30.000000000 +0200
-+++ dokuwiki-rc2009-01-26/inc/parserutils.php  2009-01-27 12:56:10.256418763 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+--- dokuwiki/inc/parserutils.php~      2009-11-10 15:25:28.000000000 +0200
++++ dokuwiki/inc/parserutils.php       2009-11-10 15:26:29.134232633 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once '/usr/share/php/geshi.php';
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once '/usr/share/php/geshi.php';
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language);
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language);
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index f18574e1f1c25d590bd1a5e8c433b691fa95b551..948a54a797c7c6c40ee27ed9c1a1eb8a1ddb1bf2 100644 (file)
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -8,14 +8,14 @@
  $conf['securecookie'] = 1;               //never send HTTPS cookies via HTTP
  
  /* Advanced Options */
---- dokuwiki-2007-06-26b/inc/auth.php~ 2007-06-26 21:27:15.000000000 +0300
-+++ dokuwiki-2007-06-26b/inc/auth.php  2007-12-19 00:40:14.598022033 +0200
-@@ -60,7 +60,7 @@
-       if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
+--- dokuwiki/inc/auth.php~     2009-11-10 15:27:25.000000000 +0200
++++ dokuwiki/inc/auth.php      2009-11-10 15:28:31.494299548 +0200
+@@ -68,7 +68,7 @@
+         }
  
-       // if no credentials were given try to use HTTP auth (for SSO)
--      if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
-+      if($conf['http_auth'] && empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
-         $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
-         $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
-       }
+         // if no credentials were given try to use HTTP auth (for SSO)
+-        if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
++        if($conf['http_auth'] && empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
+             $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
+             $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
+             $_REQUEST['http_credentials'] = true;

diff --git a/dokuwiki-mail-headerencodequotes.patch b/dokuwiki-mail-headerencodequotes.patch
index 58f99d02e7c6fb64b782be00b8a914d3f5fc7721..3ba65fddba6ea5433b938ae6d60cb59ad1438c03 100644 (file)
--- a/dokuwiki-mail-headerencodequotes.patch
+++ b/dokuwiki-mail-headerencodequotes.patch
@@ -1,20 +1,22 @@
---- dokuwiki/inc/mail.php~     2008-02-25 16:51:02.000000000 +0200
-+++ dokuwiki/inc/mail.php      2008-02-25 16:51:07.741031127 +0200
-@@ -124,7 +125,16 @@
-       }
+--- dokuwiki/inc/mail.php~  2009-11-10 15:32:16.000000000 +0200
++++ dokuwiki/inc/mail.php   2009-11-10 15:34:00.074347495 +0200
+@@ -164,8 +164,17 @@
+             }
  
-       if(!utf8_isASCII($text)){
--        $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
-+        // put the quotes outside as in =?UTF-8?Q?"Elan Ruusam=C3=A4e"?= vs "=?UTF-8?Q?Elan Ruusam=C3=A4e?="
-+        if (preg_match('/^"(.+)"$/', $text, $matches)) {
-+          $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1], 0).'?="';
-+        } else {
-+          $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text, 0).'?=';
-+        }
-+        // additionally the space character should be encoded as =20 (or each
-+        // word QP encoded separately).
-+        // however this is needed only in mail headers, not globally in mail_quotedprintable_encode().
-+        $text = str_replace(" ", "=20", $text);
-       }
-     }else{
-       $text = '';
+             if(!utf8_isASCII($text)){
+-                $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+-            }
++                // put the quotes outside as in =?UTF-8?Q?"Elan Ruusam=C3=A4e"?= vs "=?UTF-8?Q?Elan Ruusam=C3=A4e?="
++                if (preg_match('/^"(.+)"$/', $text, $matches)) {
++                  $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1], 0).'?="';
++                } else {
++                  $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text, 0).'?=';
++                }
++                // additionally the space character should be encoded as =20 (or each
++                // word QP encoded separately).
++                // however this is needed only in mail headers, not globally in mail_quotedprintable_encode().
++                $text = str_replace(" ", "=20", $text);
++            }
+         }else{
+             $text = '';
+         }

diff --git a/dokuwiki-nice_exit.patch b/dokuwiki-nice_exit.patch
index ee17b73bbe7b250f97908edee69101ff78a3700e..3b1e58d1914a3af4d783b97c9db00d697d003a95 100644 (file)
--- a/dokuwiki-nice_exit.patch
+++ b/dokuwiki-nice_exit.patch
@@ -1,11 +1,11 @@
---- dokuwiki-2007-06-26b/inc/init.php~ 2008-02-21 18:22:13.970804469 +0200
-+++ dokuwiki-2007-06-26b/inc/init.php  2008-02-21 18:21:49.529717219 +0200
-@@ -384,7 +384,7 @@
-     </body>
-   </html>
+--- dokuwiki/inc/init.php~     2009-11-10 15:31:11.000000000 +0200
++++ dokuwiki/inc/init.php      2009-11-10 15:31:51.307528750 +0200
+@@ -526,7 +526,7 @@
+ </body>
+ </html>
  EOT;
--  exit;
-+  exit(1);
+-    exit;
++    exit(1);
  }
  
  

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 566710555c6e734bbeb081196a6019222ea20c64..6da4553d153fbd7633dd67347a3886eafc6e60c4 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -1,17 +1,17 @@
---- dokuwiki-2009-02-14-paths/inc/init.php     2009-05-26 17:54:37.000000000 +0300
-+++ dokuwiki-2009-02-14/inc/init.php   2009-06-15 19:18:30.845283082 +0300
+--- dokuwiki/inc/init.php~     2009-11-10 15:19:36.000000000 +0200
++++ dokuwiki/inc/init.php      2009-11-10 15:19:38.080947917 +0200
 @@ -21,7 +21,10 @@
-   if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+ if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
  
-   // 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 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 variable data is saved (packagers may want to change this to /var/lib/dokuwiki/)
++if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/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')) {
+ // 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-2009-02-14-paths/install.php      2009-02-14 14:13:25.000000000 +0200
 +++ dokuwiki-2009-02-14/install.php    2009-06-15 19:18:30.845283082 +0300
 @@ -6,8 +6,9 @@
@@ -22,7 +22,7 @@
 -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_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
  
  // check for error reporting override or set error reporting to sane values
  if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
@@ -40,14 +40,14 @@
 -        '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',
-+        'meta'      => DOKU_DATA.'/meta',
-+        'cache'     => DOKU_DATA.'/cache',
-+        'locks'     => DOKU_DATA.'/locks',
-+        'index'     => DOKU_DATA.'/index',
-+        'tmp'       => DOKU_DATA.'/tmp'
++        'pages'     => DOKU_DATA.'pages',
++        'attic'     => DOKU_DATA.'attic',
++        'media'     => DOKU_DATA.'media',
++        'meta'      => DOKU_DATA.'meta',
++        'cache'     => DOKU_DATA.'cache',
++        'locks'     => DOKU_DATA.'locks',
++        'index'     => DOKU_DATA.'index',
++        'tmp'       => DOKU_DATA.'tmp'
      );
  
      $ok = true;

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 3a8a1af2907906f773d78f759bdaf021251d01e9..529a398a363d96a53ca7c4cc51a79915f491e176 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,14 +1,12 @@
-%define                subver  2009-02-14b
-%define                ver     %(echo %{subver} | tr -d -)
 Summary:       PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
-Version:       %{ver}
-Release:       7
+Version:       20091110
+Release:       0.5
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: c75c4781b8698041c3c9b6b0fec2ac2e
+Source0:       http://dev.splitbrain.org/download/snapshots/dokuwiki-latest.tgz
+# Source0-md5: 9da3e5c3a7b40b5a229b38e52b6fcf70
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       jude.png
@@ -17,8 +15,8 @@ Source4:      eventum.gif
 # Source4-md5: cac3d0f82591a33eda2afa8ae5fe65cb
 Source5:       http://forum.skype.com/style_emoticons/skype/skype.png
 # Source5-md5: 25c355be038267dc9fdb724b628000b9
+Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
-Patch1:                %{name}-config.patch
 Patch2:                %{name}-mysqlauth.patch
 Patch3:                %{name}-config-allow-require.patch
 Patch4:                %{name}-geshi.patch
@@ -33,8 +31,6 @@ Patch12:      %{name}-mailthreads.patch
 Patch13:       %{name}-media-directlink.patch
 Patch14:       interwiki-outputonly.patch
 Patch15:       simplepie.patch
-Patch16:       cliapps.patch
-Patch17:       plugin_exists-check.patch
 Patch18:       install.patch
 URL:           http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires: rpmbuild(macros) >= 1.520
@@ -92,9 +88,8 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -109,10 +104,10 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
 %patch18 -p1
 
+%patch66 -p1
+
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html
 
@@ -130,9 +125,19 @@ rm -f inc/SimplePie.php
 # our plugins dir is not writable anyway, nothing to convert
 rm -rf lib/plugins/upgradeplugindirectory
 
+# flash source
+rm -rf lib/_fla
+
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+%build
+md5=$(md5sum -b conf/dokuwiki.php | awk '{print $1}')
+if ! grep $md5 install.php; then
+       : update %{name}-config.patch oudated
+       exit 1
+fi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
@@ -143,9 +148,9 @@ cp -a inc/* $RPM_BUILD_ROOT%{_appdir}/inc
 cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
 cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a data/* $RPM_BUILD_ROOT%{_localstatedir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/acronyms.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/entities.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/interwiki.local.conf
@@ -157,7 +162,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/smileys.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/userstyle.css
 
 ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jide.png
 cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/eventum.gif
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/skype.gif
 
@@ -278,9 +283,11 @@ exit 0
 %{_appdir}/lib/plugins/acl/pix
 %dir %{_appdir}/lib/plugins/config
 %{_appdir}/lib/plugins/config/*.*
+%{_appdir}/lib/plugins/config/images
 %{_appdir}/lib/plugins/config/settings
 %dir %{_appdir}/lib/plugins/plugin
 %{_appdir}/lib/plugins/plugin/*.*
+%{_appdir}/lib/plugins/plugin/classes
 %dir %{_appdir}/lib/plugins/revert
 %{_appdir}/lib/plugins/revert/*.*
 %dir %{_appdir}/lib/plugins/usermanager
@@ -306,12 +313,10 @@ exit 0
 %dir %attr(770,root,http) %{_localstatedir}/meta
 %dir %attr(770,root,http) %{_localstatedir}/pages
 %dir %attr(770,root,http) %{_localstatedir}/pages/wiki
-%dir %attr(770,root,http) %{_localstatedir}/pages/playground
 %dir %attr(770,root,http) %{_localstatedir}/tmp
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki-128.png
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/dokuwiki.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/syntax.txt
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
 
 %files setup
 %defattr(644,root,root,755)