From 07090f94b2b73d9911539d4543541d8dc28830db Mon Sep 17 00:00:00 2001
From: adrianp <adrianp@pkgsrc.org>
Date: Thu, 18 Oct 2007 13:01:35 +0000
Subject: Update to 5.3

Fix a number of security issues:
SA-2007-024 - Drupal Core - HTTP response splitting
SA-2007-025 - Drupal Core - Arbitrary code execution via installer.
SA-2007-026 - Drupal Core - Cross site scripting via uploads
SA-2007-029 - Drupal Core - User deletion cross site request forgery
SA-2007-030 - Drupal Core - API handling of unpublished comment

Bugs:
Redirect to home page after user registration requiring admin approval.
More correct wording since some modules will actually work despite warning.
variable search_cron_limit was not removed on search uninstall
Append to instead of overwrite #suffix.
hide administration pages links on module help pages if there are no admin links for the module

See http://drupal.org/node/184395 for all the details
---
 www/drupal/Makefile | 14 ++++++++++++--
 www/drupal/distinfo |  8 ++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'www/drupal')

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index c3db7c58070..d70bea4afdd 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2007/07/27 21:44:32 adrianp Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/18 13:01:35 adrianp Exp $
 
-DISTNAME=	drupal-5.2
+DISTNAME=	drupal-5.3
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -18,6 +18,8 @@ PAX_DIRS=	includes misc modules scripts themes
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 
+BUILD_DEFS+=		APACHE_USER APACHE_GROUP
+
 OWN_DIRS+=		${DRUPAL}/sites/default
 OWN_DIRS_PERMS+=	${DRUPAL}/files ${APACHE_USER} ${APACHE_GROUP} 0750
 
@@ -39,6 +41,14 @@ SUBST_MESSAGE.conf=	Fixing configuration files.
 .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
+
 .include "options.mk"
 
 post-extract:
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index dad274a04e1..6b7a6954f26 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2007/07/27 21:44:32 adrianp Exp $
+$NetBSD: distinfo,v 1.17 2007/10/18 13:01:36 adrianp Exp $
 
-SHA1 (drupal-5.2.tar.gz) = d6460630b5c946c0fff152da5a83ff638fb8b097
-RMD160 (drupal-5.2.tar.gz) = 6a42700b90f046dabbb12dbf8381e3641c595847
-Size (drupal-5.2.tar.gz) = 751205 bytes
+SHA1 (drupal-5.3.tar.gz) = 71aaf830b65ec3c1029855b6ae95b6493ca17ae5
+RMD160 (drupal-5.3.tar.gz) = d6eaa0a3ebe860857a9f212302206db967e2478a
+Size (drupal-5.3.tar.gz) = 753427 bytes
-- 
cgit v1.2.3