[drupal6] 6.22.

[Jon Ciesla]

commit 5103c0c1e3f308e5129362107104629b9223735c
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu May 26 08:58:28 2011 -0500

    6.22.

 drupal-6.0-scripts-noshebang.patch |   42 +++++++++++++++++------------------
 drupal6.spec                       |    5 +++-
 sources                            |    2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/drupal-6.0-scripts-noshebang.patch b/drupal-6.0-scripts-noshebang.patch
index a154e0c..98b4a56 100644
--- a/drupal-6.0-scripts-noshebang.patch
+++ b/drupal-6.0-scripts-noshebang.patch
@@ -1,40 +1,38 @@
-diff -u scripts/code-clean.sh scripts.new/code-clean.sh
---- scripts/code-clean.sh	2008-02-22 07:37:31.000000000 -0600
-+++ scripts.new/code-clean.sh	2008-02-22 07:37:31.000000000 -0600
+diff -r -U3 drupal-6.22.orig/scripts/code-clean.sh drupal-6.22/scripts/code-clean.sh
+--- drupal-6.22.orig/scripts/code-clean.sh	2011-05-25 15:43:55.000000000 -0500
++++ drupal-6.22/scripts/code-clean.sh	2011-05-26 08:49:57.857465974 -0500
 @@ -1,4 +1,3 @@
 -#!/bin/sh
- # $Id: code-clean.sh,v 1.8 2005/08/11 13:02:08 dries Exp $
  
  find . -name "*~" -type f | xargs rm -f
-diff -u scripts/code-style.pl scripts.new/code-style.pl
---- scripts/code-style.pl	2008-02-22 07:37:57.000000000 -0600
-+++ scripts.new/code-style.pl	2008-02-22 07:37:57.000000000 -0600
+ find . -name ".#*" -type f | xargs rm -f
+diff -r -U3 drupal-6.22.orig/scripts/code-style.pl drupal-6.22/scripts/code-style.pl
+--- drupal-6.22.orig/scripts/code-style.pl	2011-05-25 15:43:55.000000000 -0500
++++ drupal-6.22/scripts/code-style.pl	2011-05-26 08:50:02.491466042 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/perl -w
- # $Id: code-style.pl,v 1.14 2007/02/15 11:40:19 dries Exp $
  
  use Pod::Usage;
-diff -u scripts/cron-curl.sh scripts.new/cron-curl.sh
---- scripts/cron-curl.sh	2008-02-22 07:38:04.000000000 -0600
-+++ scripts.new/cron-curl.sh	2008-02-22 07:38:04.000000000 -0600
-@@ -1,4 +1,3 @@
+ use Getopt::Long qw(GetOptions);
+diff -r -U3 drupal-6.22.orig/scripts/cron-curl.sh drupal-6.22/scripts/cron-curl.sh
+--- drupal-6.22.orig/scripts/cron-curl.sh	2011-05-25 15:43:55.000000000 -0500
++++ drupal-6.22/scripts/cron-curl.sh	2011-05-26 08:50:09.717466024 -0500
+@@ -1,3 +1,2 @@
 -#!/bin/sh
- # $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  curl --silent --compressed http://example.com/cron.php
-diff -u scripts/cron-lynx.sh scripts.new/cron-lynx.sh
---- scripts/cron-lynx.sh	2008-02-22 07:38:09.000000000 -0600
-+++ scripts.new/cron-lynx.sh	2008-02-22 07:38:09.000000000 -0600
-@@ -1,4 +1,3 @@
+diff -r -U3 drupal-6.22.orig/scripts/cron-lynx.sh drupal-6.22/scripts/cron-lynx.sh
+--- drupal-6.22.orig/scripts/cron-lynx.sh	2011-05-25 15:43:55.000000000 -0500
++++ drupal-6.22/scripts/cron-lynx.sh	2011-05-26 08:50:13.102466019 -0500
+@@ -1,3 +1,2 @@
 -#!/bin/sh
- # $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1
-diff -u scripts/drupal.sh scripts.new/drupal.sh
---- scripts/drupal.sh	2008-02-22 07:38:17.000000000 -0600
-+++ scripts.new/drupal.sh	2008-02-22 07:38:17.000000000 -0600
+diff -r -U3 drupal-6.22.orig/scripts/drupal.sh drupal-6.22/scripts/drupal.sh
+--- drupal-6.22.orig/scripts/drupal.sh	2011-05-25 15:43:55.000000000 -0500
++++ drupal-6.22/scripts/drupal.sh	2011-05-26 08:50:16.687466206 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/php
  <?php
- // $Id: drupal.sh,v 1.4 2007/07/02 14:41:37 dries Exp $
  
+ /**
diff --git a/drupal6.spec b/drupal6.spec
index a79f706..8a8a55b 100644
--- a/drupal6.spec
+++ b/drupal6.spec
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal6
 Name: drupal6
-Version:  6.20
+Version:  6.22
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
 
 %changelog
+* Thu May 26 2011 Jon Ciesla <limb at jcomserv.net> - 6.22-1
+- Update to 6.22, SA-CORE-2011-001.
+
 * Thu Feb 24 2011 Jon Ciesla <limb at jcomserv.net> - 6.20-1
 - Update to 6.20.
 
diff --git a/sources b/sources
index 5b112d0..9830b05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4f59401fbb3e20e3a03ac5fc11bd27c  drupal-6.20.tar.gz
+447490f3bc155fd1d5c2d47280c999a5  drupal-6.22.tar.gz