- up to 2011-04-22 rc1

Changed files:
    dokuwiki-config.patch -> 1.15
    dokuwiki-mail-headerencodequotes.patch -> 1.4
    dokuwiki-mailthreads.patch -> 1.4
    dokuwiki-mysqlauth.patch -> 1.2
    dokuwiki.spec -> 1.92
    task-1821.patch -> 1.6

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 3de452c94386ec6b0fa07462adb98997a8e19b3c..e9735f302e6c922036b51e9bf97b6d040a0bb3db 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -18,14 +18,14 @@
  $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-2010-11-07/install.php~   2010-11-07 22:42:18.000000000 +0200
-+++ dokuwiki-2010-11-07/install.php    2010-11-07 22:42:40.066936206 +0200
-@@ -47,7 +47,7 @@
-     '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
+--- dokuwiki-rc2011-04-22/install.php~ 2011-04-27 00:21:28.000000000 +0300
++++ dokuwiki-rc2011-04-22/install.php  2011-04-27 00:22:10.117915194 +0300
+@@ -48,7 +48,7 @@
      '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
      '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
--    '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8'
-+    '2010-11-07'   => 'e5d9d0fc37a774e37587e84e91dc84bc'
+     '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
+-    'rc2011-04-22' => '4241865472edb6fa14a1227721008072',
++    'rc2011-04-22pld' => '9e9496204af31a3fe6b3b97d58d7c58f',
  );
  
  

diff --git a/dokuwiki-mail-headerencodequotes.patch b/dokuwiki-mail-headerencodequotes.patch
deleted file mode 100644 (file)
index 3ba65fd..0000000
--- a/dokuwiki-mail-headerencodequotes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 = '';
-         }

diff --git a/dokuwiki-mailthreads.patch b/dokuwiki-mailthreads.patch
index 0a6308302b8212f9384cd5db7e07c49ae2f30db3..893b468a4a35875a8f329fe7350c39d5c33e2fd8 100644 (file)
--- a/dokuwiki-mailthreads.patch
+++ b/dokuwiki-mailthreads.patch
@@ -1,10 +1,11 @@
---- dokuwiki-2010-11-07/inc/common.php~        2010-11-07 22:38:45.000000000 +0200
-+++ dokuwiki-2010-11-07/inc/common.php 2010-11-07 22:41:54.567137751 +0200
-@@ -1163,7 +1163,20 @@
-         $subject = '['.utf8_substr($conf['title'], 0, 20).'...] '.$subject;
+--- dokuwiki-20110329/inc/common.php~  2011-03-29 09:15:04.000000000 +0300
++++ dokuwiki-20110329/inc/common.php   2011-03-29 09:16:58.468168676 +0300
+@@ -1190,7 +1190,21 @@
+     }else{
+         $subject = '['.$conf['mailprefix'].'] '.$subject;
      }
- 
 -    mail_send($to,$subject,$text,$conf['mailfrom'],'',$bcc);
++
 +    $headers = array();
 +    // add mail headers to identify page changes in same mail thread
 +    $file = wikiFN($id);

