Update to 5.1

Drupal 5.1, 2007-01-29
----------------------
- fixed security issue (code execution), see SA-2007-005
- fixed a variety of small bugs.

Drupal 5.0, 2007-01-15
------------------------
- completely retooled the administration page
* /admin now contains an administration page which may be themed
* reorganised administration menu items by task and by module
* added a status report page with detailed PHP/MySQL/Drupal information
- added web-based installer which can:
* check installation and run-time requirements
* automatically generate the database configuration file
* install pre-made 'install profiles' or distributions
* import the database structure with automatic table prefixing
* be localized
- added new default Garland theme
- added color module to change some themes' color schemes
- included the jQuery JavaScript library 1.0.4 and converted all core JavaScript
to use it
- introduced the ability to alter mail sent from system
- module system:
* added .info files for module meta-data
* added support for module dependencies
* improved module installation screen
* moved core modules to their own directories
* added support for module uninstalling
- added support for different cache backends
- added support for a generic "sites/all" directory.
- usability:
* added support for auto-complete forms (AJAX) to user profiles.
* made it possible to instantly assign roles to newly created user accounts.
* improved configurability of the contact forms.
* reorganized the settings pages.
* made it easy to investigate popular search terms.
* added a 'select all' checkbox and a range select feature to administration
tables.
* simplified the 'break' tag to split teasers from body.
* use proper capitalization for titles, menu items and operations.
- integrated urlfilter.module into filter.module
- block system:
* extended the block visibility settings with a role specific setting.
* made it possible to customize all block titles.
- poll module:
* optionally allow people to inspect all votes.
* optionally allow people to cancel their vote.
- distributed authentication:
* added default server option.
- added default robots.txt to control crawlers.
- database API:
* added db_table_exists().
- blogapi module:
* 'blogapi new' and 'blogapi edit' nodeapi operations.
- user module:
* added hook_profile_alter().
* e-mail verification is made optional.
* added mass editing and filtering on admin/user/user.
- PHP Template engine:
* add the ability to look for a series of suggested templates.
* look for page templates based upon the path.
* look for block templates based upon the region, module, and delta.
- content system:
* made it easier for node access modules to work well with each other.
* added configurable content types.
* changed node rendering to work with structured arrays.
- performance:
* improved session handling: reduces database overhead.
* improved access checking: reduces database overhead.
* made it possible to do memcached based session management.
* omit sidebars when serving a '404 - Page not found': saves CPU cycles and
bandwidth.
* added an 'aggressive' caching policy.
* added a CSS aggregator and compressor (up to 40% faster page loads).
- removed the archive module.
- upgrade system:
* created space for update branches.
- forms API:
* made it possible to programmatically submit forms.
* improved api for multistep forms.
- theme system:
* split up and removed drupal.css.
* added nested lists generation.
* added a self-clearing block class.

4 files changed, 213 insertions, 59 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 84f9d8feb6b..728361cffc7 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/09 19:28:27 adrianp Exp $
 
-DISTNAME=	drupal-4.7.6
+DISTNAME=	drupal-5.1
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -13,11 +13,16 @@ DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
 
 NO_BUILD=	YES
 DRUPAL=		${PREFIX}/share/drupal
-PAX_DIRS=	database includes misc modules scripts themes
+PAX_DIRS=	includes misc modules scripts themes
 BUILD_DEFS+=	APACHE_USER APACHE_GROUP
 
+OWN_DIRS+=		${DRUPAL}/sites/default
+OWN_DIRS_PERMS+=	${DRUPAL}/files ${APACHE_USER} ${APACHE_GROUP} 0750
+
 CONF_FILES=	${PREFIX}/share/examples/drupal/drupal.conf \
 		${PKG_SYSCONFDIR}/drupal.conf
+CONF_FILES+=	${PREFIX}/share/examples/drupal/default.profile \
+		${DRUPAL}/profiles/default/default.profile
 
 CONF_FILES_PERMS+=	${PREFIX}/share/examples/drupal/settings.php \
 			${DRUPAL}/sites/default/settings.php \
@@ -40,18 +45,22 @@ post-extract:
 do-install:
 	${INSTALL_DATA_DIR} ${DRUPAL}
 	${INSTALL_DATA_DIR} ${DRUPAL}/files
+	${INSTALL_DATA_DIR} ${DRUPAL}/profiles
+	${INSTALL_DATA_DIR} ${DRUPAL}/profiles/default
 	${INSTALL_DATA_DIR} ${DRUPAL}/sites
