$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1
$conf['recent'] = 20; //how many entries to show in recent
$conf['breadcrumbs'] = 10; //how many recent visited pages to show
---- dokuwiki-2009-12-25/install.php~ 2010-01-04 18:16:29.000000000 +0200
-+++ dokuwiki-2009-12-25/install.php 2010-01-04 18:16:45.552540795 +0200
-@@ -47,6 +47,7 @@
+--- dokuwiki-rc2010-10-07/install.php~ 2010-10-07 21:47:44.000000000 +0300
++++ dokuwiki-rc2010-10-07/install.php 2010-10-07 21:47:46.672639096 +0300
+@@ -47,7 +47,7 @@
'2008-05-04' => '1e5c42eac3219d9e21927c39e3240aad',
'2009-02-14' => 'ec8c04210732a14fdfce0f7f6eead865',
- '2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
-+ '2009-12-25-pld' => 'b9f4419b5b1b9b915c35f4cd3c66bda1',
+ '2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
+- '2010-10-07rc' => '7921d48195f4db21b8ead6d9bea801b8'
++ '2010-10-07pld' => 'e5d9d0fc37a774e37587e84e91dc84bc'
);
---- 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 @@
+--- dokuwiki-rc2010-10-07/inc/parserutils.php~ 2010-10-07 21:21:37.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/parserutils.php 2010-10-07 21:24:30.142987536 +0300
+@@ -634,14 +634,14 @@
$cache = getCacheName($language.$code,".code");
$ctime = @filemtime($cache);
if($ctime && !$_REQUEST['purge'] &&
} else {
-- 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);
+--- dokuwiki-rc2010-10-07/inc/load.php~ 2010-10-07 11:08:13.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/load.php 2010-10-07 21:23:57.072781806 +0300
+@@ -68,7 +68,7 @@
+ 'IXR_Client' => DOKU_INC.'inc/IXR_Library.php',
+ 'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
+ 'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
+- 'GeSHi' => DOKU_INC.'inc/geshi.php',
++ 'GeSHi' => '/usr/share/php/geshi.php',
+ 'TarLib' => DOKU_INC.'inc/TarLib.class.php',
+ 'ZipLib' => DOKU_INC.'inc/ZipLib.class.php',
+ 'DokuWikiFeedCreator' => DOKU_INC.'inc/feedcreator.class.php',
$conf['securecookie'] = 1; //never send HTTPS cookies via HTTP
/* Advanced Options */
---- 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 @@
- }
+--- dokuwiki-rc2010-10-07/inc/auth.php~ 2010-10-07 21:25:10.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/auth.php 2010-10-07 21:26:19.795893378 +0300
+@@ -77,7 +77,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'];
- $_REQUEST['http_credentials'] = true;
+ // 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;
---- dokuwiki-2008-05-05/inc/common.php~ 2008-11-20 16:13:06.616720562 +0200
-+++ dokuwiki-2008-05-05/inc/common.php 2008-11-20 16:12:51.042753759 +0200
-@@ -1009,7 +1009,20 @@
- $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
- $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
+--- dokuwiki-rc2010-10-07/inc/common.php~ 2010-10-07 21:34:10.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/common.php 2010-10-07 21:36:02.099167786 +0300
+@@ -1168,7 +1168,20 @@
+ $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
+ $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
-- mail_send($to,$subject,$text,$from,'',$bcc);
-+ $headers = array();
-+ // add mail headers to identify page changes in same mail thread
-+ $file = wikiFN($id);
-+ $cur = @filemtime($file);
-+ $headers['Message-Id'] = "$id?rev=$cur";
-+ if ($rev) {
-+ $headers['In-Reply-To'] = "$id?rev=$rev";
-+ }
-+ $h = '';
-+ foreach ($headers as $k => $v) {
-+ $h .= sprintf("%s: %s%s", $k, $v, MAILHEADER_EOL);
-+ }
+- mail_send($to,$subject,$text,$from,'',$bcc);
++ $headers = array();
++ // add mail headers to identify page changes in same mail thread
++ $file = wikiFN($id);
++ $cur = @filemtime($file);
++ $headers['Message-Id'] = "$id?rev=$cur";
++ if ($rev) {
++ $headers['In-Reply-To'] = "$id?rev=$rev";
++ }
++ $h = '';
++ foreach ($headers as $k => $v) {
++ $h .= sprintf("%s: %s%s", $k, $v, MAILHEADER_EOL);
++ }
+
-+ mail_send($to,$subject,$text,$from,'' ,$bcc, $h);
++ mail_send($to,$subject,$text,$from,'' ,$bcc, $h);
}
/**
---- dokuwiki/inc/media.php~ 2008-03-11 17:01:47.000000000 +0200
-+++ dokuwiki/inc/media.php 2008-03-11 17:01:51.038533362 +0200
-@@ -301,6 +301,7 @@
- function media_notify($id,$file,$mime){
+CHECKME: possibly outdated now?
+
+--- dokuwiki-rc2010-10-07/inc/media.php~ 2010-10-07 21:28:44.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/media.php 2010-10-07 21:30:12.262536013 +0300
+@@ -392,6 +392,7 @@
global $lang;
global $conf;
+ global $INFO;
+ global $USERINFO;
if(empty($conf['notify'])) return; //notify enabled?
- $text = rawLocale('uploadmail');
+ $ip = clientIP();
@@ -316,8 +317,8 @@
$from = $conf['mailfrom'];
---- dokuwiki/inc/common.php~ 2007-06-26 21:27:15.000000000 +0300
-+++ dokuwiki/inc/common.php 2008-02-25 20:39:15.516789317 +0200
-@@ -831,6 +831,7 @@
- // decide if there is something to do
- if($who == 'admin'){
- if(empty($conf['notify'])) return; //notify enabled?
-+ if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
- $text = rawLocale('mailtext');
- $to = $conf['notify'];
- $bcc = '';
+--- dokuwiki-rc2010-10-07/inc/common.php~ 2010-10-07 21:27:15.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/common.php 2010-10-07 21:28:01.732549375 +0300
+@@ -1073,6 +1073,7 @@
+ // decide if there is something to do
+ if($who == 'admin'){
+ if(empty($conf['notify'])) return; //notify enabled?
++ if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
+ $text = rawLocale('mailtext');
+ $to = $conf['notify'];
+ $bcc = '';
---- dokuwiki-2008-05-05/inc/common.php~ 2008-11-12 16:45:56.298338127 +0200
-+++ dokuwiki-2008-05-05/inc/common.php 2008-11-12 16:56:31.711609436 +0200
+--- dokuwiki-rc2010-10-07/inc/common.php~ 2010-10-07 21:31:18.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/common.php 2010-10-07 21:33:06.502518916 +0300
@@ -902,6 +902,34 @@
return $date;
}
/**
* Sends a notify mail on page change
*
-@@ -921,10 +949,10 @@
+@@ -1100,10 +1100,10 @@
- // decide if there is something to do
- if($who == 'admin'){
-- if(empty($conf['notify'])) return; //notify enabled?
- if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
-+ $to = notifyNS($id, $conf['notify']);
-+ if(empty($to)) return; //notify enabled?
- $text = rawLocale('mailtext');
-- $to = $conf['notify'];
- $bcc = '';
- }elseif($who == 'subscribers'){
- if(!$conf['subscribers']) return; //subscribers enabled?
-@@ -934,9 +962,9 @@
- $to = '';
- $text = rawLocale('subscribermail');
- }elseif($who == 'register'){
-- if(empty($conf['registernotify'])) return;
-+ $to = notifyNS($id, $conf['registernotify']);
-+ if(empty($to)) return;
- $text = rawLocale('registermail');
-- $to = $conf['registernotify'];
- $bcc = '';
- }else{
- return; //just to be safe
+ // decide if there is something to do
+ if($who == 'admin'){
+- if(empty($conf['notify'])) return; //notify enabled?
+ if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
++ $to = notifyNS($id, $conf['notify']);
++ if(empty($to)) return; //notify enabled?
+ $text = rawLocale('mailtext');
+- $to = $conf['notify'];
+ $bcc = '';
+ }elseif($who == 'subscribers'){
+ if(!$conf['subscribers']) return; //subscribers enabled?
+@@ -1116,9 +1116,9 @@
+ $to = '';
+ $text = rawLocale('subscr_single');
+ }elseif($who == 'register'){
+- if(empty($conf['registernotify'])) return;
++ $to = notifyNS($id, $conf['registernotify']);
++ if(empty($to)) return;
+ $text = rawLocale('registermail');
+- $to = $conf['registernotify'];
+ $bcc = '';
+ }else{
+ return; //just to be safe
-%define subver 2009-12-25
+%define subver 2010-10-07
%define ver %(echo %{subver} | tr -d -)
%define php_min_version 5.1.2
%include /usr/lib/rpm/macros.php
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 10
+Release: 0.2
License: GPL v2
Group: Applications/WWW
-Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}c.tgz
-# Source0-md5: 2649b6fecbcb273374f5be8f0a2edf02
+Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
+# Source0-md5: 888aef56735e21a4094180dac57030f0
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: jude.png
Source7: cacti.gif
Source8: nagios.gif
Source9: http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
-Source10: pld.gif
# Source9-md5: 0c19ed35bf677f33f6bea14b3a8a2e10
+Source10: pld.gif
Patch66: %{name}-config.patch
Patch0: %{name}-paths.patch
Patch2: %{name}-mysqlauth.patch
Patch20: fixprivilegeescalationbug.diff
Patch21: task-1821.patch
Patch22: adldap.patch
-Patch23: smblink.patch
URL: http://www.dokuwiki.org/dokuwiki
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.520
Requires: php-common >= 4:%{php_min_version}
Requires: php-geshi >= 1.0.7.19
-Requires: php-simplepie >= 1.0.1
Requires: php-session
+Requires: php-simplepie >= 1.0.1
Requires: php-xml
Requires: webapps
Requires: webserver(access)
pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
%prep
-%setup -q -n %{name}-%{subver}
+%setup -q -n %{name}-rc%{subver}
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%patch23 -p1
%patch66 -p1
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
%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
%dir %{_appdir}/bin
%attr(755,root,root) %{_appdir}/bin/dwpage.php
%attr(755,root,root) %{_appdir}/bin/indexer.php
+%attr(755,root,root) %{_appdir}/bin/render.php
%attr(755,root,root) %{_appdir}/bin/wantedpages.php
%dir %{_appdir}/inc
%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}/security.png
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/security.xcf
%files setup
%defattr(644,root,root,755)
## DP: Hotfix for privilege escalation bug.
@DPATCH@
-Index: dokuwiki-0.0.20090214/inc/actions.php
-===================================================================
---- dokuwiki-0.0.20090214.orig/inc/actions.php 2009-02-14 13:13:25.000000000 +0100
-+++ dokuwiki-0.0.20090214/inc/actions.php 2009-02-14 19:19:32.000000000 +0100
-@@ -141,6 +141,7 @@
- act_redirect($ID,$preact);
- }
+--- dokuwiki-rc2010-10-07/inc/actions.php~ 2010-10-07 21:38:37.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/actions.php 2010-10-07 21:40:42.379139693 +0300
+@@ -149,6 +149,7 @@
+ global $conf;
+ global $license;
-+ $ACT = act_permcheck($ACT);
- //call template FIXME: all needed vars available?
- $headers[] = 'Content-Type: text/html; charset=utf-8';
- trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
++ $ACT = act_permcheck($ACT);
+ //call template FIXME: all needed vars available?
+ $headers[] = 'Content-Type: text/html; charset=utf-8';
+ trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
---- dokuwiki/inc/FeedParser.php~ 2009-02-14 14:13:24.000000000 +0200
-+++ dokuwiki/inc/FeedParser.php 2009-08-03 18:14:02.790174263 +0300
-@@ -7,7 +7,7 @@
-
- if(!defined('DOKU_INC')) die('meh.');
- require_once(DOKU_INC.'inc/HTTPClient.php');
--require_once(DOKU_INC.'inc/SimplePie.php');
-+require_once 'simplepie.inc';
-
-
- /**
+--- dokuwiki-rc2010-10-07/inc/load.php~ 2010-10-07 21:36:43.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/load.php 2010-10-07 21:37:38.245824556 +0300
+@@ -62,7 +62,7 @@
+ 'Doku_Event_Handler' => DOKU_INC.'inc/events.php',
+ 'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
+ 'JpegMeta' => DOKU_INC.'inc/JpegMeta.php',
+- 'SimplePie' => DOKU_INC.'inc/SimplePie.php',
++ 'SimplePie' => '/usr/share/php/simplepie.inc',
+ 'FeedParser' => DOKU_INC.'inc/FeedParser.php',
+ 'IXR_Server' => DOKU_INC.'inc/IXR_Library.php',
+ 'IXR_Client' => DOKU_INC.'inc/IXR_Library.php',
+++ /dev/null
---- dokuwiki/lib/scripts/script.js~ 2010-04-29 15:42:12.000000000 +0300
-+++ dokuwiki/lib/scripts/script.js 2010-04-29 15:43:39.640053591 +0300
-@@ -512,7 +512,7 @@
- for(var i=0; i<elems.length; i++){
- var share = elems[i];
- addEvent(share,'click',function(){
-- if(document.all == null) {
-+ if(document.all == null && LANG['nosmblinks']) {
- alert(LANG['nosmblinks']);
- }
- });
$rev1 = (int) $_REQUEST['rev2'][0];
$rev2 = (int) $_REQUEST['rev2'][1];
---- dokuwiki/inc/common.php 2010-01-11 14:48:58.213308444 +0200
-+++ dokuwiki/inc/common.php 2010-01-12 12:18:39.000000000 +0200
-@@ -1128,6 +1128,8 @@
- }elseif($rev){
- $subject = $lang['mail_changed'].' '.$id;
- $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
-+ $rev2 = $INFO['meta']['date']['modified'];
-+ $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
- require_once(DOKU_INC.'inc/DifferenceEngine.php');
- $df = new Diff(explode("\n",rawWiki($id,$rev)),
- explode("\n",rawWiki($id)));
-@@ -1136,6 +1138,7 @@
- }else{
- $subject=$lang['mail_newpage'].' '.$id;
- $text = str_replace('@OLDPAGE@','none',$text);
-+ $text = str_replace('@DIFFPAGE@','none',$text);
- $diff = rawWiki($id);
- }
- $text = str_replace('@DIFF@',$diff,$text);
+--- dokuwiki-rc2010-10-07/inc/common.php~ 2010-10-07 21:41:20.000000000 +0300
++++ dokuwiki-rc2010-10-07/inc/common.php 2010-10-07 21:45:00.639114275 +0300
+@@ -1147,6 +1147,8 @@
+ }elseif($rev){
+ $subject = $lang['mail_changed'].' '.$id;
+ $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
++ $rev2 = $INFO['meta']['date']['modified'];
++ $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
+ $df = new Diff(explode("\n",rawWiki($id,$rev)),
+ explode("\n",rawWiki($id)));
+ $dformat = new UnifiedDiffFormatter();
+@@ -1154,6 +1156,7 @@
+ }else{
+ $subject=$lang['mail_newpage'].' '.$id;
+ $text = str_replace('@OLDPAGE@','none',$text);
++ $text = str_replace('@DIFFPAGE@','none',$text);
+ $diff = rawWiki($id);
+ }
+ $text = str_replace('@DIFF@',$diff,$text);
projects / packages / dokuwiki.git / commitdiff