[pkgsrc/pkgsrc-2008Q3]: pkgsrc/www/drupal6 Pullup ticket #2571 - requested by...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/www/drupal6 Pullup ticket #2571 - requested by...
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:39:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed91f4ab7172
branches:  pkgsrc-2008Q3
changeset: 547870:ed91f4ab7172
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Nov 04 22:16:02 2008 +0000

description:
Pullup ticket #2571 - requested by adrianp
drupal6: security update

www/drupal6/Makefile                            1.7-1.9
www/drupal6/PLIST                               1.2
www/drupal6/distinfo                            1.5-1.6
www/drupal6/options.mk                          1.2
---
Module Name:    pkgsrc
Committed By:   adrianp
Date:           Sun Oct 12 00:34:40 UTC 2008

Modified Files:
        pkgsrc/www/drupal6: Makefile distinfo

Log Message:
This release fixes security vulnerabilities. Sites are urged to upgrade immediately after reading the security announcement:

    * SA-2008-060 - Drupal core - Multiple vulnerabilities

In addition to this security vulnerability, the following bugs have been fixed since the 6.4 release:

* - Patch 246143 by bjaspan, Damien Tournoud: make sure updates are run in numeric order, not in definition order.
* - Patch 221230 by Heine: convert requirement error on update to requirement warning.
* - Patch 252430 by quicksketch: allow base theme prefix in preprocessor function names to correct expected behavior.
* - Patch 245322 by mfb: fixed breadcrumb behavior.
* - Patch 287949 by Freso, Damien Tournoud: keep language icons in consistent order across nodes.
* - Patch 265899 by mfb: uri_brief mail token did not support https URLs.
* - Patch 272952 by NancyDru and chx: fixed documentation issue.
* - Patch 170310 by mfb, JohnAlbin: avoid SSL cookie getting over-written by non-SSL cookie.
* - Patch 243063 by GoofyX: fixed typo in context-sensitve help.
* - Patch 295152 by dww, Damien Tournoud, et al: fixed version comparison.
* - Patch 278759 by douggreen, fletchgqc: improved code comment.
* - Patch 276018 by mfb: extend the lifetime of temporary files.
* - Patch 228576 by sun: too ambiguous stylesheet in dblog.css when form_altering the watchdog table.
* - Patch 285309 by pwolanin: menu_name in hook_menu is ignored on updates.
* - Patch 261859 by rse, Damien Tournoud: make the trigger module work on PostgreSQL.
* - Patch 305436 by Damien Tournoud, lelutin: fixed unclosed <li> tag in the context-sensitive help.

Any many more.  See http://drupal.org/node/318701 for all the details
---
Module Name:    pkgsrc
Committed By:   adrianp
Date:           Thu Oct 23 21:37:23 UTC 2008

Modified Files:
        pkgsrc/www/drupal6: Makefile distinfo

Log Message:
Update to 6.6

The sixth maintenance and security release of the Drupal 6 series. Only
fixes for security vulnerabilities and other bugs have been committed. New
features are only being added to the forthcoming Drupal 7.0 release.

This release fixes security vulnerabilities. Sites are urged to upgrade
immediately after reading the security announcement:

* SA-2008-067 - Drupal core - Multiple vulnerabilities

In addition to this security vulnerability, the following bugs have been
fixed since the 6.5 release:

- Patch #315656 by Damien Tournoud: fixed bug in drupal_lookup_path('wipe').
#318102 by Dave Reid: hook_exit() was not invoked for some cached requests.
#277206 by Damien Tournoud, lilou, fp: untranslatable string in the installer
- Patch #324080 by winterheart: missing </td>-tag.

See http://drupal.org/node/324832 for all the details
---
Module Name:    pkgsrc
Committed By:   adrianp
Date:           Fri Oct 24 18:52:32 UTC 2008

Modified Files:
        pkgsrc/www/drupal6: Makefile PLIST options.mk

