SOURCES: dokuwiki-find-lang.sh, dokuwiki-config.patch, dokuwiki-geshi.patch...

[glen]

Author: glen                         Date: Tue Jan 27 14:33:56 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 2009-01-26 rc

---- Files affected:
SOURCES:
   dokuwiki-find-lang.sh (1.2 -> 1.3) , dokuwiki-config.patch (1.2 -> 1.3) , dokuwiki-geshi.patch (1.2 -> 1.3) , dokuwiki-http_auth-option.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/dokuwiki-find-lang.sh
diff -u SOURCES/dokuwiki-find-lang.sh:1.2 SOURCES/dokuwiki-find-lang.sh:1.3
--- SOURCES/dokuwiki-find-lang.sh:1.2	Tue Jan  8 15:09:53 2008
+++ SOURCES/dokuwiki-find-lang.sh	Tue Jan 27 15:33:49 2009
@@ -18,6 +18,9 @@
 		sl-si)
 			lang=sl
 		;;
+		id-ni)
+			lang=id_NI
+		;;
 		*-*)
 			echo >&2 "Need mapping for $lang!"
 			exit 1

================================================================
Index: SOURCES/dokuwiki-config.patch
diff -u SOURCES/dokuwiki-config.patch:1.2 SOURCES/dokuwiki-config.patch:1.3
--- SOURCES/dokuwiki-config.patch:1.2	Mon Aug 18 20:09:43 2008
+++ SOURCES/dokuwiki-config.patch	Tue Jan 27 15:33:49 2009
@@ -12,14 +12,14 @@
  $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',
  );
  
  

================================================================
Index: SOURCES/dokuwiki-geshi.patch
diff -u SOURCES/dokuwiki-geshi.patch:1.2 SOURCES/dokuwiki-geshi.patch:1.3
--- SOURCES/dokuwiki-geshi.patch:1.2	Mon Aug 18 20:09:43 2008
+++ SOURCES/dokuwiki-geshi.patch	Tue Jan 27 15:33:50 2009
@@ -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 {

================================================================
Index: SOURCES/dokuwiki-http_auth-option.patch
diff -u SOURCES/dokuwiki-http_auth-option.patch:1.2 SOURCES/dokuwiki-http_auth-option.patch:1.3
--- SOURCES/dokuwiki-http_auth-option.patch:1.2	Tue Dec 18 23:51:21 2007
+++ SOURCES/dokuwiki-http_auth-option.patch	Tue Jan 27 15:33:51 2009
@@ -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 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-find-lang.sh?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-config.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-geshi.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-http_auth-option.patch?r1=1.2&r2=1.3&f=u