[Pkg-drupal-commits] r2274 - in /branches/drupal6/debian: ./ patches/ source/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Tue May 15 18:58:21 UTC 2012
Author: luigi
Date: Tue May 15 18:58:20 2012
New Revision: 2274
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2274
Log:
Switch to source format 3.0 (quilt)
Added:
branches/drupal6/debian/patches/10_cronjob.patch
branches/drupal6/debian/patches/20_drupal_core_updates.patch
branches/drupal6/debian/patches/21-ssl-cache-control.patch
branches/drupal6/debian/patches/series
branches/drupal6/debian/source/
branches/drupal6/debian/source/format
Removed:
branches/drupal6/debian/patches/00list
branches/drupal6/debian/patches/10_cronjob.dpatch
branches/drupal6/debian/patches/20_drupal_core_updates.dpatch
branches/drupal6/debian/patches/21-ssl-cache-control.dpatch
Modified:
branches/drupal6/debian/changelog
branches/drupal6/debian/control
branches/drupal6/debian/rules
Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2274&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Tue May 15 18:58:20 2012
@@ -4,6 +4,9 @@
- Fixes Access bypass, Cross Site Request Forgery, Multiple vulnerabilities
(Ref: SA-CORE-2012-001, CVE-2012-0826, CVE-2012-0827)
(Closes: #658738)
+
+ * debian/*
+ - Switch to source format 3.0 (quilt)
-- Luigi Gangitano <luigi at debian.org> Thu, 10 May 2012 20:48:41 +0200
Modified: branches/drupal6/debian/control
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/control?rev=2274&op=diff
==============================================================================
--- branches/drupal6/debian/control (original)
+++ branches/drupal6/debian/control Tue May 15 18:58:20 2012
@@ -2,7 +2,7 @@
Section: web
Priority: extra
Maintainer: Luigi Gangitano <luigi at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7.0.50~)
Homepage: http://www.drupal.org/
Standards-Version: 3.9.2.0
Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal6
Added: branches/drupal6/debian/patches/10_cronjob.patch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/10_cronjob.patch?rev=2274&op=file
==============================================================================
--- branches/drupal6/debian/patches/10_cronjob.patch (added)
+++ branches/drupal6/debian/patches/10_cronjob.patch Tue May 15 18:58:20 2012
@@ -1,0 +1,13 @@
+Author: <khn at bluejack.ath.cx>
+Description: Disable reporting to system log every cron run
+--- a/includes/common.inc
++++ b/includes/common.inc
+@@ -2787,7 +2787,7 @@
+
+ // Record cron time
+ variable_set('cron_last', time());
+- watchdog('cron', 'Cron run completed.', array(), WATCHDOG_NOTICE);
++ #watchdog('cron', 'Cron run completed.', array(), WATCHDOG_NOTICE);
+
+ // Release cron semaphore
+ variable_del('cron_semaphore');
Added: branches/drupal6/debian/patches/20_drupal_core_updates.patch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/20_drupal_core_updates.patch?rev=2274&op=file
==============================================================================
--- branches/drupal6/debian/patches/20_drupal_core_updates.patch (added)
+++ branches/drupal6/debian/patches/20_drupal_core_updates.patch Tue May 15 18:58:20 2012
@@ -1,0 +1,71 @@
+Author: Alexandre De Dommelin <adedommelin at tuxz.net>
+Description: Remove warnings about available Drupal core updates
+--- a/modules/update/update.fetch.inc
++++ b/modules/update/update.fetch.inc
+@@ -152,12 +152,10 @@
+ $status = update_requirements('runtime');
+ $params = array();
+ $notify_all = (variable_get('update_notification_threshold', 'all') == 'all');
+- foreach (array('core', 'contrib') as $report_type) {
+- $type = 'update_'. $report_type;
+- if (isset($status[$type]['severity'])
+- && ($status[$type]['severity'] == REQUIREMENT_ERROR || ($notify_all && $status[$type]['reason'] == UPDATE_NOT_CURRENT))) {
+- $params[$report_type] = $status[$type]['reason'];
+- }
++
++ if (isset($status['update_contrib']['severity'])
++ && ($status['update_contrib']['severity'] == REQUIREMENT_ERROR || ($notify_all && $status['update_contrib']['reason'] == UPDATE_NOT_CURRENT))) {
++ $params['contrib'] = $status['update_contrib']['reason'];
+ }
+ if (!empty($params)) {
+ $notify_list = variable_get('update_notify_emails', '');
+--- a/modules/update/update.module
++++ b/modules/update/update.module
+@@ -73,15 +73,13 @@
+ case 'admin/build/modules':
+ include_once './includes/install.inc';
+ $status = update_requirements('runtime');
+- foreach (array('core', 'contrib') as $report_type) {
+- $type = 'update_'. $report_type;
+- if (isset($status[$type]['severity'])) {
+- if ($status[$type]['severity'] == REQUIREMENT_ERROR) {
+- drupal_set_message($status[$type]['description'], 'error');
+- }
+- elseif ($status[$type]['severity'] == REQUIREMENT_WARNING) {
+- drupal_set_message($status[$type]['description'], 'warning');
+- }
++
++ if (isset($status['update_contrib']['severity'])) {
++ if ($status['update_contrib']['severity'] == REQUIREMENT_ERROR) {
++ drupal_set_message($status['update_contrib']['description'], 'error');
++ }
++ elseif ($status['update_contrib']['severity'] == REQUIREMENT_WARNING) {
++ drupal_set_message($status['update_contrib']['description'], 'warning');
+ }
+ }
+ return '<p>'. t('See the <a href="@available_updates">available updates</a> page for information on installed modules and themes with new versions released.', array('@available_updates' => url('admin/reports/updates'))) .'</p>';
+@@ -202,7 +200,7 @@
+ 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');
++ //$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)) {
+--- a/modules/update/update.report.inc
++++ b/modules/update/update.report.inc
+@@ -222,6 +222,13 @@
+ 'disabled-theme' => t('Disabled themes'),
+ );
+ foreach ($project_types as $type_name => $type_label) {
++ if ( $type_name == "core" ) {
++ $deb_message = array( array('class' => 'info','data' => array("Drupal core updates (including security patches) are applied by your sysadmin through the Debian package management system, you don't need to manually download them.")));
++ $output .= "\n<h3>". $type_label ."</h3>\n";
++ $output .= theme('table', $header, $deb_message,array('class' => 'update'));
++ continue;
++ }
++
+ if (!empty($rows[$type_name])) {
+ ksort($rows[$type_name]);
+ $output .= "\n<h3>". $type_label ."</h3>\n";
Added: branches/drupal6/debian/patches/21-ssl-cache-control.patch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/21-ssl-cache-control.patch?rev=2274&op=file
==============================================================================
--- branches/drupal6/debian/patches/21-ssl-cache-control.patch (added)
+++ branches/drupal6/debian/patches/21-ssl-cache-control.patch Tue May 15 18:58:20 2012
@@ -1,0 +1,19 @@
+Author: Luigi Gangitano <luigi at debian.org>
+Description: Fixes download issue with IE7 on HTTPS
+--- a/includes/file.inc
++++ b/includes/file.inc
+@@ -869,6 +869,14 @@
+ drupal_set_header('Pragma: private');
+ }
+
++ // IE cannot download private files because it cannot store files downloaded
++ // over https in the browser cache. The problem can be solved by sending
++ // custom headers to IE. See http://support.microsoft.com/kb/323308/en-us
++ if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
++ drupal_set_header('Cache-Control: private');
++ drupal_set_header('Pragma: private');
++ }
++
+ foreach ($headers as $header) {
+ // To prevent HTTP header injection, we delete new lines that are
+ // not followed by a space or a tab.
Added: branches/drupal6/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/series?rev=2274&op=file
==============================================================================
--- branches/drupal6/debian/patches/series (added)
+++ branches/drupal6/debian/patches/series Tue May 15 18:58:20 2012
@@ -1,0 +1,3 @@
+10_cronjob.patch
+20_drupal_core_updates.patch
+21-ssl-cache-control.patch
Modified: branches/drupal6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/rules?rev=2274&op=diff
==============================================================================
--- branches/drupal6/debian/rules (original)
+++ branches/drupal6/debian/rules Tue May 15 18:58:20 2012
@@ -1,59 +1,23 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+%:
+ dh $@
-PACKAGE=drupal6
+override_dh_installdirs:
+ dh_installdirs -X.svn -XCVS
-include /usr/share/dpatch/dpatch.make
-
-build: patch
-
-clean-patched:
- dh_testdir
- dh_testroot
- dh_clean
-
-clean: clean-patched unpatch
-
-install:build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -X.svn -XCVS
+override_dh_install:
dh_install -XCVS -X.svn
# fix permissions
find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6 \
-name '*.png' -o -name '*.jpg' | xargs chmod a-x
chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6/scripts/*
# rm $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6/misc/jquery.js
-
install -m640 .htaccess debian/drupal6/etc/drupal/6/htaccess
install -m644 debian/drupal6.lintian debian/drupal6/usr/share/lintian/overrides/drupal6
-# Everything else is handled by dh_install
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG.txt
+override_dh_installdocs:
dh_installdocs -XCVS -X.svn
- dh_installexamples
- dh_installdebconf
- dh_installcron
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
-ifeq ($(PO2DEBCONF),yes)
- po2debconf -e utf8 debian/templates.master > debian/templates
-endif
- dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))'
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install #PHONY_CONFIGURE#
Added: branches/drupal6/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/source/format?rev=2274&op=file
==============================================================================
--- branches/drupal6/debian/source/format (added)
+++ branches/drupal6/debian/source/format Tue May 15 18:58:20 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-drupal-commits
mailing list