Changes - j0ke.net Open Build Service

Changes of Revision 19

[-] [+]	Changed	horde-webmail.spec
@@ -41,6 +41,8 @@ Patch3: horde-webmail-php5_exec.patch Patch4: horde-imp-php5_exec.patch Patch5: horde-kronolith-php5_exec.patch +Patch6: horde-phptype.diff +Patch7: imp-phptype.diff URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -64,6 +66,8 @@ %patch3 %patch4 %patch5 +%patch6 +%patch7 %build : if the following command fails, then apache dependencies are not met @@ -116,9 +120,15 @@ %attr(0750, wwwrun, www) %dir /var/log/horde %changelog +* Mon Jun 02 2008 Carsten Schoene <cs@linux-administrator.com> +- added patches which fixes error "phptype" not specified in configuretion + when sending new mail + * Mon May 26 2008 Carsten Schoene <cs@linux-administrator.com> - update release to final 1.1 -* Mon May 12 2008 Carsten Schoene <cs@linux-administrator.com> + +Mon May 12 2008 Carsten Schoene <cs@linux-administrator.com> - update build to 1.1-rc4 + Sun May 11 2008 Carsten Schoene <cs@linux-administrator.com> - initial build
[-] [+]	Added	horde-phptype.diff ^
@@ -0,0 +1,20 @@ +=================================================================== +RCS file: /horde/cvs/horde/config/conf.xml,v +retrieving revision 1.229 +retrieving revision 1.230 +diff -p --unified=3 -r1.229 -r1.230 +--- config/conf.xml 2008/05/19 23:22:04 1.229 ++++ config/conf.xml 2008/05/26 11:51:43 1.230 +@@ -1132,8 +1132,10 @@ + of Horde to ensure that a form can only be submitted once.">none + <case name="none" desc="Disable Form Tokens"/> + <case name="file" desc="Local filesystem token storage"> +- <configstring name="token_dir" required="false" desc="The directory where +- to keep token files"/> ++ <configsection name="params"> ++ <configstring name="token_dir" required="false" desc="The directory where ++ to keep token files"/> ++ </configsection> + </case> + <case name="sql" desc="SQL-based token storage"> + <configsection name="params">
[-] [+]	Added	imp-phptype.diff ^
@@ -0,0 +1,18 @@ +=================================================================== +RCS file: /horde/cvs/imp/compose.php,v +retrieving revision 2.1093 +retrieving revision 2.1094 +diff -p --unified=3 -r2.1093 -r2.1094 +--- imp/compose.php 2008/05/25 16:33:29 2.1093 ++++ imp/compose.php 2008/05/26 11:51:45 2.1094 +@@ -111,7 +111,9 @@ $thismailbox = Util::getFormData('thisma + require_once 'Horde/Token.php'; + if (isset($conf['token'])) { + /* If there is a configured token system, set it up. / +- $tokenSource = Horde_Token::factory($conf['token']['driver'], $conf['token']); ++ $tokenSource = Horde_Token::factory( ++ $conf['token']['driver'], ++ Horde::getDriverConfig('token', $conf['token']['driver'])); + } else { + / Default to the file system if no config. */ + $tokenSource = Horde_Token::factory('file');