Index: drupalorg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalorg/Attic/drupalorg.module,v
retrieving revision 1.66.2.15
diff -u -p -r1.66.2.15 drupalorg.module
--- drupalorg.module	8 Mar 2009 06:42:09 -0000	1.66.2.15
+++ drupalorg.module	16 Mar 2009 15:31:00 -0000
@@ -558,3 +558,14 @@ function drupalorg_search($op = 'search'
 function drupalorg_drupal_issue_url($query = array(), $absolute = FALSE) {
   return url('project/issues/search/drupal', array('query' => $query, 'absolute' => $absolute));
 }
+
+/**
+ * Implementation of hook_views_api().
+ */
+function drupalorg_views_api() {
+  return array(
+    'api' => 2.0,
+    'path' => drupal_get_path('module', 'drupalorg'),
+  );
+}
+
Index: drupalorg.views_default.inc
===================================================================
RCS file: drupalorg.views_default.inc
diff -N drupalorg.views_default.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drupalorg.views_default.inc	16 Mar 2009 15:31:00 -0000
@@ -0,0 +1,389 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Contains default views on behalf of the drupalorg module.
+ */
+
+/**
+ * Implementation of hook_views_default_views().
+ */
+function drupalorg_views_default_views() {
+  $views = array();
+
+  // ----------------------------------------
+  // The Drupal core SAs
+  // ----------------------------------------
+  $view = new view;
+  $view->name = 'drupalorg_security_announcements';
+  $view->description = 'Security advisories for Drupal core';
+  $view->tag = 'security';
+  $view->view_php = '';
+  $view->base_table = 'node';
+  $view->is_cacheable = FALSE;
+  $view->api_version = 2;
+  $view->disabled = FALSE;
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('sorts', array(
+    'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status_extra' => array(
+      'operator' => '=',
+      'value' => '',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status_extra',
+      'table' => 'node',
+      'field' => 'status_extra',
+      'relationship' => 'none',
+    ),
+    'tid' => array(
+      'operator' => 'and',
+      'value' => array(
+        '1852' => '1852',
+      ),
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'type' => 'select',
+      'vid' => '1',
+      'id' => 'tid',
+      'table' => 'term_node',
+      'field' => 'tid',
+      'hierarchy' => 0,
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+      'reduce_duplicates' => 0,
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('title', 'Security advisories');
+  $handler->override_option('header', 'These posts by the Drupal security team are also sent to the security announcements e-mail list.');
+  $handler->override_option('header_format', '1');
+  $handler->override_option('header_empty', 1);
+  $handler->override_option('use_pager', '1');
+  $handler->override_option('row_plugin', 'node');
+  $handler->override_option('row_options', array(
+    'teaser' => 1,
+    'links' => 1,
+    'comments' => 0,
+  ));
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->override_option('path', 'security/core');
+  $handler->override_option('menu', array(
+    'type' => 'default tab',
+    'title' => 'Drupal core',
+    'description' => '',
+    'weight' => '0',
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'normal',
+    'title' => 'Security advisories for Drupal core',
+    'description' => 'These posts by the Drupal security team are also sent to the security announcements e-mail list.',
+    'weight' => '0',
+  ));
+  $handler = $view->new_display('feed', 'Feed', 'feed_1');
+  $handler->override_option('style_plugin', 'rss');
+  $handler->override_option('style_options', array(
+    'mission_description' => FALSE,
+    'description' => '',
+  ));
+  $handler->override_option('row_plugin', 'node_rss');
+  $handler->override_option('row_options', array(
+    'item_length' => 'default',
+  ));
+  $handler->override_option('path', 'security/rss.xml');
+  $handler->override_option('menu', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+  ));
+  $handler->override_option('displays', array(
+    'page_1' => 'page_1',
+    'default' => 0,
+  ));
+  $handler->override_option('sitename_title', FALSE);
+  $views[$view->name] = $view;
+
+  // ----------------------------------------
+  // Drupal contrib SAs
+  // ----------------------------------------
+  $view = new view;
+  $view->name = 'drupalorg_security_announcements_contrib';
+  $view->description = 'Contrib modules SAs';
+  $view->tag = 'security';
+  $view->view_php = '';
+  $view->base_table = 'node';
+  $view->is_cacheable = FALSE;
+  $view->api_version = 2;
+  $view->disabled = FALSE;
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('sorts', array(
+    'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status_extra' => array(
+      'operator' => '=',
+      'value' => '',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status_extra',
+      'table' => 'node',
+      'field' => 'status_extra',
+      'relationship' => 'none',
+    ),
+    'tid' => array(
+      'operator' => 'and',
+      'value' => array(
+        '44' => '44',
+      ),
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'type' => 'select',
+      'vid' => '1',
+      'id' => 'tid',
+      'table' => 'term_node',
+      'field' => 'tid',
+      'hierarchy' => 0,
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+      'reduce_duplicates' => 0,
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('title', 'Security advisories for contributed projects ');
+  $handler->override_option('header', 'Security advisories for third-party projects that are not part of Drupal core - this includes all modules, themes, and installation profiles that have been contributed by a community member. These posts by the Drupal security team are also sent to the security announcements e-mail list.');
+  $handler->override_option('header_format', '1');
+  $handler->override_option('header_empty', 1);
+  $handler->override_option('use_pager', '1');
+  $handler->override_option('row_plugin', 'node');
+  $handler->override_option('row_options', array(
+    'teaser' => 1,
+    'links' => 1,
+    'comments' => 0,
+  ));
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->override_option('path', 'security/contrib');
+  $handler->override_option('menu', array(
+    'type' => 'tab',
+    'title' => 'Contributed projects',
+    'description' => '',
+    'weight' => '1',
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'normal',
+    'title' => 'Security advisories for contributed projects',
+    'description' => 'These posts by the Drupal security team are also sent to the security announcements e-mail list.',
+    'weight' => '0',
+  ));
+  $handler = $view->new_display('feed', 'Feed', 'feed_1');
+  $handler->override_option('style_plugin', 'rss');
+  $handler->override_option('style_options', array(
+    'mission_description' => FALSE,
+    'description' => '',
+  ));
+  $handler->override_option('row_plugin', 'node_rss');
+  $handler->override_option('row_options', array(
+    'item_length' => 'default',
+  ));
+  $handler->override_option('path', 'security/contrib/rss.xml');
+  $handler->override_option('menu', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+  ));
+  $handler->override_option('displays', array(
+    'page_1' => 'page_1',
+    'default' => 0,
+  ));
+  $handler->override_option('sitename_title', FALSE);
+  $views[$view->name] = $view;
+
+  // ----------------------------------------
+  // Security Public Service Announcements
+  // ----------------------------------------
+  $view = new view;
+  $view->name = 'drupalorg_security_announcements_psa';
+  $view->description = 'Security PSAs';
+  $view->tag = 'security';
+  $view->view_php = '';
+  $view->base_table = 'node';
+  $view->is_cacheable = FALSE;
+  $view->api_version = 2;
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('sorts', array(
+    'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status_extra' => array(
+      'operator' => '=',
+      'value' => '',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status_extra',
+      'table' => 'node',
+      'field' => 'status_extra',
+      'relationship' => 'none',
+    ),
+    'tid' => array(
+      'operator' => 'and',
+      'value' => array(
+        '1856' => '1856',
+      ),
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'type' => 'select',
+      'vid' => '1',
+      'id' => 'tid',
+      'table' => 'term_node',
+      'field' => 'tid',
+      'hierarchy' => 0,
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+      'reduce_duplicates' => 0,
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('title', 'Security public service announcements');
+  $handler->override_option('header', 'Security-related announcements, such as information on best practices. These posts by the Drupal security team are also sent to the security announcements e-mail list.');
+  $handler->override_option('header_format', '1');
+  $handler->override_option('header_empty', 1);
+  $handler->override_option('use_pager', '1');
+  $handler->override_option('row_plugin', 'node');
+  $handler->override_option('row_options', array(
+    'teaser' => 1,
+    'links' => 1,
+    'comments' => 0,
+  ));
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->override_option('path', 'security/psa');
+  $handler->override_option('menu', array(
+    'type' => 'tab',
+    'title' => 'Public service anouncements',
+    'description' => '',
+    'weight' => '2',
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'normal',
+    'title' => 'Security-related public service announcements',
+    'description' => 'These posts by the Drupal security team are also sent to the security announcements e-mail list.',
+    'weight' => '0',
+  ));
+  $handler = $view->new_display('feed', 'Feed', 'feed_1');
+  $handler->override_option('style_plugin', 'rss');
+  $handler->override_option('style_options', array(
+    'mission_description' => FALSE,
+    'description' => '',
+  ));
+  $handler->override_option('row_plugin', 'node_rss');
+  $handler->override_option('row_options', array(
+    'item_length' => 'default',
+  ));
+  $handler->override_option('path', 'security/psa/rss.xml');
+  $handler->override_option('menu', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+    'name' => 'navigation',
+  ));
+  $handler->override_option('tab_options', array(
+    'type' => 'none',
+    'title' => '',
+    'description' => '',
+    'weight' => 0,
+  ));
+  $handler->override_option('displays', array(
+    'page_1' => 'page_1',
+    'default' => 0,
+  ));
+  $handler->override_option('sitename_title', FALSE);
+  $views[$view->name] = $view;
+
+  return $views;
+}
+
Index: blocks_and_nodes/redirects.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalorg/blocks_and_nodes/Attic/redirects.module,v
retrieving revision 1.4
diff -u -p -r1.4 redirects.module
--- blocks_and_nodes/redirects.module	1 Feb 2009 21:39:57 -0000	1.4
+++ blocks_and_nodes/redirects.module	16 Mar 2009 15:31:00 -0000
@@ -59,6 +59,18 @@ function redirects_menu() {
     'page arguments' => array('project/drupal'),
     'type' => MENU_CALLBACK,
   );
+  $items['security-contrib/rss.xml'] = array(
+    'access arguments' => array('access content'),
+    'page callback' => 'drupal_goto',
+    'page arguments' => array('security/contrib/rss.xml'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['security-psa/rss.xml'] = array(
+    'access arguments' => array('access content'),
+    'page callback' => 'drupal_goto',
+    'page arguments' => array('security/psa/rss.xml'),
+    'type' => MENU_CALLBACK,
+  );
   return $items;
 }