[pkgsrc/pkgsrc-2009Q4]: pkgsrc/www/drupal Pullup ticket #3037 - requested taca

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e88dd565673c
branches:  pkgsrc-2009Q4
changeset: 569290:e88dd565673c
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Mar 05 10:50:03 2010 +0000

description:
Pullup ticket #3037 - requested taca
drupal: security update

Revisions pulled up:
- www/drupal/Makefile                   1.44
- www/drupal/distinfo                   1.34
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Mar  4 01:29:39 UTC 2010

Modified Files:
        pkgsrc/www/drupal: Makefile distinfo

Log Message:
Update drupal package to 5.22.

Drupal 5.22, 2010-03-03
-----------------------
- Fixed security issues (Open redirection, Locale module cross site scripting,
  Blocked user session regeneration), see SA-CORE-2010-001.

diffstat:

 www/drupal/Makefile |  13 +++----------
 www/drupal/distinfo |   8 ++++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diffs (52 lines):

diff -r cc4bd4d2c50e -r e88dd565673c www/drupal/Makefile
--- a/www/drupal/Makefile       Thu Mar 04 20:28:10 2010 +0000
+++ b/www/drupal/Makefile       Fri Mar 05 10:50:03 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2009/12/19 09:20:23 taca Exp $
+# $NetBSD: Makefile,v 1.43.2.1 2010/03/05 10:50:03 tron Exp $
 
-DISTNAME=      drupal-5.21
+DISTNAME=      drupal-5.22
 CATEGORIES=    www
 MASTER_SITES=  http://drupal.org/files/projects/
 
@@ -43,15 +43,11 @@
 SUBST_SED.conf=                -e "s|@DRUPAL@|${DRUPAL}|g"
 SUBST_MESSAGE.conf=    Fixing configuration files.
 
-PKG_DESTDIR_SUPPORT=destdir
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
 
-.if ${PKG_PHP_VERSION} == "4"
-DEPENDS+=      php>=4.4.7:../../www/php4
-.endif
-
 .if ${PKG_PHP_VERSION} == "5"
 DEPENDS+=      php>=5.2.4:../../lang/php5
 .endif
@@ -84,9 +80,6 @@
                cd ${WRKSRC}/${i} && pax -rw . ${DESTDIR}${DRUPAL}/${i}
 .      endfor
 
-       ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${DRUPAL}/files
-       ${CHMOD} 0770 ${DESTDIR}${DRUPAL}/files
-
 post-install:
        ${FIND} ${DESTDIR}${DRUPAL} -name \*.jpg | ${XARGS} ${CHMOD} 0644
        ${FIND} ${DESTDIR}${DRUPAL} -name \*.png | ${XARGS} ${CHMOD} 0644
diff -r cc4bd4d2c50e -r e88dd565673c www/drupal/distinfo
--- a/www/drupal/distinfo       Thu Mar 04 20:28:10 2010 +0000
+++ b/www/drupal/distinfo       Fri Mar 05 10:50:03 2010 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.33 2009/12/19 09:20:23 taca Exp $
+$NetBSD: distinfo,v 1.33.2.1 2010/03/05 10:50:04 tron Exp $
 
-SHA1 (drupal-5.21.tar.gz) = a361c7e0259f30994ff47c7f363711df2cd12793
-RMD160 (drupal-5.21.tar.gz) = e01121759dbcbe396ba0063e611519e07cce299a
-Size (drupal-5.21.tar.gz) = 767162 bytes
+SHA1 (drupal-5.22.tar.gz) = 32e8d4dbaf6dee6841b2ea8496535ca0ebe1ebd9
+RMD160 (drupal-5.22.tar.gz) = fcec6b3e9609ed4de5f83b909733ea586aa757d5
+Size (drupal-5.22.tar.gz) = 768157 bytes