security fixes in core.

allows jquery_update to work more generally (I had broken it slightly)

www/drupal5/core/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2008/08/19 23:44:48 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2008/10/25 14:20:34 espie Exp $
 
 COMMENT =	powerful content management system
  
-DISTNAME =	drupal-5.10
+DISTNAME =	drupal-5.12
 PKGNAME=	${DISTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 

www/drupal5/core/distinfo

@@ -1,5 +1,5 @@
-MD5 (drupal5/drupal-5.10.tar.gz) = gZqRTpfeSNKyqKtpVdASFQ==
-RMD160 (drupal5/drupal-5.10.tar.gz) = 1CTlmq2R5+apXBAbC9yYwZrjpoY=
-SHA1 (drupal5/drupal-5.10.tar.gz) = DHItdWCOJQOf/uRIpFByGrod5ko=
-SHA256 (drupal5/drupal-5.10.tar.gz) = ceRN+cu8WKTxFrCJyCyo8Dy9KTPkBy3KnKCwrD38B1c=
-SIZE (drupal5/drupal-5.10.tar.gz) = 762496
+MD5 (drupal5/drupal-5.12.tar.gz) = wHGB5CiU3BRDhZj3dy30NA==
+RMD160 (drupal5/drupal-5.12.tar.gz) = 9B4TFXNVo06af6cHd+X/ceUchjo=
+SHA1 (drupal5/drupal-5.12.tar.gz) = QhBXNun653lujTOKzML0igcOVn4=
+SHA256 (drupal5/drupal-5.12.tar.gz) = btLrXY8Xc5cPbajveHRMSz+TLrdePcOtM2Vap8wb9Mg=
+SIZE (drupal5/drupal-5.12.tar.gz) = 764327

www/drupal5/core/patches/patch-includes_common_inc

@@ -1,19 +1,22 @@
-$OpenBSD: patch-includes_common_inc,v 1.2 2008/07/26 10:34:01 espie Exp $
+$OpenBSD: patch-includes_common_inc,v 1.3 2008/10/25 14:20:34 espie Exp $
 --- includes/common.inc.orig	Wed Jul  9 21:34:30 2008
-+++ includes/common.inc	Sat Jul 26 12:28:35 2008
-@@ -1618,7 +1618,14 @@ function drupal_clear_css_cache() {
++++ includes/common.inc	Sat Oct 25 16:15:27 2008
+@@ -1618,8 +1618,17 @@ function drupal_clear_css_cache() {
   */
  function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer = FALSE, $cache = TRUE) {
    if (!is_null($data)) {
 -    _drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
 +    if (module_exists('jquery_update')) {
 +      $path = drupal_get_path('module', 'jquery_update');
-+      _drupal_add_js($path .'/jquery.js', 'core', 'header', FALSE, $cache);
-+      _drupal_add_js($path .'/compat-1.0.js', 'core', 'header', FALSE, $cache);
-+      _drupal_add_js($path .'/collapse-fix.js', 'theme', 'header', FALSE, $cache);
++      _drupal_add_js($path .'/misc/jquery.js', 'core', 'header', FALSE, $cache);
 +    } else {
 +      _drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
 +    }
      _drupal_add_js('misc/drupal.js', 'core', 'header', FALSE, $cache);
++    $altname = $path.'/'.$data;
++    if (file_exists($altname)) {
++      return _drupal_add_js($altname, $type, $scope, $defer, $cache);
++    }
    }
    return _drupal_add_js($data, $type, $scope, $defer, $cache);
+ }

www/drupal5/core/patches/patch-modules_user_user_module

@@ -1,6 +1,6 @@
-$OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
---- modules/user/user.module.orig	Thu Aug 14 01:59:09 2008
-+++ modules/user/user.module	Thu Aug 14 11:29:23 2008
+$OpenBSD: patch-modules_user_user_module,v 1.4 2008/10/25 14:20:34 espie Exp $
+--- modules/user/user.module.orig	Wed Oct  8 22:10:26 2008
++++ modules/user/user.module	Mon Oct 13 19:32:24 2008
 @@ -321,27 +321,7 @@ function user_validate_picture($file, &$edit, $user) {
   * Generate a random alphanumeric password.
   */
@@ -30,7 +30,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
  }
  
  /**
-@@ -1268,9 +1248,12 @@ function user_register_submit($form_id, $form_values) 
+@@ -1285,9 +1265,12 @@ function user_register_submit($form_id, $form_values) 
      return 'user/1/edit';
    }
    else {
@@ -45,7 +45,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
      else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
        // No e-mail verification is required, create new user account, and login user immediately.
        $subject = _user_mail_text('welcome_subject', $variables);
-@@ -1344,6 +1327,7 @@ function user_edit_form($uid, $edit, $register = FALSE
+@@ -1361,6 +1344,7 @@ function user_edit_form($uid, $edit, $register = FALSE
        '#description' => t('Provide a password for the new account in both fields.'),
        '#required' => TRUE,
        '#size' => 25,
@@ -53,7 +53,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
      );
    }
    if ($admin) {
-@@ -1823,6 +1807,10 @@ function user_admin_perm($rid = NULL) {
+@@ -1840,6 +1824,10 @@ function user_admin_perm($rid = NULL) {
    while ($role = db_fetch_object($result)) {
      $role_names[$role->rid] = $role->name;
    }
@@ -64,7 +64,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
  
    // Render role/permission overview:
    $options = array();
-@@ -1862,7 +1850,12 @@ function theme_user_admin_perm($form) {
+@@ -1879,7 +1867,12 @@ function theme_user_admin_perm($form) {
        $row = array();
        // Module name
        if (is_numeric($key)) {

www/drupal5/jquery_update/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2008/08/19 23:45:30 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2008/10/25 14:20:34 espie Exp $
 
 COMMENT =	newer jquery, required by other modules
 
 DISTNAME = 	jquery_update-5.x-2.0
-PKGNAME =	drupal5-jquery-update-2.0
+PKGNAME =	drupal5-jquery-update-2.0p0
 
 RUN_DEPENDS =	:drupal->=5.7p1:www/drupal5/core
 
-post-extract:
-	rm ${WRKDIST}/jquery_update.module
-	touch ${WRKDIST}/jquery_update.module
+pre-patch:
+	rm ${WRKDIST}/jquery_update.install
 
 .include <bsd.port.mk>

www/drupal5/jquery_update/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/08/19 23:45:30 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/10/25 14:20:34 espie Exp $
 @owner ${DRUPAL_OWNER}
 @group ${DRUPAL_GROUP}
 ${DRUPAL_MODS}/jquery_update/
@@ -8,7 +8,6 @@ ${DRUPAL_MODS}/jquery_update/README.txt
 @comment ${DRUPAL_MODS}/jquery_update/README.txt.orig
 ${DRUPAL_MODS}/jquery_update/compat.js
 ${DRUPAL_MODS}/jquery_update/jquery_update.info
-${DRUPAL_MODS}/jquery_update/jquery_update.install
 ${DRUPAL_MODS}/jquery_update/jquery_update.module
 ${DRUPAL_MODS}/jquery_update/misc/
 ${DRUPAL_MODS}/jquery_update/misc/collapse.js