upgrading package: drupal 6.4 -> 6.5

drupal/drupal.patch

@@ -344,7 +344,7 @@ Index: sites/all/modules/img_assist/img_assist_popup.js
 --- /dev/null	2008-05-02 21:08:21 +0200
 +++ sites/all/modules/img_assist/img_assist_popup.js	2008-05-02 21:05:56 +0200
 @@ -0,0 +1,20 @@
-+/* $Id: drupal.patch,v 1.31 2008/09/01 08:56:39 rse Exp $ */
++/* $Id: drupal.patch,v 1.32 2008/10/11 07:18:03 rse Exp $ */
 +
 +function launch_popup(nid, mw, mh) {
 +	var ox = mw;
@@ -403,27 +403,6 @@ Index: sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/c
 
 -----------------------------------------------------------------------------
 
-Degrade the "Update notification" check from ERROR to WARNING severity
-as for a packaged Drupal as in OpenPKG the Update notification is less
-important and actually confusing anyway. With WARNING one at least still
-sees the issue, but under "Administer" one doesn't get the confusing red
-error message and longer.
-
-Index: modules/system/system.install
---- modules/system/system.install.orig	2008-02-08 18:07:55 +0100
-+++ modules/system/system.install	2008-05-03 10:42:23 +0200
-@@ -273,7 +273,7 @@
-     if (!module_exists('update')) {
-       $requirements['update status'] = array(
-         'value' => $t('Not enabled'),
--        'severity' => REQUIREMENT_ERROR,
-+        'severity' => REQUIREMENT_WARNING,
-         'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/build/modules'))),
-       );
-     }
-
------------------------------------------------------------------------------
-
 Disable "Update notifications" check by default during installation.
 
 Index: install.php
@@ -842,115 +821,3 @@ Index: modules/blog/blog.pages.inc
    $channel['title'] = variable_get('site_name', 'Drupal') .' blogs';
    $channel['link'] = url('blog', array('absolute' => TRUE));
  
