Pullup ticket 2950 - requested by taca

security update

Revisions pulled up:
- pkgsrc/www/drupal/Makefile	most of the diff 1.42-1.43
- pkgsrc/www/drupal/PLIST	1.9
- pkgsrc/www/drupal/distinfo	1.33

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Dec 19 09:20:23 UTC 2009

   Modified Files:
           pkgsrc/www/drupal: Makefile PLIST distinfo

   Log Message:
   Update www/drupal package to 5.21, fixing security problem.

   Drupal 5.21, 2009-12-16
   -----------------------
   - Fixed a security issue (Cross site scripting), see SA-CORE-2009-009.
   - Fixed a variety of small bugs.


   To generate a diff of this commit:
   cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/drupal/Makefile
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/drupal/PLIST
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/drupal/distinfo

3 files changed, 11 insertions, 9 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 4f2f49a13cd..d74ba9ba0b0 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2009/09/29 13:39:58 taca Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2009/12/19 21:14:14 spz Exp $
 
-DISTNAME=	drupal-5.20
+DISTNAME=	drupal-5.21
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -25,7 +25,7 @@ BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 USE_TOOLS+=		perl:run pax
 REPLACE_PERL=		scripts/code-style.pl
 
-OWN_DIRS+=		${DRUPAL}/sites/default
+#OWN_DIRS+=		${DRUPAL}/sites/default
 OWN_DIRS_PERMS+=	${DRUPAL}/files ${APACHE_USER} ${APACHE_GROUP} 0750
 
 CONF_FILES=	${PREFIX}/share/examples/drupal/drupal.conf \
diff --git a/www/drupal/PLIST b/www/drupal/PLIST
index 3d76aaac738..36c22fba816 100644
--- a/www/drupal/PLIST
+++ b/www/drupal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 22:00:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8.4.1 2009/12/19 21:14:14 spz Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/INSTALL.mysql.txt
 share/doc/drupal/INSTALL.pgsql.txt
@@ -7,7 +7,6 @@ share/doc/drupal/LICENSE.txt
 share/doc/drupal/MAINTAINERS.txt
 share/doc/drupal/UPGRADE.txt
 share/doc/drupal/robots.txt
-share/drupal/robots.txt
 share/drupal/cron.php
 share/drupal/includes/bootstrap.inc
 share/drupal/includes/cache.inc
@@ -176,6 +175,7 @@ share/drupal/modules/user/user.module
 share/drupal/modules/watchdog/watchdog.css
 share/drupal/modules/watchdog/watchdog.info
 share/drupal/modules/watchdog/watchdog.module
+share/drupal/robots.txt
 share/drupal/scripts/code-clean.sh
 share/drupal/scripts/code-style.pl
 share/drupal/scripts/cron-curl.sh
@@ -278,4 +278,6 @@ share/drupal/xmlrpc.php
 share/examples/drupal/default.profile
 share/examples/drupal/drupal.conf
 share/examples/drupal/settings.php
+@pkgdir share/drupal/sites/default
 @pkgdir share/drupal/profiles/default
+@pkgdir share/drupal/files
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index ebe247dbe1c..bada7a0d6dd 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.32 2009/09/29 13:39:58 taca Exp $
+$NetBSD: distinfo,v 1.32.2.1 2009/12/19 21:14:14 spz Exp $
 
-SHA1 (drupal-5.20.tar.gz) = f05d5bf66988a82c980056528d50401ed0822a25
-RMD160 (drupal-5.20.tar.gz) = d0925795dfd29bde731988ead2274367bad39031
-Size (drupal-5.20.tar.gz) = 767132 bytes
+SHA1 (drupal-5.21.tar.gz) = a361c7e0259f30994ff47c7f363711df2cd12793
+RMD160 (drupal-5.21.tar.gz) = e01121759dbcbe396ba0063e611519e07cce299a
+Size (drupal-5.21.tar.gz) = 767162 bytes