diff options
author | taca <taca> | 2009-12-19 09:29:22 +0000 |
---|---|---|
committer | taca <taca> | 2009-12-19 09:29:22 +0000 |
commit | 82d43f51c81bde085c54a575e72b20aca196e12a (patch) | |
tree | 3421617a7cab929e696c4a3d5cb5cbde9fe98792 /www/drupal6 | |
parent | cbec87d15e99568d66c3712c963d347dabefca76 (diff) | |
download | pkgsrc-82d43f51c81bde085c54a575e72b20aca196e12a.tar.gz |
Update www/drupal6 package to 6.15, fixing security problem.
Drupal 6.15, 2009-12-16
----------------------
- Fixed security issues (Cross site scripting), see SA-CORE-2009-009.
- Fixed a variety of other bugs.
other pkgsrc changes:
* Add PKG_DESTDIR_SUPPORT spport.
* Use REPLACE_INTERPRETER.
* Change default.settings.php handling to fix PR pkg/42355.
Diffstat (limited to 'www/drupal6')
-rw-r--r-- | www/drupal6/Makefile | 74 | ||||
-rw-r--r-- | www/drupal6/PLIST | 4 | ||||
-rw-r--r-- | www/drupal6/distinfo | 8 | ||||
-rw-r--r-- | www/drupal6/files/drupal.conf | 6 |
4 files changed, 43 insertions, 49 deletions
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index d7cd1d57678..0c81af670e3 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2009/09/29 13:41:00 taca Exp $ +# $NetBSD: Makefile,v 1.18 2009/12/19 09:29:22 taca Exp $ -DISTNAME= drupal-6.14 +DISTNAME= drupal-6.15 CATEGORIES= www MASTER_SITES= http://drupal.org/files/projects/ @@ -14,7 +14,7 @@ CONFLICTS+= drupal-5.*{,nb*} DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd NO_BUILD= YES -DRUPAL= ${PREFIX}/share/drupal +DRUPAL= share/drupal PAX_DIRS= includes misc modules scripts themes DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \ INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \ @@ -32,22 +32,29 @@ OWN_DIRS_PERMS+= ${DRUPAL}/sites/default \ OWN_DIRS_PERMS+= ${DRUPAL}/files \ ${WWW_USER} ${WWW_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= share/examples/drupal/drupal.conf \ + ${PKG_SYSCONFDIR}/drupal.conf \ + share/examples/drupal/default.profile \ + ${DRUPAL}/profiles/default/default.profile \ + share/examples/drupal/default.settings.php \ + ${DRUPAL}/sites/default/default.settings.php -CONF_FILES_PERMS+= ${PREFIX}/share/examples/drupal/default.settings.php \ - ${DRUPAL}/sites/default/settings.php \ - ${WWW_USER} ${WWW_GROUP} 0640 +REPLACE_INTERPRETER+= php +REPLACE.php.old= .*php[^ ]* +REPLACE.php.new= ${PREFIX}/bin/php +REPLACE_FILES.php= scripts/drupal.sh SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install -SUBST_FILES.conf= drupal.conf scripts/drupal.sh +SUBST_FILES.conf= drupal.conf SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" -SUBST_SED.conf+= -e "s|/usr/bin/php|${PREFIX}/bin/php|g" +SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" SUBST_MESSAGE.conf= Fixing configuration files. +INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \ + share/doc/drupal share/examples/drupal +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../lang/php/phpversion.mk" .if ${PKG_PHP_VERSION} == "4" @@ -68,38 +75,25 @@ post-extract: ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} do-install: - ${INSTALL_DATA_DIR} ${DRUPAL} - ${INSTALL_DATA_DIR} ${DRUPAL}/files - ${INSTALL_DATA_DIR} ${DRUPAL}/sites - ${INSTALL_DATA_DIR} ${DRUPAL}/sites/all - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/drupal - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/drupal - - ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DRUPAL} - ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt ${DRUPAL}/sites/all + ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL} + ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \ + ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all ${INSTALL_DATA} ${WRKSRC}/drupal.conf \ - ${PREFIX}/share/examples/drupal/drupal.conf - ${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \ - ${PREFIX}/share/examples/drupal/default.settings.php + ${DESTDIR}${PREFIX}/share/examples/drupal ${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \ - ${PREFIX}/share/examples/drupal/settings.php + ${DESTDIR}${PREFIX}/share/examples/drupal ${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \ - ${PREFIX}/share/examples/drupal/default.profile - ${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL} - -. for i in ${PAX_DIRS} - cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i} -. endfor - -. for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/drupal -. endfor - - ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${DRUPAL}/files - ${CHMOD} 0770 ${DRUPAL}/files + ${DESTDIR}${PREFIX}/share/examples/drupal + ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/${DRUPAL} +.for i in ${PAX_DIRS} + cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${DRUPAL}/${i} +.endfor +.for i in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/drupal +.endfor post-install: - ${FIND} ${DRUPAL} -name \*.jpg | ${XARGS} ${CHMOD} 0644 - ${FIND} ${DRUPAL} -name \*.png | ${XARGS} ${CHMOD} 0644 + ${FIND} ${DESTDIR}${PREFIX}/${DRUPAL} \ + \( -name '*.jpg' -o -name '*.png' \) | ${XARGS} ${CHMOD} 0644 .include "../../mk/bsd.pkg.mk" diff --git a/www/drupal6/PLIST b/www/drupal6/PLIST index 5cb89db5146..46063b3eb0d 100644 --- a/www/drupal6/PLIST +++ b/www/drupal6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:20 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/12/19 09:29:22 taca Exp $ share/doc/drupal/CHANGELOG.txt share/doc/drupal/COPYRIGHT.txt share/doc/drupal/INSTALL.mysql.txt @@ -460,7 +460,7 @@ share/drupal/themes/pushbutton/tabs-option-on.png share/drupal/update.php share/drupal/xmlrpc.php share/examples/drupal/default.profile -share/examples/drupal/settings.php share/examples/drupal/default.settings.php share/examples/drupal/drupal.conf @pkgdir share/drupal/files +@pkgdir share/drupal diff --git a/www/drupal6/distinfo b/www/drupal6/distinfo index 75269219710..a0e5ac17d90 100644 --- a/www/drupal6/distinfo +++ b/www/drupal6/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2009/09/29 13:41:00 taca Exp $ +$NetBSD: distinfo,v 1.14 2009/12/19 09:29:22 taca Exp $ -SHA1 (drupal-6.14.tar.gz) = 25d4249e91bb04041e3185be8bf79785f9d91811 -RMD160 (drupal-6.14.tar.gz) = c4ae3a65556bae115e7ab003450b68e3f544f2ca -Size (drupal-6.14.tar.gz) = 1082687 bytes +SHA1 (drupal-6.15.tar.gz) = 5be5ebf85c9ffa33e71c5a0f05d1308d3af19ab8 +RMD160 (drupal-6.15.tar.gz) = 146709dd487fa6a0d1cb39d1a79c7f7519f73643 +Size (drupal-6.15.tar.gz) = 1085634 bytes diff --git a/www/drupal6/files/drupal.conf b/www/drupal6/files/drupal.conf index 5e7357eeb1f..5b4afa577e2 100644 --- a/www/drupal6/files/drupal.conf +++ b/www/drupal6/files/drupal.conf @@ -1,4 +1,4 @@ -# $NetBSD: drupal.conf,v 1.2 2009/02/16 20:55:54 adrianp Exp $ +# $NetBSD: drupal.conf,v 1.3 2009/12/19 09:29:23 taca Exp $ # # Drupal configuration file fragment for Apache @@ -7,10 +7,10 @@ # <IfModule mod_alias.c> - Alias /drupal/ "@DRUPAL@/" + Alias /drupal/ "@PREFIX@/@DRUPAL@/" </IfModule> -<Directory "@DRUPAL@"> +<Directory "@PREFIX@/@DRUPAL@"> AllowOverride Limit Options FileInfo Order allow,deny Allow from all |