------------------------------------------------------------------------------
- 
-Fix "Action" related administration dialog and corresponding run-time handling.
-
-Index: modules/system/system.module
---- modules/system/system.module.orig	2008-04-09 23:11:49 +0200
-+++ modules/system/system.module	2008-05-23 10:41:26 +0200
-@@ -1431,7 +1439,7 @@
-   if (is_numeric($action)) {
-     $aid = $action;
-     // Load stored parameter values from database.
--    $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", intval($aid)));
-+    $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid));
-     $edit['actions_description'] = $data->description;
-     $edit['actions_type'] = $data->type;
-     $function = $data->callback;
-
-Index: includes/actions.inc
---- includes/actions.inc.orig	2007-12-31 15:51:04 +0100
-+++ includes/actions.inc	2008-05-23 11:22:17 +0200
-@@ -54,7 +54,7 @@
-     $where_values = array();
-     foreach ($action_ids as $action_id) {
-       if (is_numeric($action_id)) {
--        $where[] = 'OR aid = %d';
-+        $where[] = "OR aid = '%s'";
-         $where_values[] = $action_id;
-       }
-       elseif (isset($available_actions[$action_id])) {
-@@ -93,7 +93,7 @@
-   else {
-     // If it's a configurable action, retrieve stored parameters.
-     if (is_numeric($action_ids)) {
--      $action = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", $action_ids));
-+      $action = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $action_ids));
-       $function = $action->callback;
-       $context = array_merge($context, unserialize($action->parameters));
-       $result[$action_ids] = $function($object, $context, $a1, $a2);
-@@ -325,7 +325,7 @@
- function actions_save($function, $type, $params, $desc, $aid = NULL) {
-   $serialized = serialize($params);
-   if ($aid) {
--    db_query("UPDATE {actions} SET callback = '%s', type = '%s', parameters = '%s', description = '%s' WHERE aid = %d", $function, $type, $serialized, $desc, $aid);
-+    db_query("UPDATE {actions} SET callback = '%s', type = '%s', parameters = '%s', description = '%s' WHERE aid = '%s'", $function, $type, $serialized, $desc, $aid);
-     watchdog('actions', 'Action %action saved.', array('%action' => $desc));
-   }
-   else {
-@@ -333,7 +333,7 @@
-     // separate table for numeric aids.
-     db_query('INSERT INTO {actions_aid} VALUES (default)');
-     $aid = db_last_insert_id('actions_aid', 'aid');
--    db_query("INSERT INTO {actions} (aid, callback, type, parameters, description) VALUES (%d, '%s', '%s', '%s', '%s')", $aid, $function, $type, $serialized, $desc);
-+    db_query("INSERT INTO {actions} (aid, callback, type, parameters, description) VALUES ('%s', '%s', '%s', '%s', '%s')", $aid, $function, $type, $serialized, $desc);
-     watchdog('actions', 'Action %action created.', array('%action' => $desc));
-   }
- 
-@@ -350,7 +350,7 @@
-  *   The appropriate action row from the database as an object.
-  */
- function actions_load($aid) {
--  return db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", $aid));
-+  return db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid));
- }
- 
- /**
-@@ -360,6 +360,6 @@
-  *   integer The ID of the action to delete.
-  */
- function actions_delete($aid) {
--  db_query("DELETE FROM {actions} WHERE aid = %d", $aid);
-+  db_query("DELETE FROM {actions} WHERE aid = '%s'", $aid);
-   module_invoke_all('actions_delete', $aid);
- }
-Index: modules/user/user.admin.inc
---- modules/user/user.admin.inc.orig	2008-08-14 01:59:14 +0200
-+++ modules/user/user.admin.inc	2008-08-25 17:24:27 +0200
-@@ -721,7 +721,7 @@
-  * Menu callback: edit an access rule.
-  */
- function user_admin_access_edit($aid = 0) {
--  $edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
-+  $edit = db_fetch_array(db_query("SELECT aid, type, status, mask FROM {access} WHERE aid = '%s'", $aid));
-   return drupal_get_form('user_admin_access_edit_form', $edit, t('Save rule'));
- }
- 
-@@ -770,7 +770,7 @@
- function user_admin_access_form_submit($form, &$form_state) {
-   $edit = $form_state['values'];
-   if ($edit['aid']) {
--    db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = %d", $edit['mask'], $edit['type'], $edit['status'], $edit['aid']);
-+    db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = '%s'", $edit['mask'], $edit['type'], $edit['status'], $edit['aid']);
-     drupal_set_message(t('The access rule has been saved.'));
-   }
-   else {
-@@ -858,7 +858,7 @@
-  */
- function user_admin_access_delete_confirm($form_state, $aid = 0) {
-   $access_types = array('user' => t('username'), 'mail' => t('e-mail'), 'host' => t('host'));
--  $edit = db_fetch_object(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
-+  $edit = db_fetch_object(db_query("SELECT aid, type, status, mask FROM {access} WHERE aid = '%s'", $aid));
- 
-   $form = array();
-   $form['aid'] = array('#type' => 'hidden', '#value' => $aid);
-@@ -872,7 +872,7 @@
- }
- 
- function user_admin_access_delete_confirm_submit($form, &$form_state) {
--  db_query('DELETE FROM {access} WHERE aid = %d', $form_state['values']['aid']);
-+  db_query("DELETE FROM {access} WHERE aid = '%s'", $form_state['values']['aid']);
-   drupal_set_message(t('The access rule has been deleted.'));
-   $form_state['redirect'] = 'admin/user/rules';
-   return;

drupal/drupal.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package versions (core)
-%define       V_drupal                     6.4
+%define       V_drupal                     6.5
 
 #   package versions (extension modules)
 %define       V_module_acl                 6.x-1.x-dev