diff --git a/dokuwiki-mysqlauth.patch b/dokuwiki-mysqlauth.patch
deleted file mode 100644 (file)
index 5bc02bc..0000000
--- a/dokuwiki-mysqlauth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dokuwiki/inc/auth/mysql.class.php~ 2007-11-09 18:52:23.000000000 +0200
-+++ dokuwiki/inc/auth/mysql.class.php  2007-11-09 18:52:24.656504794 +0200
-@@ -46,7 +46,7 @@
- 
-       // set capabilities based upon config strings set
-       if (empty($this->cnf['server']) || empty($this->cnf['user']) ||
--          empty($this->cnf['password']) || empty($this->cnf['database'])){
-+          empty($this->cnf['database'])){
-         if ($this->cnf['debug'])
-           msg("MySQL err: insufficient configuration.",-1,__LINE__,__FILE__);
-         $this->success = false;

diff --git a/dokuwiki.spec b/dokuwiki.spec
index d364a82b2d85ecfc91358154d79952df6645776a..6bf1cec86fb3ac1ac52421dc2e03a03d5f08208a 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,6 +1,6 @@
 # TODO
 # - remove %config from lang files: https://github.com/splitbrain/dokuwiki/commit/e6cecb0872ef457f44529edbc736aba3dc3ac258
-%define                subver  2010-11-07a
+%define                subver  2011-04-22
 %define                ver             %(echo %{subver} | tr -d -)
 %define                php_min_version 5.1.2
 %include       /usr/lib/rpm/macros.php
@@ -8,11 +8,13 @@ Summary:      PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       1
+Release:       0.4
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: de2b5bbecdae610a2ecaf53d5e55453b
+#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+#Source0:      https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
+# Source0-md5: a6230a2f626d26aed7fa61370789d0a5
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -31,12 +33,10 @@ Source11:   http://glen.alkohol.ee/pld/astah.png
 # Source11-md5:        b1c999e6988440c9e2af6a12e9a56451
 Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
-Patch2:                %{name}-mysqlauth.patch
 Patch3:                %{name}-config-allow-require.patch
 Patch4:                %{name}-geshi.patch
 Patch5:                %{name}-http_auth-option.patch
 Patch6:                %{name}-nice_exit.patch
-Patch7:                %{name}-mail-headerencodequotes.patch
 Patch8:                %{name}-notify-respect-minor.patch
 Patch10:       %{name}-mailtext.patch
 Patch11:       %{name}-notifyns.patch
@@ -49,7 +49,6 @@ Patch19:      pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
 Patch22:       adldap.patch
-Patch23:       dokuwiki-userinfo.patch
 URL:           http://www.dokuwiki.org/dokuwiki
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -119,14 +118,12 @@ 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
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch10 -p1
 %patch11 -p1
@@ -139,30 +136,29 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 
 %patch66 -p1
 
 find -name _dummy | xargs rm
 rm lib/index.html lib/plugins/index.html inc/lang/.htaccess
 
+# we just don't package deleted files, so these get removed automatically on rpm upgrades
+%{__rm} data/deleted.files
+
 # safe file
-mv conf/words.aspell{.dist,}
+#mv conf/words.aspell{.dist,}
 
 # use system geshi package
-rm -f inc/geshi.php
-rm -rf inc/geshi
+%{__rm} inc/geshi.php
+%{__rm} -r inc/geshi
 
 # use system adldap package
-rm -f inc/adLDAP.php
+%{__rm} inc/adLDAP.php
 
 # use system simplepie package
-rm -f inc/SimplePie.php
-
-# our plugins dir is not writable anyway, nothing to convert
-rm -rf lib/plugins/upgradeplugindirectory
+%{__rm} inc/SimplePie.php
 
-# flash source
+# flash source on git tarballs
 rm -rf lib/_fla
 
 # cleanup backups after patching
@@ -180,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
 
 cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-cp -a VERSION $RPM_BUILD_ROOT%{_appdir}
+cp -p VERSION $RPM_BUILD_ROOT%{_appdir}
 cp -a bin/* $RPM_BUILD_ROOT%{_appdir}/bin
 cp -a inc/* $RPM_BUILD_ROOT%{_appdir}/inc
 cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
@@ -281,7 +277,7 @@ exit 0
 %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}/words.aspell
+#%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(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.local.conf
@@ -320,6 +316,7 @@ exit 0
 %attr(755,root,root) %{_appdir}/bin/indexer.php
 %attr(755,root,root) %{_appdir}/bin/render.php
 %attr(755,root,root) %{_appdir}/bin/wantedpages.php
+%attr(755,root,root) %{_appdir}/bin/striplangs.php
 
 %dir %{_appdir}/inc
 %{_appdir}/inc/*.php
@@ -340,10 +337,13 @@ exit 0
 %{_appdir}/lib/plugins/plugin/classes
 %dir %{_appdir}/lib/plugins/revert
 %{_appdir}/lib/plugins/revert/*.*
+%dir %{_appdir}/lib/plugins/safefnrecode
+%{_appdir}/lib/plugins/safefnrecode/*.*
 %dir %{_appdir}/lib/plugins/usermanager
 %{_appdir}/lib/plugins/usermanager/*.*
 %{_appdir}/lib/plugins/usermanager/images
-%{_appdir}/lib/plugins/info
+%dir %{_appdir}/lib/plugins/info
+%{_appdir}/lib/plugins/info/*.*
 %dir %{_appdir}/lib/plugins/popularity
 %{_appdir}/lib/plugins/popularity/*.*
 %{_appdir}/lib/plugins/*.php

diff --git a/task-1821.patch b/task-1821.patch
index 868412bf2353ad1705869dc0da0ea95a7818473a..8e33b935198fbe82e339b411e3bd9cd1277baa50 100644 (file)
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -14,17 +14,19 @@
          $rev1 = (int) $_REQUEST['rev2'][0];
          $rev2 = (int) $_REQUEST['rev2'][1];
  
---- dokuwiki/inc/html.php~     2010-10-07 21:48:30.000000000 +0300
-+++ dokuwiki/inc/html.php      2010-10-18 17:28:03.106448956 +0300
-@@ -997,7 +997,7 @@
-     if($intro) print p_locale_xhtml('diff');
+--- dokuwiki-20110329/inc/html.php~    2011-03-29 09:20:42.000000000 +0300
++++ dokuwiki-20110329/inc/html.php     2011-03-29 09:21:51.507042136 +0300
+@@ -1030,8 +1030,8 @@
  
-     if (!$text) {
--        $diffurl = wl($ID, array('do'=>'diff', 'rev2[0]'=>$l_rev, 'rev2[1]'=>$r_rev));
-+        $diffurl = wl($ID, array('do'=>'diff', 'r1'=>$l_rev, 'r2'=>$r_rev));
-         ptln('<p class="difflink">');
-         ptln('  <a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
-         ptln('</p>');
+         $diffurl = wl($ID, array(
+                         'do'       => 'diff',
+-                        'rev2[0]'  => $l_rev,
+-                        'rev2[1]'  => $r_rev,
++                        'r1'       => $l_rev,
++                        'r2'       => $r_rev,
+                         'difftype' => $type,
+                       ));
+         ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
 --- 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 @@