Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.72
diff -u -r1.72 user.admin.inc
--- modules/user/user.admin.inc	22 Aug 2009 14:34:23 -0000	1.72
+++ modules/user/user.admin.inc	22 Aug 2009 16:18:46 -0000
@@ -663,19 +663,8 @@
  */
 function user_admin_permissions_submit($form, &$form_state) {
   foreach ($form_state['values']['role_names'] as $rid => $name) {
-    $checked = array_filter($form_state['values'][$rid]);
-    // Delete existing permissions for the role. This handles "unchecking" checkboxes.
-    db_delete('role_permission')
-      ->condition('rid', $rid)
-      ->execute();
-    $query = db_insert('role_permission')->fields(array('rid', 'permission'));
-    foreach ($checked as $permission) {
-      $query->values(array(
-        'rid' => $rid,
-        'permission' => $permission,
-      ));
-    }
-    $query->execute();
+    $permissions = array_filter($form_state['values'][$rid]);
+    user_role_set_permissions($rid, $permissions);
   }
 
   drupal_set_message(t('The changes have been saved.'));
@@ -776,13 +765,13 @@
 function user_admin_role_validate($form, &$form_state) {
   if ($form_state['values']['name']) {
     if ($form_state['values']['op'] == t('Save role')) {
-      $existing_role = (bool) db_query_range("SELECT 1 FROM {role} WHERE name = :name AND rid <> :rid", array(':name' => $form_state['values']['name'], ':rid' => $form_state['values']['rid']), 0, 1)->fetchField();
-      if ($existing_role) {
+      $role = user_role_load($form_state['values']['name']);
+      if ($role && $role->rid != $form_state['values']['rid']) {    
         form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
       }
     }
     elseif ($form_state['values']['op'] == t('Add role')) {
-      if ((bool) db_query_range('SELECT 1 FROM {role} WHERE name = :name', array(':name' => $form_state['values']['name']), 0, 1)->fetchField()) {
+      if (user_role_load($form_state['values']['name'])) {
         form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
       }
     }
@@ -793,31 +782,17 @@
 }
 
 function user_admin_role_submit($form, &$form_state) {
+  $role = (object)$form_state['values'];
   if ($form_state['values']['op'] == t('Save role')) {
-    db_update('role')
-      ->fields(array('name' => $form_state['values']['name']))
-      ->condition('rid', $form_state['values']['rid'])
-      ->execute();
+    user_role_save($role);
     drupal_set_message(t('The role has been renamed.'));
   }
   elseif ($form_state['values']['op'] == t('Delete role')) {
-    db_delete('role')
-      ->condition('rid', $form_state['values']['rid'])
-      ->execute();
-    db_delete('role_permission')
-      ->condition('rid', $form_state['values']['rid'])
-      ->execute();
-    // Update the users who have this role set:
-    db_delete('users_roles')
-      ->condition('rid', $form_state['values']['rid'])
-      ->execute();
-
+    user_role_delete($form_state['values']['rid']);
     drupal_set_message(t('The role has been deleted.'));
   }
   elseif ($form_state['values']['op'] == t('Add role')) {
-    db_insert('role')
-      ->fields(array('name' => $form_state['values']['name']))
-      ->execute();
+    user_role_save($role);
     drupal_set_message(t('The role has been added.'));
   }
   $form_state['redirect'] = 'admin/config/people/roles';
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1026
diff -u -r1.1026 user.module
--- modules/user/user.module	22 Aug 2009 14:34:23 -0000	1.1026
+++ modules/user/user.module	22 Aug 2009 16:19:17 -0000
@@ -2256,6 +2256,109 @@
 }
 
 /**
+ * Fetch a user role from database.
+ *
+ * @param $role
+ *   A string with the role name, or an integer with the role ID.
+ */
+function user_role_load($role) {
+  $field = is_int($role) ? 'rid' : 'name';
+  return db_select('role', 'r')
+    ->fields('r')
+    ->condition($field, $role)
+    ->execute()
+    ->fetchObject();
+}
+/**
+ * Save a user role to the database.
+ *
+ * @param $role
+ *  A role object to modify or add. If $role->rid is not specified, a new
+ *  role will be created.
+ * @return
+ *   Status constant indicating if role was created or updated.
+ */
+function user_role_save($role) {
+  if ($role->name) {
+    // Prevent leading and trailing spaces in role names.
+    $role->name = trim($role->name);
+  }
+  if (!empty($role->rid) && $role->name) {
+    $status = drupal_write_record('role', $role, 'rid');
+    module_invoke_all('user_role_update', $role);
+  }
+  else {
+    $status = drupal_write_record('role', $role);
+    module_invoke_all('user_role_insert', $role);
+  }
+  
+  return $status;
+}
+
+/**
+ * Delete a user role from database.
+ *
+ * @param $role
+ *   A string with the role name, or an integer with the role ID.
+ */
+function user_role_delete($role) {
+  $role = user_role_load($role);
+
+  db_delete('role')
+    ->condition('rid', $role->rid)
+    ->execute();
+  db_delete('role_permission')
+    ->condition('rid', $role->rid)
+    ->execute();
+  // Update the users who have this role set:
+  db_delete('users_roles')
+    ->condition('rid', $role->rid)
+    ->execute();
+    
+  // Clear the user access cache.
+  user_access(NULL, NULL, TRUE);
+    
+  module_invoke_all('user_role_delete', $role);
+}
+
+/**
+ * Assign permissions to a user role.
+ *
+ * @param $role
+ *   A string with the role name, or an integer with the role ID.
+ * @param $permissions
+ *   An array of permissions strings.
+ * @param $merge
+ *   A boolean indicating whether to add permissions or to merge 
+ *   with all existing permissions.
+ */
+function user_role_set_permissions($role, array $permissions = array(), $merge = FALSE) {
+  $role = user_role_load($role);
+  debug($permissions);
+  if (!$merge) {
+    // Delete existing permissions for the role.
+    db_delete('role_permission')
+      ->condition('rid', $role->rid)
+      ->execute();
+  }
+
+  // Assign the new permissions for the role.
+  foreach ($permissions as $permission_string) {
+    db_merge('role_permission')
+      ->key(array(
+        'rid' => $role->rid,
+        'permission' => $permission_string,
+      ))
+      ->execute();
+  }
+
+  // Clear the user access cache.
+  user_access(NULL, NULL, TRUE);
+
+  return TRUE;
+}
+
+/**
  * Implement hook_user_operations().
  */
 function user_user_operations($form_state = array()) {
Index: modules/user/user.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.api.php,v
retrieving revision 1.11
diff -u -r1.11 user.api.php
--- modules/user/user.api.php	22 Aug 2009 14:34:23 -0000	1.11
+++ modules/user/user.api.php	22 Aug 2009 16:18:48 -0000
@@ -423,5 +423,45 @@
 }
 
 /**
+ * Act on user roles when inserted.
+ *
+ * Modules implementing this hook can act on the user role object when saved to
+ * the database.
+ *
+ * @param $role
+ *   A user role object.
+ */
+function hook_user_role_insert($role) {
+}
+
+/**
+ * Act on user roles when updated.
+ *
+ * Modules implementing this hook can act on the user role object when updated.
+ *
+ * @param $role
+ *   A user role object.
+ */
+function hook_user_role_update($role) {
+}
+
+/**
+ * Inform other modules that a user role has been deleted.
+ *
+ * This hook allows you act when a user role has been deleted.
+ * It is recommended that you implement this hook if your module
+ * stores references to roles.
+ *
+ * @param $role
+ *   The $role object being deleted.
+ */
+function hook_user_role_delete($role) {
+  // Delete existing instances of the deleted role.
+  db_delete('my_module_table')
+    ->condition('rid', $role->rid)
+    ->execute();
+}
+
+/**
  * @} End of "addtogroup hooks".
  */
Index: profiles/default/default.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.install,v
retrieving revision 1.1
diff -u -r1.1 default.install
--- profiles/default/default.install	21 Aug 2009 07:50:08 -0000	1.1
+++ profiles/default/default.install	22 Aug 2009 16:19:20 -0000
@@ -183,20 +183,18 @@
   ))->execute();
   db_insert('taxonomy_vocabulary_node_type')->fields(array('vid' => $vid, 'type' => 'article'))->execute();
 
-  // Create a default role for site administrators.
-  $rid = db_insert('role')->fields(array('name' => 'administrator'))->execute();
+  // Enable default permissions for system roles.
+  user_role_set_permissions(DRUPAL_ANONYMOUS_RID, array('access content'));
+  user_role_set_permissions(DRUPAL_AUTHENTICATED_RID, array('access content', 'access comments', 'post comments', 'post comments without approval'));
 
-  // Set this as the administrator role.
-  variable_set('user_admin_role', $rid);
 
-  // Assign all available permissions to this role.
-  foreach (module_invoke_all('permission') as $key => $value) {
-    db_insert('role_permission')
-      ->fields(array(
-        'rid' => $rid,
-        'permission' => $key,
-      ))->execute();
-  }
+  // Create a default role for site administrators, with all available permissions assigned.
+  $admin_role = new stdClass();
+  $admin_role->name = 'administrator';
+  user_role_save($admin_role);
+  user_role_set_permissions($admin_role->name, array_keys(module_invoke_all('permission')));
+  // Set this as the administrator role.
+  variable_set('user_admin_role', $admin_role->rid);
 
   // Update the menu router information.
   menu_rebuild();
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.49
diff -u -r1.49 block.admin.inc
--- modules/block/block.admin.inc	22 Aug 2009 14:34:18 -0000	1.49
+++ modules/block/block.admin.inc	22 Aug 2009 16:18:06 -0000
@@ -534,3 +534,12 @@
 
   $variables['form_submit'] = drupal_render_children($variables['form']);
 }
+
+/**
+ * Implement hook_user_role_delete().
+ */
+function block_user_role_delete($role) {
+  db_delete('block_role')
+    ->condition('rid', $role->rid)
+    ->execute();
+}
\ No newline at end of file
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.374
diff -u -r1.374 system.install
--- modules/system/system.install	21 Aug 2009 17:28:27 -0000	1.374
+++ modules/system/system.install	22 Aug 2009 16:18:42 -0000
@@ -385,21 +385,6 @@
       ->execute();
   }
 