Log Message:
Fix PLIST issues when using binary packages - spotted by martti@
After some feedback from Roy Marples set up the package so it's easier
 to get drupal to run under other web servers than apache.  As the
 default web server, apache will remain.  Users can disable it using
 the options.mk framework.
Rename APACHE_* variables to WWW_* and set some sane defaults.

diffstat:

 www/drupal6/Makefile   |  23 +++++++++++------------
 www/drupal6/PLIST      |   6 +++---
 www/drupal6/distinfo   |   8 ++++----
 www/drupal6/options.mk |  19 ++++++++++++++++---
 4 files changed, 34 insertions(+), 22 deletions(-)

diffs (154 lines):

diff -r c96b979abab3 -r ed91f4ab7172 www/drupal6/Makefile
--- a/www/drupal6/Makefile      Tue Nov 04 12:47:17 2008 +0000
+++ b/www/drupal6/Makefile      Tue Nov 04 22:16:02 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2008/08/15 15:54:30 taca Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2008/11/04 22:16:02 tron Exp $
 
-DISTNAME=      drupal-6.4
+DISTNAME=      drupal-6.6
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://drupal.org/files/projects/
 
@@ -10,7 +11,6 @@
 
 CONFLICTS+=    drupal-5.*{,nb*}
 
-DEPENDS+=      ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.5:../../www/ap-php
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd
 
 NO_BUILD=      YES
@@ -20,17 +20,17 @@
                INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \
                MAINTAINERS.txt UPGRADE.txt
 
-PKG_GROUPS_VARS+=      APACHE_GROUP
-PKG_USERS_VARS+=       APACHE_USER
+PKG_GROUPS_VARS+=      WWW_GROUP
+PKG_USERS_VARS+=       WWW_USER
 
-BUILD_DEFS+=           APACHE_USER APACHE_GROUP
+BUILD_DEFS+=           WWW_USER WWW_GROUP
 USE_TOOLS+=            perl:run pax
 REPLACE_PERL=          scripts/code-style.pl
 
 OWN_DIRS_PERMS+=       ${DRUPAL}/sites/default \
-                       ${APACHE_USER} ${APACHE_GROUP} 0750
+                       ${WWW_USER} ${WWW_GROUP} 0750
 OWN_DIRS_PERMS+=       ${DRUPAL}/files \
-                       ${APACHE_USER} ${APACHE_GROUP} 0750
+                       ${WWW_USER} ${WWW_GROUP} 0750
 
 CONF_FILES=    ${PREFIX}/share/examples/drupal/drupal.conf \
                ${PKG_SYSCONFDIR}/drupal.conf
@@ -39,7 +39,7 @@
 
 CONF_FILES_PERMS+=     ${PREFIX}/share/examples/drupal/default.settings.php \
                        ${DRUPAL}/sites/default/default.settings.php \
-                       ${APACHE_USER} ${APACHE_GROUP} 0640
+                       ${WWW_USER} ${WWW_GROUP} 0640
 
 SUBST_CLASSES+=                conf
 SUBST_STAGE.conf=      pre-install
@@ -48,7 +48,6 @@
 SUBST_SED.conf+=       -e "s|/usr/bin/php|${PREFIX}/bin/php|g"
 SUBST_MESSAGE.conf=    Fixing configuration files.
 
-.include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
 
 .if ${PKG_PHP_VERSION} == "4"
@@ -87,14 +86,14 @@
        ${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
 
 .      for i in ${PAX_DIRS}
-               cd ${WRKSRC}/${i} && pax -rw . ${DRUPAL}/${i}
+               cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i}
 .      endfor
 
 .      for i in ${DOCS}
                ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/drupal
 .      endfor
 
-       ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DRUPAL}/files
+       ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${DRUPAL}/files
        ${CHMOD} 0770 ${DRUPAL}/files
 
 post-install:
