Hi, A few days ago, Ola Lundqvist wrote:
Thanks a lot for the information. If you have a patch available I would be really happy. :)
It'd have been faster to perform the changes directly by yourself as it was
only minor modifications... Anyway here's the script to build the patch
along with the patch. I tried it on my computer and it worked perfectly
fine.
surf:~ $ ./horde2_build_patch.sh
surf:~ $ cd /
surf:/ $ sudo patch -p0 < /tmp/debian/crappy_files.patch
Password:
patching file usr/share/horde2/lib/Token.php
patching file usr/share/horde2/lib/Category.php
patching file usr/share/horde2/lib/VFS.php
patching file usr/share/horde2/lib/Cache.php
patching file usr/share/horde2/lib/SessionHandler.php
patching file usr/share/horde2/kronolith/lib/Driver.php
Regards,
Arnaud Legrand
--
Beware of bugs in the above code; I have only proved it correct, not tried
it.
-- D.E.Knuth
horde2_build_patch.sh
Description: Bourne shell script
--- usr/share/horde2/lib/Token.php.bak 2005-10-03 11:41:12.000000000 +0200
+++ usr/share/horde2/lib/Token.php 2005-10-03 11:41:12.000000000 +0200
@@ -78,7 +78,7 @@ class Token {
}
$class = 'Token_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
return PEAR::raiseError('Class definition of ' . $class . ' not
found.');
}
--- usr/share/horde2/lib/Category.php.bak 2005-10-03 11:41:12.000000000
+0200
+++ usr/share/horde2/lib/Category.php 2005-10-03 11:41:12.000000000 +0200
@@ -130,7 +130,7 @@ class Category {
}
$class = 'Category_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
return PEAR::raiseError('Class definition of ' . $class . ' not
found.');
}
--- usr/share/horde2/lib/VFS.php.bak 2005-10-03 11:41:12.000000000 +0200
+++ usr/share/horde2/lib/VFS.php 2005-10-03 11:41:12.000000000 +0200
@@ -77,7 +77,7 @@ class Horde_VFS {
}
$class = 'Horde_VFS_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
return PEAR::raiseError('Class definition of ' . $class . ' not
found.');
}
--- usr/share/horde2/lib/Cache.php.bak 2005-10-03 11:41:12.000000000 +0200
+++ usr/share/horde2/lib/Cache.php 2005-10-03 11:41:12.000000000 +0200
@@ -59,7 +59,7 @@ class Cache {
}
$class = 'Cache_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
return PEAR::raiseError('Class definition of ' . $class . ' not
found.');
}
--- usr/share/horde2/lib/SessionHandler.php.bak 2005-10-03 11:41:12.000000000
+0200
+++ usr/share/horde2/lib/SessionHandler.php 2005-10-03 11:41:12.000000000
+0200
@@ -56,7 +56,7 @@ class SessionHandler {
$class = 'SessionHandler_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
return PEAR::raiseError('Class definition of ' . $class . ' not
found.');
}
--- usr/share/horde2/kronolith/lib/Driver.php.bak 2005-10-03
11:41:12.000000000 +0200
+++ usr/share/horde2/kronolith/lib/Driver.php 2005-10-03 11:41:12.000000000
+0200
@@ -68,7 +68,7 @@ class Kronolith_Driver {
include_once dirname(__FILE__) . '/Driver/' . $driver . '.php';
$class = 'Kronolith_Driver_' . $driver;
if (class_exists($class)) {
- return new $class($params);
+ $res = new $class($params); return $res;
} else {
Horde::fatal(new PEAR_Error(sprintf(_("Unable to load the
definition of %s."), $class)), __FILE__, __LINE__);
}
