- up to 2009-01-26 rc

Changed files:
    dokuwiki-config.patch -> 1.3
    dokuwiki-find-lang.sh -> 1.3
    dokuwiki-geshi.patch -> 1.3
    dokuwiki-http_auth-option.patch -> 1.3
    dokuwiki.spec -> 1.40

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 523becdf9ab1061dee8d32bceea8276841fd05df..7c944d5dae393a24add2a6d2cb8b59c8c215ffb9 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -12,14 +12,14 @@ you need to update checksum when you modify docuwiki.php
  $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
  
  /* Display Options */
---- dokuwiki-2008-05-05/install.php~   2008-05-05 21:33:44.000000000 +0300
-+++ dokuwiki-2008-05-05/install.php    2008-05-05 21:33:49.877839346 +0300
-@@ -44,6 +44,8 @@
-     '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
+--- dokuwiki-rc2009-01-26/install.php~ 2009-01-27 12:52:00.000000000 +0200
++++ dokuwiki-rc2009-01-26/install.php  2009-01-27 12:52:51.349556857 +0200
+@@ -46,6 +46,8 @@
      '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
      '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
+     'rc2009-01-26' => 'ec8c04210732a14fdfce0f7f6eead865',
 +      # md5sum -b conf/dokuwiki.php
-+    '2008-05-04-pld'   => '12f43c697bd6405854685c2cb4aaeaad',
++      'rc2009-01-26-pld' => 'b6a09aaed22c1865ba154ec11021997e',
  );
  
  

diff --git a/dokuwiki-find-lang.sh b/dokuwiki-find-lang.sh
index 630d09cb6c2e8a2073fb05c79e27ce714928913d..add8412224ac01ffeee79e93ca6d9228cb45d438 100644 (file)
--- a/dokuwiki-find-lang.sh
+++ b/dokuwiki-find-lang.sh
@@ -18,6 +18,9 @@ find $dir -type d -name lang | while read dir; do
                sl-si)
                        lang=sl
                ;;
+               id-ni)
+                       lang=id_NI
+               ;;
                *-*)
                        echo >&2 "Need mapping for $lang!"
                        exit 1

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index e688946cde1e54a901be05ee1350155de89bce4d..5069d4e9ad328978981f42520e6dfb5cd195e13c 100644 (file)
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -1,14 +1,14 @@
---- dokuwiki-2008-05-05/inc/parserutils.php~   2008-05-05 21:34:23.000000000 +0300
-+++ dokuwiki-2008-05-05/inc/parserutils.php    2008-05-05 21:37:11.549493756 +0300
-@@ -642,16 +642,16 @@
+--- 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') &&
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&
-      $ctime > filemtime(DOKU_CONF.'dokuwiki.php')){
+-     $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 {

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index d3b0a17a08beaeca5a5bd2661cf763b28f42a1e9..f18574e1f1c25d590bd1a5e8c433b691fa95b551 100644 (file)
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,13 +1,13 @@
---- dokuwiki-2007-06-26b/conf/dokuwiki.php~    2007-12-19 00:27:28.671399503 +0200
-+++ dokuwiki-2007-06-26b/conf/dokuwiki.php     2007-12-19 00:39:47.679195099 +0200
-@@ -69,6 +69,7 @@
+--- 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 @@
  $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-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 @@

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 8ad2bbc909a6ce2f4c92e0903e2e636ecfddd7da..1622639c67e460168617af4f65c0023c12024205 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,14 +1,15 @@
-%define                subver  2008-05-05
+%define                subver  2009-01-26
 %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:       3
+Release:       0.3
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 1a70a2ab847b704b629cbbe212ce9a00
+#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
+# Source0-md5: 1d4f6cf1bf0062cf83a3d915c5b7077e
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       %{name}-find-lang.sh
@@ -83,7 +84,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}-%{subver}
+%setup -q -n %{name}-rc%{subver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -98,6 +99,9 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch11 -p1
 %patch12 -p1
 
+find -name _dummy | xargs rm
+rm -f lib/index.html lib/plugins/index.html
+
 rm -f inc/lang/.htaccess
 # safe file
 mv conf/words.aspell{.dist,}
@@ -106,6 +110,9 @@ mv conf/words.aspell{.dist,}
 rm -f inc/geshi.php
 rm -rf inc/geshi
 
+# our plugins dir is not writable anyway, nothing to convert
+rm -rf lib/plugins/upgradeplugindirectory
+
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -122,11 +129,12 @@ 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
-touch $RPM_BUILD_ROOT%{_sysconfdir}/local.php
-touch $RPM_BUILD_ROOT%{_sysconfdir}/local.protected.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/acronyms.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/entities.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/interwiki.local.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/license.local.php
+touch $RPM_BUILD_ROOT%{_sysconfdir}/local.php
+touch $RPM_BUILD_ROOT%{_sysconfdir}/local.protected.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mime.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/smileys.local.conf
 
@@ -192,20 +200,23 @@ exit 0
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediameta.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/msg
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/words.aspell
+%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scheme.conf
 
-%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.protected.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.local.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/entities.local.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/interwiki.local.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/license.local.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.protected.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.local.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smileys.local.conf
+%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.php
 
 # use local.php,local.protected.php, etc for local changes
-%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/entities.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/interwiki.conf
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/smileys.conf
 
@@ -245,8 +256,6 @@ exit 0
 %dir %{_appdir}/lib/plugins/usermanager
 %{_appdir}/lib/plugins/usermanager/*.*
 %{_appdir}/lib/plugins/usermanager/images
-%{_appdir}/lib/plugins/importoldchangelog
-%{_appdir}/lib/plugins/importoldindex
 %{_appdir}/lib/plugins/info
 %dir %{_appdir}/lib/plugins/popularity
 %{_appdir}/lib/plugins/popularity/*.*
@@ -269,16 +278,10 @@ exit 0
 %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}/attic/_dummy
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/cache/_dummy
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/index/_dummy
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/locks/_dummy
 %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}/meta/_dummy
 %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
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/tmp/_dummy
 
 %files setup
 %defattr(644,root,root,755)