Pullup ticket 1672 - requested by adrianp

security update for drupal

Revisions pulled up:
- pkgsrc/www/drupal/Makefile		1.8, 1.9, 1.10
- pkgsrc/www/drupal/distinfo		1.8
- pkgsrc/www/drupal/PLIST		1.2, 1.3

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Fri May 26 16:56:19 UTC 2006

   Modified Files:
   	pkgsrc/www/drupal: Makefile distinfo

   Log Message:
   Drupal 4.6.7, 2006-05-24
   ------------------------
   - fixed critical SQL issue, see SA-2006-005
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Fri May 26 17:14:35 UTC 2006

   Modified Files:
   	pkgsrc/www/drupal: Makefile PLIST

   Log Message:
   Add missing .htaccess file. Thanks to taca@ for spotting this.
   Fix pkglint warnings
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat May 27 15:52:54 UTC 2006

   Modified Files:
   	pkgsrc/www/drupal: Makefile PLIST

   Log Message:
   Fix an issue with binary packages pointed out by salo@
   Bump PKGREVISION

3 files changed, 16 insertions, 10 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 2d1966eafa3..1b7ffff0dd6 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 20:43:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2006/05/28 21:27:20 salo Exp $
 
-DISTNAME=	drupal-4.6.6
+DISTNAME=	drupal-4.6.7
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -31,7 +32,7 @@ SUBST_MESSAGE.conf=     Fixing configuration files.
 .include "options.mk"
 
 post-extract:
-	@${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
+	${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
 
 do-install:
 	${INSTALL_DATA_DIR} ${DRUPAL}
@@ -46,6 +47,9 @@ do-install:
 		${PREFIX}/share/examples/drupal
 	${INSTALL_DATA} ${WRKSRC}/sites/default/settings.php \
 		${PREFIX}/share/examples/drupal
+	${INSTALL_DATA} ${WRKSRC}/sites/default/settings.php \
+		${DRUPAL}/sites/default/settings.php.example
+	${INSTALL_DATA} ${WRKSRC}/.htaccess ${DRUPAL}
 	${INSTALL_DATA} ${WRKSRC}/*.ico ${DRUPAL}
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
 
@@ -53,7 +57,7 @@ do-install:
 		cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i}
 .	endfor
 
-	@${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DRUPAL}/files
-	@${CHMOD} 0770 ${DRUPAL}/files
+	${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DRUPAL}/files
+	${CHMOD} 0770 ${DRUPAL}/files
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/drupal/PLIST b/www/drupal/PLIST
index 751745af063..e720369d2a1 100644
--- a/www/drupal/PLIST
+++ b/www/drupal/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/05 00:02:43 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2006/05/28 21:27:20 salo Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/INSTALL.txt
 share/doc/drupal/LICENSE.txt
 share/doc/drupal/MAINTAINERS.txt
+share/drupal/.htaccess
 share/drupal/cron.php
 share/drupal/database/database.mysql
 share/drupal/database/database.pgsql
@@ -84,6 +85,7 @@ share/drupal/scripts/code-style.pl
 share/drupal/scripts/cron-curl.sh
 share/drupal/scripts/cron-lynx.sh
 share/drupal/scripts/prefix.sh
+share/drupal/sites/default/settings.php.example
 share/drupal/themes/bluemarine/logo.png
 share/drupal/themes/bluemarine/screenshot.png
 share/drupal/themes/bluemarine/style.css
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index c483f248996..354ac0ba00a 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/03/14 16:48:48 adrianp Exp $
+$NetBSD: distinfo,v 1.7.2.1 2006/05/28 21:27:20 salo Exp $
 
-SHA1 (drupal-4.6.6.tar.gz) = 29eb0a60c033d684931f8e8927d2435ff3c5fe83
-RMD160 (drupal-4.6.6.tar.gz) = d55af1dac65336fda4c830d8c1c56678588e3d91
-Size (drupal-4.6.6.tar.gz) = 455959 bytes
+SHA1 (drupal-4.6.7.tar.gz) = 5c45b003ac05eda60af2bb236b3c54746d7ff563
+RMD160 (drupal-4.6.7.tar.gz) = e61528d3284dfbf33b44454441e7d59a02107af4
+Size (drupal-4.6.7.tar.gz) = 457205 bytes