+	${INSTALL_DATA_DIR} ${DRUPAL}/sites/all
 	${INSTALL_DATA_DIR} ${DRUPAL}/sites/default
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/drupal
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/drupal
-
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/drupal
+	${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \
+		${DRUPAL}/sites/all
 	${INSTALL_DATA} ${WRKSRC}/drupal.conf \
-		${PREFIX}/share/examples/drupal
-	${INSTALL_DATA} ${WRKSRC}/sites/default/settings.php \
-		${PREFIX}/share/examples/drupal
+		${PREFIX}/share/examples/drupal/drupal.conf
 	${INSTALL_DATA} ${WRKSRC}/sites/default/settings.php \
-		${DRUPAL}/sites/default/settings.php.example
+		${PREFIX}/share/examples/drupal/settings.php
+	${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \
+		${PREFIX}/share/examples/drupal/default.profile
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
 
 .	for i in ${PAX_DIRS}
@@ -62,7 +71,7 @@ do-install:
 	${CHMOD} 0770 ${DRUPAL}/files
 
 post-install:
-	${FIND} ${DRUPAL}/themes -name \*.jpg | ${XARGS} ${CHMOD} 0644
-	${FIND} ${DRUPAL}/themes -name \*.png | ${XARGS} ${CHMOD} 0644
+	${FIND} ${DRUPAL} -name \*.jpg | ${XARGS} ${CHMOD} 0644
+	${FIND} ${DRUPAL} -name \*.png | ${XARGS} ${CHMOD} 0644
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/drupal/PLIST b/www/drupal/PLIST
index 26e27aa3034..ae12b9361ef 100644
--- a/www/drupal/PLIST
+++ b/www/drupal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/28 14:46:47 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/04/09 19:28:27 adrianp Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/INSTALL.mysql.txt
 share/doc/drupal/INSTALL.pgsql.txt
@@ -6,12 +6,10 @@ share/doc/drupal/INSTALL.txt
 share/doc/drupal/LICENSE.txt
 share/doc/drupal/MAINTAINERS.txt
 share/doc/drupal/UPGRADE.txt
+share/doc/drupal/robots.txt
 share/drupal/cron.php
-share/drupal/database/database.4.0.mysql
-share/drupal/database/database.4.1.mysql
-share/drupal/database/database.pgsql
-share/drupal/database/updates.inc
 share/drupal/includes/bootstrap.inc
+share/drupal/includes/cache.inc
 share/drupal/includes/common.inc
 share/drupal/includes/database.inc
 share/drupal/includes/database.mysql.inc
@@ -21,6 +19,9 @@ share/drupal/includes/file.inc
 share/drupal/includes/form.inc
 share/drupal/includes/image.inc
 share/drupal/includes/install.inc
+share/drupal/includes/install.mysql.inc
+share/drupal/includes/install.mysqli.inc
+share/drupal/includes/install.pgsql.inc
 share/drupal/includes/locale.inc
 share/drupal/includes/menu.inc
 share/drupal/includes/module.inc
@@ -33,14 +34,19 @@ share/drupal/includes/unicode.inc
 share/drupal/includes/xmlrpc.inc
 share/drupal/includes/xmlrpcs.inc
 share/drupal/index.php
+share/drupal/install.php
 share/drupal/misc/arrow-asc.png
 share/drupal/misc/arrow-desc.png
 share/drupal/misc/autocomplete.js
 share/drupal/misc/blog.png
 share/drupal/misc/collapse.js
-share/drupal/misc/drupal.css
 share/drupal/misc/drupal.js
 share/drupal/misc/druplicon.png
+share/drupal/misc/farbtastic/farbtastic.css
+share/drupal/misc/farbtastic/farbtastic.js
+share/drupal/misc/farbtastic/marker.png
+share/drupal/misc/farbtastic/mask.png
+share/drupal/misc/farbtastic/wheel.png
 share/drupal/misc/favicon.ico
 share/drupal/misc/feed.png
 share/drupal/misc/forum-closed.png
@@ -50,6 +56,7 @@ share/drupal/misc/forum-hot.png
 share/drupal/misc/forum-new.png
 share/drupal/misc/forum-sticky.png
 share/drupal/misc/grippie.png
+share/drupal/misc/jquery.js
 share/drupal/misc/maintenance.css
 share/drupal/misc/menu-collapsed.png
 share/drupal/misc/menu-expanded.png
@@ -66,50 +73,112 @@ share/drupal/misc/powered-gray-88x31.png
 share/drupal/misc/print.css
 share/drupal/misc/progress.gif
 share/drupal/misc/progress.js
+share/drupal/misc/tableselect.js
 share/drupal/misc/textarea.js
 share/drupal/misc/throbber.gif
 share/drupal/misc/update.js
 share/drupal/misc/upload.js
 share/drupal/misc/watchdog-error.png
+share/drupal/misc/watchdog-ok.png
 share/drupal/misc/watchdog-warning.png
 share/drupal/misc/xml.png
-share/drupal/modules/aggregator.module
-share/drupal/modules/archive.module
-share/drupal/modules/block.module
-share/drupal/modules/blog.module
-share/drupal/modules/blogapi.module
-share/drupal/modules/book.module
-share/drupal/modules/comment.module
-share/drupal/modules/contact.module
-share/drupal/modules/drupal.module
-share/drupal/modules/filter.module
-share/drupal/modules/forum.module
-share/drupal/modules/help.module
-share/drupal/modules/legacy.module
-share/drupal/modules/locale.module
-share/drupal/modules/menu.module
-share/drupal/modules/node.module
-share/drupal/modules/page.module
-share/drupal/modules/path.module
-share/drupal/modules/ping.module
-share/drupal/modules/poll.module
-share/drupal/modules/profile.module
-share/drupal/modules/search.module
-share/drupal/modules/statistics.module
-share/drupal/modules/story.module
-share/drupal/modules/system.module
-share/drupal/modules/taxonomy.module
-share/drupal/modules/throttle.module
-share/drupal/modules/tracker.module
-share/drupal/modules/upload.module
-share/drupal/modules/user.module
-share/drupal/modules/watchdog.module
+share/drupal/modules/aggregator/aggregator.css
+share/drupal/modules/aggregator/aggregator.info
+share/drupal/modules/aggregator/aggregator.install
+share/drupal/modules/aggregator/aggregator.module
+share/drupal/modules/block/block.css
+share/drupal/modules/block/block.info
+share/drupal/modules/block/block.module
+share/drupal/modules/blog/blog.info
+share/drupal/modules/blog/blog.module
+share/drupal/modules/blogapi/blogapi.info
+share/drupal/modules/blogapi/blogapi.module
+share/drupal/modules/book/book.css
+share/drupal/modules/book/book.info
+share/drupal/modules/book/book.install
+share/drupal/modules/book/book.module
+share/drupal/modules/color/color.css
+share/drupal/modules/color/color.info
+share/drupal/modules/color/color.install
+share/drupal/modules/color/color.js
+share/drupal/modules/color/color.module
+share/drupal/modules/color/images/hook.png
+share/drupal/modules/color/images/lock.png
+share/drupal/modules/comment/comment.css
+share/drupal/modules/comment/comment.info
+share/drupal/modules/comment/comment.install
+share/drupal/modules/comment/comment.module
+share/drupal/modules/contact/contact.info
+share/drupal/modules/contact/contact.install
+share/drupal/modules/contact/contact.module
+share/drupal/modules/drupal/drupal.info
+share/drupal/modules/drupal/drupal.install
+share/drupal/modules/drupal/drupal.module
+share/drupal/modules/filter/filter.info
+share/drupal/modules/filter/filter.module
+share/drupal/modules/forum/forum.css
+share/drupal/modules/forum/forum.info
+share/drupal/modules/forum/forum.install
+share/drupal/modules/forum/forum.module
+share/drupal/modules/help/help.css
+share/drupal/modules/help/help.info
+share/drupal/modules/help/help.module
+share/drupal/modules/legacy/legacy.info
+share/drupal/modules/legacy/legacy.module
+share/drupal/modules/locale/locale.css
+share/drupal/modules/locale/locale.info
+share/drupal/modules/locale/locale.install
+share/drupal/modules/locale/locale.module
+share/drupal/modules/menu/menu.info
+share/drupal/modules/menu/menu.module
+share/drupal/modules/node/content_types.inc
+share/drupal/modules/node/node.css
+share/drupal/modules/node/node.info
+share/drupal/modules/node/node.module
+share/drupal/modules/path/path.info
+share/drupal/modules/path/path.module
+share/drupal/modules/ping/ping.info
+share/drupal/modules/ping/ping.module
+share/drupal/modules/poll/poll.css
+share/drupal/modules/poll/poll.info
+share/drupal/modules/poll/poll.install
+share/drupal/modules/poll/poll.module
+share/drupal/modules/profile/profile.info
+share/drupal/modules/profile/profile.install
+share/drupal/modules/profile/profile.module
+share/drupal/modules/search/search.css
+share/drupal/modules/search/search.info
+share/drupal/modules/search/search.install
+share/drupal/modules/search/search.module
+share/drupal/modules/statistics/statistics.info
+share/drupal/modules/statistics/statistics.install
+share/drupal/modules/statistics/statistics.module
+share/drupal/modules/system/admin.css
+share/drupal/modules/system/defaults.css
+share/drupal/modules/system/system.css
+share/drupal/modules/system/system.info
+share/drupal/modules/system/system.install
+share/drupal/modules/system/system.module
+share/drupal/modules/taxonomy/taxonomy.info
+share/drupal/modules/taxonomy/taxonomy.module
+share/drupal/modules/throttle/throttle.info
+share/drupal/modules/throttle/throttle.module
+share/drupal/modules/tracker/tracker.css
+share/drupal/modules/tracker/tracker.info
+share/drupal/modules/tracker/tracker.module
+share/drupal/modules/upload/upload.info
+share/drupal/modules/upload/upload.module
+share/drupal/modules/user/user.css
+share/drupal/modules/user/user.info
+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/scripts/code-clean.sh
 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/sites/all/README.txt
 share/drupal/themes/bluemarine/block.tpl.php
 share/drupal/themes/bluemarine/box.tpl.php
 share/drupal/themes/bluemarine/comment.tpl.php
@@ -135,6 +204,40 @@ share/drupal/themes/engines/phptemplate/comment.tpl.php
 share/drupal/themes/engines/phptemplate/default.tpl.php
 share/drupal/themes/engines/phptemplate/node.tpl.php
 share/drupal/themes/engines/phptemplate/phptemplate.engine
+share/drupal/themes/garland/block.tpl.php
+share/drupal/themes/garland/color/base.png
+share/drupal/themes/garland/color/color.inc
+share/drupal/themes/garland/color/preview.css
+share/drupal/themes/garland/color/preview.png
+share/drupal/themes/garland/comment.tpl.php
+share/drupal/themes/garland/fix-ie.css
+share/drupal/themes/garland/images/bg-bar-white.png
+share/drupal/themes/garland/images/bg-bar.png
+share/drupal/themes/garland/images/bg-content-left.png
+share/drupal/themes/garland/images/bg-content-right.png
+share/drupal/themes/garland/images/bg-content.png
+share/drupal/themes/garland/images/bg-navigation-item-hover.png
+share/drupal/themes/garland/images/bg-navigation-item.png
+share/drupal/themes/garland/images/bg-navigation.png
+share/drupal/themes/garland/images/bg-tab.png
+share/drupal/themes/garland/images/body.png
+share/drupal/themes/garland/images/gradient-inner.png
+share/drupal/themes/garland/images/menu-collapsed.gif
+share/drupal/themes/garland/images/menu-expanded.gif
+share/drupal/themes/garland/images/menu-leaf.gif
+share/drupal/themes/garland/logo.png
+share/drupal/themes/garland/minnelli/color/base.png
+share/drupal/themes/garland/minnelli/color/color.inc
+share/drupal/themes/garland/minnelli/color/preview.png
+share/drupal/themes/garland/minnelli/logo.png
+share/drupal/themes/garland/minnelli/screenshot.png
+share/drupal/themes/garland/minnelli/style.css
+share/drupal/themes/garland/node.tpl.php
+share/drupal/themes/garland/page.tpl.php
+share/drupal/themes/garland/print.css
+share/drupal/themes/garland/screenshot.png
+share/drupal/themes/garland/style.css
+share/drupal/themes/garland/template.php
 share/drupal/themes/pushbutton/arrow-next-hover.png
 share/drupal/themes/pushbutton/arrow-next-visited.png
 share/drupal/themes/pushbutton/arrow-next.png
@@ -170,10 +273,16 @@ share/drupal/themes/pushbutton/tabs-option-off.png
 share/drupal/themes/pushbutton/tabs-option-on.png
 share/drupal/update.php
 share/drupal/xmlrpc.php
+share/examples/drupal/default.profile
 share/examples/drupal/drupal.conf
 share/examples/drupal/settings.php
-@dirrm share/doc/drupal
+@dirrm share/examples/drupal
 @dirrm share/drupal/themes/pushbutton
+@dirrm share/drupal/themes/garland/minnelli/color
+@dirrm share/drupal/themes/garland/minnelli
+@dirrm share/drupal/themes/garland/images
+@dirrm share/drupal/themes/garland/color
+@dirrm share/drupal/themes/garland
 @dirrm share/drupal/themes/engines/phptemplate
 @dirrm share/drupal/themes/engines
 @dirrm share/drupal/themes/chameleon/marvin
@@ -181,12 +290,46 @@ share/examples/drupal/settings.php
 @dirrm share/drupal/themes/bluemarine
 @dirrm share/drupal/themes
 @unexec ${RMDIR} %D/share/drupal/sites/default 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/drupal/sites/all 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/drupal/sites 2>/dev/null || ${TRUE}
 @dirrm share/drupal/scripts
+@exec ${MKDIR} %D/share/drupal/profiles/default
+@dirrm share/drupal/profiles/default
+@dirrm share/drupal/profiles
+@dirrm share/drupal/modules/watchdog
+@dirrm share/drupal/modules/user
+@dirrm share/drupal/modules/upload
+@dirrm share/drupal/modules/tracker
+@dirrm share/drupal/modules/throttle
+@dirrm share/drupal/modules/taxonomy
+@dirrm share/drupal/modules/system
+@dirrm share/drupal/modules/statistics
+@dirrm share/drupal/modules/search
+@dirrm share/drupal/modules/profile
+@dirrm share/drupal/modules/poll
+@dirrm share/drupal/modules/ping
+@dirrm share/drupal/modules/path
+@dirrm share/drupal/modules/node
+@dirrm share/drupal/modules/menu
+@dirrm share/drupal/modules/locale
+@dirrm share/drupal/modules/legacy
+@dirrm share/drupal/modules/help
+@dirrm share/drupal/modules/forum
+@dirrm share/drupal/modules/filter
+@dirrm share/drupal/modules/drupal
+@dirrm share/drupal/modules/contact
+@dirrm share/drupal/modules/comment
+@dirrm share/drupal/modules/color/images
+@dirrm share/drupal/modules/color
+@dirrm share/drupal/modules/book
+@dirrm share/drupal/modules/blogapi
+@dirrm share/drupal/modules/blog
+@dirrm share/drupal/modules/block
+@dirrm share/drupal/modules/aggregator
 @dirrm share/drupal/modules
+@dirrm share/drupal/misc/farbtastic
 @dirrm share/drupal/misc
 @dirrm share/drupal/includes
 @unexec ${RMDIR} %D/share/drupal/files 2>/dev/null || ${TRUE}
-@dirrm share/drupal/database
 @unexec ${RMDIR} %D/share/drupal 2>/dev/null || ${TRUE}
-@dirrm share/examples/drupal
+@dirrm share/doc/drupal
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index 2fa92558dbb..2499bd80445 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/01/31 21:54:18 adrianp Exp $
+$NetBSD: distinfo,v 1.15 2007/04/09 19:28:27 adrianp Exp $
 
-SHA1 (drupal-4.7.6.tar.gz) = 250bbc2582165ac27b148f667b8c5aaf82300952
-RMD160 (drupal-4.7.6.tar.gz) = b6540f76221ffbecfb842e0091512aa8ce87d489
-Size (drupal-4.7.6.tar.gz) = 491173 bytes
+SHA1 (drupal-5.1.tar.gz) = 2306dcce888272cdcc7d26101e76d80113f6c0b2
+RMD160 (drupal-5.1.tar.gz) = a335368e9f6c1eb152747efa281bb4b3d66619d6
+Size (drupal-5.1.tar.gz) = 746494 bytes
diff --git a/www/drupal/files/drupal.conf b/www/drupal/files/drupal.conf
index ca0352807ef..d90237d046c 100644
--- a/www/drupal/files/drupal.conf
+++ b/www/drupal/files/drupal.conf
@@ -1,4 +1,4 @@
-# $NetBSD: drupal.conf,v 1.3 2006/07/23 12:03:45 adrianp Exp $
+# $NetBSD: drupal.conf,v 1.4 2007/04/09 19:28:27 adrianp Exp $
 #
 # Drupal configuration file fragment for Apache
 
@@ -12,7 +12,7 @@
     Allow from all
 
     # Protect files and directories from prying eyes.
-    <FilesMatch "(\.(engine|inc|install|module|sh|.*sql|theme|tpl(\.php)?|xtmpl)|code-style\.pl|Entries.*|Repository|Root)$">
+    <FilesMatch "(\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)|code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
       Order deny,allow
       Deny from all
     </FilesMatch>
@@ -51,8 +51,10 @@
       php_value session.auto_start              0
     </IfModule>
 
-    # Reduce the time dynamically generated pages are cache-able.
+    # Requires mod_expires to be enabled.
     <IfModule mod_expires.c>
+      ExpiresActive On
+      ExpiresDefault A1209600
       ExpiresByType text/html A1
     </IfModule>