From ab14a17d91ccf33c2c47d5e0b90064cb354bfa4b Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 23 Oct 2009 10:18:35 +0000
Subject: [PATCH] minor security update, adjust my patches

---
 www/drupal6/webform/Makefile                  |  6 ++--
 www/drupal6/webform/distinfo                  | 10 +++---
 .../webform/patches/patch-webform_module      | 32 +++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/www/drupal6/webform/Makefile b/www/drupal6/webform/Makefile
index c795f195904..02a843f5b41 100644
--- a/www/drupal6/webform/Makefile
+++ b/www/drupal6/webform/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2009/10/10 10:48:17 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2009/10/23 10:18:35 espie Exp $
 
 COMMENT =	webform
 
-DISTNAME = 	webform-6.x-2.7
-PKGNAME =	drupal6-webform-2.7p1
+DISTNAME = 	webform-6.x-2.8
+PKGNAME =	drupal6-webform-2.8
 
 .include <bsd.port.mk>
diff --git a/www/drupal6/webform/distinfo b/www/drupal6/webform/distinfo
index 76acec2d032..3d668e79e89 100644
--- a/www/drupal6/webform/distinfo
+++ b/www/drupal6/webform/distinfo
@@ -1,5 +1,5 @@
-MD5 (drupal6/webform-6.x-2.7.tar.gz) = e9FjTsHkrCOTy9p/ovxu7A==
-RMD160 (drupal6/webform-6.x-2.7.tar.gz) = CGMWaQPuVnvtJkbiFRCg4rDYQH4=
-SHA1 (drupal6/webform-6.x-2.7.tar.gz) = D77kjxjubSwBlEizYan2XJ8iI0Y=
-SHA256 (drupal6/webform-6.x-2.7.tar.gz) = xICMI3dEN4D1PYKMa32K3bJ3e0ywGdXif08LWlNQjvQ=
-SIZE (drupal6/webform-6.x-2.7.tar.gz) = 254954
+MD5 (drupal6/webform-6.x-2.8.tar.gz) = yQgwah7w7m2SlPeHd3WxdQ==
+RMD160 (drupal6/webform-6.x-2.8.tar.gz) = YLjfAf5ddqgQgrDRSq1Tp4ev3JM=
+SHA1 (drupal6/webform-6.x-2.8.tar.gz) = w3uipP/H1lYjLKQdk79mZUJhSMw=
+SHA256 (drupal6/webform-6.x-2.8.tar.gz) = vdP32oCu/3Mk996i7Hrwkp3Dvk5lvDc4LxudKXdQwmw=
+SIZE (drupal6/webform-6.x-2.8.tar.gz) = 265930
diff --git a/www/drupal6/webform/patches/patch-webform_module b/www/drupal6/webform/patches/patch-webform_module
index 560f39a2a56..7e7c1ab8029 100644
--- a/www/drupal6/webform/patches/patch-webform_module
+++ b/www/drupal6/webform/patches/patch-webform_module
@@ -1,6 +1,6 @@
-$OpenBSD: patch-webform_module,v 1.2 2009/10/10 10:48:17 espie Exp $
---- webform.module.orig	Fri Feb 27 23:35:15 2009
-+++ webform.module	Sat Oct 10 12:32:16 2009
+$OpenBSD: patch-webform_module,v 1.3 2009/10/23 10:18:35 espie Exp $
+--- webform.module.orig	Thu Oct 15 03:26:46 2009
++++ webform.module	Fri Oct 23 12:17:56 2009
 @@ -249,6 +249,17 @@ function webform_menu() {
      'weight' => 2,
      'type' => MENU_LOCAL_TASK,
@@ -19,22 +19,22 @@ $OpenBSD: patch-webform_module,v 1.2 2009/10/10 10:48:17 espie Exp $
  
    return $items;
  }
-@@ -2099,6 +2110,7 @@ function theme_webform_mail_headers($form_values, $nod
+@@ -2117,6 +2128,7 @@ function theme_webform_mail_headers($form_values, $nod
   */
- function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE) {
+ function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE, $allow_anonymous = FALSE) {
    global $user;
 +  global $webform_uid_cached;
+   static $replacements;
  
    // Setup default token replacements.
-   $find = array('%site', '%date');
-@@ -2123,8 +2135,9 @@ function _webform_filter_values($string, $node = NULL,
-   $find[] = '%useremail';
-   $replace[] = isset($user->name) ? $user->name : '';
-   $replace[] = isset($user->mail) ? $user->mail : '';
--  if ($user->uid && module_exists('profile')) {
-+  if ($user->uid && module_exists('profile') && $webform_uid_cached != $user->uid) {
-     profile_load_profile($user);
-+    $webform_uid_cached = $user->uid;
-   }
+@@ -2157,8 +2169,9 @@ function _webform_filter_values($string, $node = NULL,
+     $replacements['unsafe']['%username'] = isset($user->name) ? $user->name : '';
+     $replacements['unsafe']['%useremail'] = isset($user->mail) ? $user->mail : '';
+     $replacements['unsafe']['%ip_address'] = ip_address();
+-    if ($user->uid && module_exists('profile')) {
++    if ($user->uid && module_exists('profile') && $webform_uid_cached != $user->uid) {
+       profile_load_profile($user);
++      $webform_uid_cached = $user->uid;
+     }
+     $special_tokens['unsafe']['%profile'] = $user;
  
-   // Provide a list of candidates for token replacement.