diff -r c96b979abab3 -r ed91f4ab7172 www/drupal6/PLIST
--- a/www/drupal6/PLIST Tue Nov 04 12:47:17 2008 +0000
+++ b/www/drupal6/PLIST Tue Nov 04 22:16:02 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.8.1 2008/11/04 22:16:02 tron Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/COPYRIGHT.txt
 share/doc/drupal/INSTALL.mysql.txt
@@ -475,8 +475,6 @@
 @dirrm share/drupal/themes/chameleon
 @dirrm share/drupal/themes/bluemarine
 @dirrm share/drupal/themes
-@dirrm share/drupal/sites/all
-@dirrm share/drupal/sites
 @dirrm share/drupal/scripts
 @dirrm share/drupal/modules/user
 @dirrm share/drupal/modules/upload
@@ -517,6 +515,8 @@
 @dirrm share/drupal/misc
 @dirrm share/drupal/includes
 @exec ${MKDIR} %D/share/drupal/files
+@unexec ${RMDIR} %D/share/drupal/sites/all 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/drupal/sites 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/drupal/files 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/drupal 2>/dev/null || ${TRUE}
 @dirrm share/doc/drupal
diff -r c96b979abab3 -r ed91f4ab7172 www/drupal6/distinfo
--- a/www/drupal6/distinfo      Tue Nov 04 12:47:17 2008 +0000
+++ b/www/drupal6/distinfo      Tue Nov 04 22:16:02 2008 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/08/15 15:54:30 taca Exp $
+$NetBSD: distinfo,v 1.4.4.1 2008/11/04 22:16:02 tron Exp $
 
-SHA1 (drupal-6.4.tar.gz) = a8c5e9680f394281f53e584f88fe29a3c9cedfd7
-RMD160 (drupal-6.4.tar.gz) = 07075e994bc904075d0d9991b640160c7ca26301
-Size (drupal-6.4.tar.gz) = 1068473 bytes
+SHA1 (drupal-6.6.tar.gz) = 08c12b590508d2050e3c2be0faf48b98a964ea45
+RMD160 (drupal-6.6.tar.gz) = 8f98af416745fe26592bf02d8b7c61718ec6dd6b
+Size (drupal-6.6.tar.gz) = 1071507 bytes
diff -r c96b979abab3 -r ed91f4ab7172 www/drupal6/options.mk
--- a/www/drupal6/options.mk    Tue Nov 04 12:47:17 2008 +0000
+++ b/www/drupal6/options.mk    Tue Nov 04 22:16:02 2008 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+# $NetBSD: options.mk,v 1.1.1.1.8.1 2008/11/04 22:16:02 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.drupal
 
 PKG_OPTIONS_REQUIRED_GROUPS=   db
 PKG_OPTIONS_GROUP.db=          mysql pgsql
 
-PKG_SUPPORTED_OPTIONS= drupal-xmlservices
-PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices
+PKG_SUPPORTED_OPTIONS= drupal-xmlservices apache
+PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices apache
 
 .include "../../mk/bsd.options.mk"
 
@@ -35,3 +35,16 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
 .      endif
 .endif
+
+###
+### Drupal can run on a number of web servers, we support apache by default
+###
+.if !empty(PKG_OPTIONS:Mapache)
+DEPENDS+=      ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.5:../../www/ap-php
+.      include "../../mk/apachever.mk"
+WWW_USER?=     ${APACHE_USER}
+WWW_GROUP?=    ${APACHE_GROUP}
+.else
+WWW_USER?=     ${ROOT_USER}
+WWW_GROUP?=    ${ROOT_GROUP}
+.endif
Prev by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc Pullup ticket #2559.
Next by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/print/acroread8 Pullup ticket #2577 - requeste...
Previous by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc Pullup ticket #2559.
Next by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/print/acroread8 Pullup ticket #2577 - requeste...
Indexes:
Home | Main Index | Thread Index | Old Index