Update drupal7 to 7.22.

Drupal 7.22, 2013-04-03
-----------------------
- Allowed the drupal_http_request() function to be overridden so that
  additional HTTP request capabilities can be added by contributed modules.
- Changed the Simpletest module to allow PSR-0 test classes to be used in
  Drupal 7.
- Removed an unnecessary "Content-Disposition" header from private file
  downloads; it prevented many private files from being viewed inline in a web
  browser.
- Changed various field API functions to allow them to optionally act on a
  single field within an entity (API addition: http://drupal.org/node/1825844).
- Fixed a bug which prevented Drupal's file transfer functionality from working
  on some PHP 5.4 systems.
- Fixed incorrect log message when theme() is called for a theme hook that does
  not exist (minor string change).
- Fixed Drupal's token-replacement system to allow spaces in the token value.
- Changed the default behavior after a user creates a node they do not have
  access to view. The user will now be redirected to the front page rather than
  an access denied page.
- Fixed a bug which prevented empty HTTP headers (such as "0") from being set.
  (Minor behavior change: Callers of drupal_add_http_header() must now set
  FALSE explicitly to prevent a header from being sent at all; this was already
  indicated in the function's documentation.)
- Fixed OpenID errors when more than one module implements hook_openid(). The
  behavior is now changed so that if more than one module tries to set the same
  parameter, the last module's change takes effect.
- Fixed a serious documentation bug: The $name variable in the
  taxonomy-term.tpl.php theme template was incorrectly documented as being
  sanitized when in fact it is not.
- Fixed a bug which prevented Drupal 6 to Drupal 7 upgrades on sites which had
  duplicate permission names in the User module's database tables.
- Added an empty "datatype" attribute to taxonomy term and username links to
  make the RDFa markup upward compatible with RDFa 1.1 (minor markup addition).
- Fixed a bug which caused the denial-of-service protection added in Drupal
  7.20 to break certain valid image URLs that had an extra slash in them.
- Fixed a bug with update queries in the SQLite database driver that prevented
  Drupal from being installed with SQLite on PHP 5.4.
- Fixed enforced dependencies errors updating to recent versions of Drupal 7 on
  certain non-MySQL databases.
- Refactored the Field module's caching behavior to obtain large improvements
  in memory usage for sites with many fields and instances (API addition:
  http://drupal.org/node/1915646).
- Fixed entity argument not being passed to implementations of
  hook_file_download_access_alter(). The fix adds an additional context
  parameter that can be passed when calling drupal_alter() for any hook (API
  change: http://drupal.org/node/1882722).
- Fixed broken support for translatable comment fields (API change:
  http://drupal.org/node/1874724).
- Added an assertThemeOutput() method to Simpletest to allow tests to check
  that themed output matches an expected HTML string (API addition).
- Added a link to "Install another module" after a module has been successfully
  downloaded via the Update Manager (UI change).
- Added an optional "exclusive" flag to installation profile .info files which
  allows Drupal distributions to force a profile to be selected during
  installation (API addition).
- Fixed a bug which caused the database API to not properly close database
  connections.
- Added a link to the URL for running cron from outside the site to the Cron
  settings page (UI change).
- Fixed a bug which prevented image styles from being reverted on PHP 5.4.
- Made the default .htaccess rules protocol sensitive to improve security for
  sites which use HTTPS and redirect between "www" and non-"www" versions of
  the page.
- Numerous small bug fixes.
- Numerous API documentation improvements.
- Additional automated test coverage.

3 files changed, 15 insertions, 10 deletions

diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 87577fed690..d53d7e8f0cc 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2013/03/16 07:21:24 obache Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 12:07:12 taca Exp $
 
-DISTNAME=	drupal-7.21
-PKGREVISION=	1
+DISTNAME=	drupal-7.22
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -24,8 +23,7 @@ PKG_GROUPS_VARS+=	WWW_GROUP
 PKG_USERS_VARS+=	WWW_USER
 
 BUILD_DEFS+=		WWW_USER WWW_GROUP
-USE_TOOLS+=		perl:run pax
-REPLACE_PERL=		scripts/code-style.pl
+USE_TOOLS+=		pax
 
 OWN_DIRS_PERMS+=	${DRUPAL}/sites/default \
 			${WWW_USER} ${WWW_GROUP} 0750
diff --git a/www/drupal7/PLIST b/www/drupal7/PLIST
index 5ad3a966053..30722dea731 100644
--- a/www/drupal7/PLIST
+++ b/www/drupal7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/11/08 13:25:53 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/06 12:07:12 taca Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/COPYRIGHT.txt
 share/doc/drupal/INSTALL.mysql.txt
@@ -323,6 +323,7 @@ share/drupal/modules/field/field.crud.inc
 share/drupal/modules/field/field.default.inc
 share/drupal/modules/field/field.form.inc
 share/drupal/modules/field/field.info
+share/drupal/modules/field/field.info.class.inc
 share/drupal/modules/field/field.info.inc
 share/drupal/modules/field/field.install
 share/drupal/modules/field/field.module
@@ -604,6 +605,7 @@ share/drupal/modules/simpletest/files/php-1.txt
 share/drupal/modules/simpletest/files/php-2.php
 share/drupal/modules/simpletest/files/sql-1.txt
 share/drupal/modules/simpletest/files/sql-2.sql
+share/drupal/modules/simpletest/lib/Drupal/simpletest/Tests/PSR0WebTest.php
 share/drupal/modules/simpletest/simpletest.api.php
 share/drupal/modules/simpletest/simpletest.css
 share/drupal/modules/simpletest/simpletest.info
@@ -687,6 +689,10 @@ share/drupal/modules/simpletest/tests/password.test
 share/drupal/modules/simpletest/tests/path.test
 share/drupal/modules/simpletest/tests/path_test.info
 share/drupal/modules/simpletest/tests/path_test.module
+share/drupal/modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test/Tests/ExampleTest.php
+share/drupal/modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test/Tests/Nested/NestedExampleTest.php
+share/drupal/modules/simpletest/tests/psr_0_test/psr_0_test.info
+share/drupal/modules/simpletest/tests/psr_0_test/psr_0_test.module
 share/drupal/modules/simpletest/tests/registry.test
 share/drupal/modules/simpletest/tests/requirements1_test.info
 share/drupal/modules/simpletest/tests/requirements1_test.install
@@ -739,6 +745,7 @@ share/drupal/modules/simpletest/tests/update_test_3.install
 share/drupal/modules/simpletest/tests/update_test_3.module
 share/drupal/modules/simpletest/tests/upgrade/drupal-6.bare.database.php
 share/drupal/modules/simpletest/tests/upgrade/drupal-6.comments.database.php
+share/drupal/modules/simpletest/tests/upgrade/drupal-6.duplicate-permission.database.php
 share/drupal/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
 share/drupal/modules/simpletest/tests/upgrade/drupal-6.forum.database.php
 share/drupal/modules/simpletest/tests/upgrade/drupal-6.locale.database.php
diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo
index 61b84302e7f..37ee99a5145 100644
--- a/www/drupal7/distinfo
+++ b/www/drupal7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2013/03/07 16:54:09 taca Exp $
+$NetBSD: distinfo,v 1.13 2013/04/06 12:07:12 taca Exp $
 
-SHA1 (drupal-7.21.tar.gz) = abe77691715315c9115b5f5e2eac9bb4bbe52454
-RMD160 (drupal-7.21.tar.gz) = 58f2f8f6962827b512d879bc817d8969ecd7a4ae
-Size (drupal-7.21.tar.gz) = 3163798 bytes
+SHA1 (drupal-7.22.tar.gz) = 81c4d72b374dbcb338ec53049ca659a2d1ee9d87
+RMD160 (drupal-7.22.tar.gz) = f9928ac08b7a4e5da30b651078f1cbdf8d1ab0b3
+Size (drupal-7.22.tar.gz) = 3183014 bytes