- add my patches

Changed files:
    drupal-config.patch -> 1.1
    drupal-emptypass.patch -> 1.1
    drupal-includedir.patch -> 1.1
    drupal-module-themedir.patch -> 1.1
    drupal-themedir.patch -> 1.1

diff --git a/drupal-config.patch b/drupal-config.patch
new file mode 100644 (file)
index 0000000..654340a
--- /dev/null
+++ b/drupal-config.patch
@@ -0,0 +1,11 @@
+--- ./sites/default/settings.php~      2005-04-14 21:35:19.000000000 +0300
++++ ./sites/default/settings.php       2005-05-18 17:58:55.000000000 +0300
+@@ -78,7 +78,7 @@
+  * $db_url = 'mysql://username:password@localhost/database';
+  * $db_url = 'pgsql://username:password@localhost/database';
+  */
+-$db_url = 'mysql://username:password@localhost/database';
++$db_url = 'mysql://mysql:@localhost/drupal';
+ $db_prefix = '';
+ 
+ /**

diff --git a/drupal-emptypass.patch b/drupal-emptypass.patch
new file mode 100644 (file)
index 0000000..dbacbc3
--- /dev/null
+++ b/drupal-emptypass.patch
@@ -0,0 +1,11 @@
+--- ./includes/database.mysql.inc~     2005-04-14 21:50:23.000000000 +0300
++++ ./includes/database.mysql.inc      2005-05-18 18:48:24.970031862 +0300
+@@ -28,7 +28,7 @@
+      $url['host'] = $url['host'] .':'. $url['port'];
+   }
+ 
+-  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE) or die(mysql_error());
++  $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE) or die(mysql_error());
+   mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
+ 
+   return $connection;

diff --git a/drupal-includedir.patch b/drupal-includedir.patch
new file mode 100644 (file)
index 0000000..b8e2f5c
--- /dev/null
+++ b/drupal-includedir.patch
@@ -0,0 +1,31 @@
+--- ./includes/image.inc~      2005-03-29 03:01:23.000000000 +0300
++++ ./includes/image.inc       2005-05-18 18:12:32.000000000 +0300
+@@ -7,7 +7,7 @@
+  * @return An array of toolkit name => descriptive title.
+  */
+ function image_get_available_toolkits() {
+-  $toolkits = file_scan_directory('includes', 'image\..*\.inc$');
++  $toolkits = file_scan_directory('/usr/share/drupal/includes', 'image\..*\.inc$');
+ 
+   $output = array();
+   foreach ($toolkits as $file => $toolkit) {
+@@ -31,7 +31,7 @@
+   static $toolkit;
+   if (!$toolkit) {
+     $toolkit = variable_get('image_toolkit', 'gd');
+-    $toolkit_file = 'includes/image.'.$toolkit.'.inc';
++    $toolkit_file = '/usr/share/drupal/includes/image.'.$toolkit.'.inc';
+     if ($toolkit != 'gd' && file_exists($toolkit_file)) {
+       include_once $toolkit_file;
+     }
+--- ./includes/database.inc~   2005-04-08 17:24:10.000000000 +0300
++++ ./includes/database.inc    2005-05-18 18:13:17.000000000 +0300
+@@ -110,7 +110,7 @@
+     }
+ 
+     $db_type = substr($connect_url, 0, strpos($connect_url, '://'));
+-    $handler = "includes/database.$db_type.inc";
++    $handler = "/usr/share/drupal/includes/database.$db_type.inc";
+ 
+     if (is_file($handler)) {
+       include_once($handler);

diff --git a/drupal-module-themedir.patch b/drupal-module-themedir.patch
new file mode 100644 (file)
index 0000000..235bb53
--- /dev/null
+++ b/drupal-module-themedir.patch
@@ -0,0 +1,35 @@
+--- ../database/database.mysql~        2005-03-23 22:36:41.000000000 +0200
++++ ../database/database.mysql 2005-05-18 18:41:49.000000000 +0300
+@@ -775,19 +775,19 @@
+ -- Insert some default values
+ --
+ 
+-INSERT INTO system VALUES ('modules/block.module','block','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/comment.module','comment','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/filter.module','filter','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/help.module','help','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/node.module','node','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/page.module','page','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/story.module','story','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/system.module','system','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/user.module','user','module','',1,0,0);
+-INSERT INTO system VALUES ('modules/watchdog.module','watchdog','module','',1,0,0);
+-INSERT INTO system VALUES ('themes/bluemarine/xtemplate.xtmpl','bluemarine','theme','themes/engines/xtemplate/xtemplate.engine',1,0,0);
+-INSERT INTO system VALUES ('themes/engines/xtemplate/xtemplate.engine','xtemplate','theme_engine','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/block.module','block','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/comment.module','comment','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/filter.module','filter','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/help.module','help','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/node.module','node','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/page.module','page','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/story.module','story','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/system.module','system','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/taxonomy.module','taxonomy','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/user.module','user','module','',1,0,0);
++INSERT INTO system VALUES ('/usr/share/drupal/modules/watchdog.module','watchdog','module','',1,0,0);
++INSERT INTO system VALUES ('themes/bluemarine/xtemplate.xtmpl','bluemarine','theme','themes/engines/xtemplate/xtemplate.engine',1,0,0);
++INSERT INTO system VALUES ('themes/engines/xtemplate/xtemplate.engine','xtemplate','theme_engine','',1,0,0);
+ INSERT INTO users (uid, name, mail) VALUES ('0', '', '');
+ INSERT INTO users_roles (uid, rid) VALUES (0, 1);
+ 

diff --git a/drupal-themedir.patch b/drupal-themedir.patch
new file mode 100644 (file)
index 0000000..3714db9
--- /dev/null
+++ b/drupal-themedir.patch
@@ -0,0 +1,22 @@
+--- ./themes/engines/xtemplate/xtemplate.engine~       2005-05-18 19:00:15.397473761 +0300
++++ ./themes/engines/xtemplate/xtemplate.engine        2005-05-18 19:00:25.785782566 +0300
+@@ -14,7 +14,7 @@
+   }
+   $GLOBALS["xtemplate"] = new StdClass();
+   $dir = dirname($template->filename);
+-  $GLOBALS['xtemplate']->template = new XTemplate(basename($template->filename), $dir);
++  $GLOBALS['xtemplate']->template = new XTemplate(basename($template->filename), "/usr/share/drupal/$dir");
+   $GLOBALS['xtemplate']->template->assign(array('directory' => $dir));
+   $GLOBALS['xtemplate']->template->SetNullBlock(' ');  // '' doesn't work!
+ }
+--- ../includes/theme.inc~     2005-05-18 18:57:36.196386437 +0300
++++ ../includes/theme.inc      2005-05-18 18:57:57.045993344 +0300
+@@ -114,7 +114,7 @@
+     $list = array();
+     $result = db_query("SELECT * FROM {system} WHERE type = 'theme' ORDER BY name");
+     while ($theme = db_fetch_object($result)) {
+-      if (file_exists($theme->filename)) {
++      if (file_exists("/usr/share/drupal/$theme->filename")) {
+         $list[$theme->name] = $theme;
+       }
+     }