-  $query = db_insert('role_permission')->fields(array('rid', 'permission'));
-  // Anonymous role permissions.
-  $query->values(array(
-    'rid' => DRUPAL_ANONYMOUS_RID,
-    'permission' => 'access content',
-  ));
-
-  // Authenticated role permissions.
-  foreach (array('access comments', 'access content', 'post comments', 'post comments without approval', 'view own unpublished content') as $permission) {
-    $query->values(array(
-      'rid' => DRUPAL_AUTHENTICATED_RID,
-      'permission' => $permission,
-    ));
-  }
-  $query->execute();
 
   variable_set('theme_default', 'garland');
 
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.141
diff -u -r1.141 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	22 Aug 2009 00:58:54 -0000	1.141
+++ modules/simpletest/drupal_web_test_case.php	22 Aug 2009 16:18:25 -0000
@@ -892,26 +892,19 @@
       $name = $this->randomName();
     }
 
+    // Check the all the permissions strings are valid.
     if (!$this->checkPermissions($permissions)) {
       return FALSE;
     }
 
     // Create new role.
-    db_insert('role')
-      ->fields(array('name' => $name))
-      ->execute();
-    $role = db_query('SELECT * FROM {role} WHERE name = :name', array(':name' => $name))->fetchObject();
-    $this->assertTrue($role, t('Created role of name: @name, id: @rid', array('@name' => $name, '@rid' => (isset($role->rid) ? $role->rid : t('-n/a-')))), t('Role'));
+    $role = new stdClass();
+    $role->name = $name;
+    user_role_save($role);
+    user_role_set_permissions($role->name, $permissions);
+    
+    $this->assertTrue(user_role_load($name), t('Created role of name: @name, id: @rid', array('@name' => $name, '@rid' => (isset($role->rid) ? $role->rid : t('-n/a-')))), t('Role'));
     if ($role && !empty($role->rid)) {
-      // Assign permissions to role and mark it for clean-up.
-      $query = db_insert('role_permission')->fields(array('rid', 'permission'));
-      foreach ($permissions as $permission_string) {
-        $query->values(array(
-          'rid' => $role->rid,
-          'permission' => $permission_string,
-        ));
-      }
-      $query->execute();
       $count = db_query('SELECT COUNT(*) FROM {role_permission} WHERE rid = :rid', array(':rid' => $role->rid))->fetchField();
       $this->assertTrue($count == count($permissions), t('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), t('Role'));
       return $role->rid;
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.34
diff -u -r1.34 filter.admin.inc
--- modules/filter/filter.admin.inc	22 Aug 2009 14:34:20 -0000	1.34
+++ modules/filter/filter.admin.inc	22 Aug 2009 16:18:09 -0000
@@ -452,3 +452,14 @@
 
   cache_clear_all($form_state['values']['format'] . ':', 'cache_filter', TRUE);
 }
+
+/**
+ * Implement hook_user_role_delete().
+ */
+
+function filter_user_role_delete($role) {
+  db_update('filter_format')
+    ->expression('roles', 'REPLACE(roles, :rid, :repl)', array(':rid' => ',' . $role->rid, ':repl' => ''))
+    ->condition('roles', '%,' . $role->rid . '%', 'LIKE')
+    ->execute();
+}
\ No newline at end of file