[Pkg-drupal-commits] r2285 - in /branches/drupal7/debian: changelog patches/71_debian_security_warning patches/series

[luigi at users.alioth.debian.org]

Author: luigi
Date: Sat Feb 23 15:21:34 2013
New Revision: 2285

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2285
Log:
Removed update warnings for Drupal core, since security fixes are provided by Debian updates. (Closes: #700545)

Added:
    branches/drupal7/debian/patches/71_debian_security_warning
Modified:
    branches/drupal7/debian/changelog
    branches/drupal7/debian/patches/series

Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2285&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Sat Feb 23 15:21:34 2013
@@ -3,6 +3,9 @@
   * Acknowledge NMUs from Gunnar Wolf
   * Incorporated fix for DoS on image derivative generation
     (Ref: SA-CORE-2013-002, CVE-2013-0316) (Closes: #701165)
+
+  * Removed update warnings for Drupal core, since security fixes are provided
+    by Debian updates. (Closes: #700545)
 
  -- Luigi Gangitano <luigi at debian.org>  Sat, 23 Feb 2013 15:12:35 +0100
 

Added: branches/drupal7/debian/patches/71_debian_security_warning
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/patches/71_debian_security_warning?rev=2285&op=file
==============================================================================
--- branches/drupal7/debian/patches/71_debian_security_warning (added)
+++ branches/drupal7/debian/patches/71_debian_security_warning Sat Feb 23 15:21:34 2013
@@ -1,0 +1,32 @@
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700545
+Forwarded: not-needed
+Author: Luigi Gangitano <luigi at debian.org>
+Last-Update: 2013-02-23
+Bug-Debian: http://bugs.debian.org/700545
+Description: Removes update warning for drupal core version
+ This patch removes new version checking for drupal core. Security updates
+ are provided by Debian using patches against currently frozen version (7.14).
+
+--- a/modules/update/update.compare.inc
++++ b/modules/update/update.compare.inc
+@@ -45,6 +45,8 @@
+       }
+       // Allow other modules to alter projects before fetching and comparing.
+       drupal_alter('update_projects', $projects);
++      // *** Debian specific check *** Debian provides Drupal core updates, no need to check upstream
++      unset($projects['drupal']);
+       // Cache the site's project data for at most 1 hour.
+       _update_cache_set('update_project_projects', $projects, REQUEST_TIME + 3600);
+     }
+--- a/modules/update/update.install
++++ b/modules/update/update.install
+@@ -33,7 +33,8 @@
+       module_load_include('inc', 'update', 'update.compare');
+       $data = update_calculate_project_data($available);
+       // First, populate the requirements for core:
+-      $requirements['update_core'] = _update_requirement_check($data['drupal'], 'core');
++      // *** Debian specific check *** Debian provides security updates for drupal core, no need to check online
++      // $requirements['update_core'] = _update_requirement_check($data['drupal'], 'core');
+       // We don't want to check drupal a second time.
+       unset($data['drupal']);
+       if (!empty($data)) {

Modified: branches/drupal7/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/patches/series?rev=2285&op=diff
==============================================================================
--- branches/drupal7/debian/patches/series (original)
+++ branches/drupal7/debian/patches/series Sat Feb 23 15:21:34 2013
@@ -4,3 +4,4 @@
 50_SA-CORE-2012-004
 60_SA-CORE-2013-001
 70_SA-CORE-2013-002
+71_debian_security_warning