update to masquerade-6.x-1.4. Addresses SA-CONTRIB-2010-068 (CSRF).

removing a local patch that is now included in upstream.

Please note some users have reported vage 'issues' with this update,
see http://drupal.org/node/695952 - Make sure you clear your cache and
reset switch back navigation menu item to defaults after this update.

prodded by espie@

www/drupal6/masquerade/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2010/04/19 09:21:10 stephan Exp $
+# $OpenBSD: Makefile,v 1.6 2010/07/12 10:14:51 stephan Exp $
 
 COMMENT =	test site as another user
 CATEGORIES =	devel
 
-DISTNAME =	masquerade-6.x-1.3
-PKGNAME =	drupal6-masquerade-1.3p0
+DISTNAME =	masquerade-6.x-1.4
+PKGNAME =	drupal6-masquerade-1.4
 
 
 .include <bsd.port.mk>

www/drupal6/masquerade/distinfo

@@ -1,5 +1,5 @@
-MD5 (drupal6/masquerade-6.x-1.3.tar.gz) = 4yo6XxhsSz6T4y2TBItpjQ==
-RMD160 (drupal6/masquerade-6.x-1.3.tar.gz) = tQ551R0pPP4mCQdMCP95YEIrUSg=
-SHA1 (drupal6/masquerade-6.x-1.3.tar.gz) = QNfR4tXJjOD3vJvjP/0WFFTxf0I=
-SHA256 (drupal6/masquerade-6.x-1.3.tar.gz) = gRnpFm3KnMe8d5/zHfv416sZ4yZNECwpGyT65QHz61E=
-SIZE (drupal6/masquerade-6.x-1.3.tar.gz) = 12823
+MD5 (drupal6/masquerade-6.x-1.4.tar.gz) = D5pCWIafiIoe4pa3KB/+TQ==
+RMD160 (drupal6/masquerade-6.x-1.4.tar.gz) = 6Oe+05H+I9jnVD+4U7KpWInRM9M=
+SHA1 (drupal6/masquerade-6.x-1.4.tar.gz) = 5b5bX9A7eXZTy6JY26ZUHHo+hSo=
+SHA256 (drupal6/masquerade-6.x-1.4.tar.gz) = KnuLXE7QJmLELLmx5U/1kqVygNhA5rSS9oWGdzfV36Y=
+SIZE (drupal6/masquerade-6.x-1.4.tar.gz) = 14131

www/drupal6/masquerade/patches/patch-masquerade_install

@@ -1,44 +0,0 @@
-$OpenBSD: patch-masquerade_install,v 1.1 2010/04/19 09:21:10 stephan Exp $
---- masquerade.install.orig	Mon Aug 31 19:49:45 2009
-+++ masquerade.install	Mon Apr 19 10:22:38 2010
-@@ -15,18 +15,22 @@
- function masquerade_schema() {
-   return array(
-     'masquerade' => array(
-+      'description' => "Each masquerading user has their session recorded into the masquerade table. Each record represents a masquerading user.",
-       'fields' => array(
-         'sid' => array(
-+          'description' => "The current session for this masquerading user corresponding to their {sessions}.sid.",
-           'type' => 'varchar',
-           'length' => '64',
-           'not null' => TRUE,
-           'default' => ''),
-         'uid_from' => array(
-+          'description' => 'The {users}.uid corresponding to a session.',
-           'type' => 'int',
-           'not null' => TRUE,
-           'default' => 0,
-           'disp-width' => '10'),
-         'uid_as' => array(
-+          'description' => 'The {users}.uid this session is masquerading as.',
-           'type' => 'int',
-           'not null' => TRUE,
-           'default' => 0,
-@@ -38,14 +42,17 @@ function masquerade_schema() {
-       )
-     ),
-     'masquerade_users' => array(
-+      'description' => 'Per-user permission table granting permissions to switch as a specific user.',
-       'fields' => array(
-         'uid_from' => array(
-+          'description' => 'The {users}.uid that can masquerade as {masquerade_users}.uid_to.',
-           'type' => 'int',
-           'not null' => true,
-           'default' => 0,
-           'disp-width' => 10,
-         ),
-         'uid_to' => array(
-+          'description' => 'The {users}.uid that {masquerade_users}.uid_from can masquerade as.',
-           'type' => 'int',
-           'not null' => true,
-           'default' => 0,

www/drupal6/masquerade/pkg/PLIST

@@ -1,7 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/09/20 12:25:45 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/07/12 10:14:51 stephan Exp $
+${DRUPAL_ROOT}/
+${DRUPAL_ROOT}/sites/
+${DRUPAL_ROOT}/sites/all/
 @owner ${DRUPAL_OWNER}
 @group ${DRUPAL_GROUP}
+${DRUPAL_MODS}/
 ${DRUPAL_MODS}masquerade/
+${DRUPAL_MODS}masquerade/.cvsignore
 ${DRUPAL_MODS}masquerade/LICENSE.txt
 ${DRUPAL_MODS}masquerade/README.txt
 ${DRUPAL_MODS}masquerade/masquerade.info