Upgrade to 3.3.2:

------
v3.3.2
------

[mms] Fix prototypejs regression on IE (Bug #6590).


------
v3.3.1
------

[cjh] SECURITY: Add another check to the XSS filter.
[jan] Add script to import preferences from SquirrelMail database.
[cjh] Allow the password file Auth driver to require a specific group.
[cjh] Use YYYY-MM-DDTHH:MM:SS for Alarm date queries (Bug #7580).
[jan] Add XPath wrapper to Horde_DOM library.
[cjh] Don't use executeMultiple in the SQL Share driver when we might
      reset the connection in between queries (Bug #7542).
[jan] Fix database XML schema to create all lock table fields (Bug #7433).
[jan] Fix showing two sidebars after saving the display preference group for
      the first time (Bug #7475).
[jan] Fix sharing with LDAP groups (Bug #6883).
[jan] Add javascript event handler for access keys.
[cjh] Remove UNSIGNED from PostgreSQL scripts.
[cjh] Call preference hooks in the scope of the preference
      (vlukashov (at) parallels (dot) com, Bug #7445).
[jan] Fix resuming synchronization session on server farms
      (adrieder@sbox.tugraz.at, Bug #7394).
[jan] Fix synchronization of tasks with many items (adrieder@sbox.tugraz.at,
      Bug #7395).
[mms] Upgrade prototype.js to v1.6.0.3.
[jwm] Fix regression: SOAP wsdl/disco shouldn't require authorization.

3 files changed, 27 insertions, 14 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 32d3924a16e..dbb7d22698b 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2008/10/12 12:00:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.60 2008/12/15 23:05:14 adrianp Exp $
 
-DISTNAME=	horde-3.3
+DISTNAME=	horde-3.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
@@ -54,7 +54,9 @@ REPLACE_FILES.php=	po/translation.php \
 			scripts/alarms.php \
 			scripts/import_squirrelmail_prefs.php \
 			scripts/upgrades/convert_datatree_groups_to_sql.php \
-			scripts/upgrades/convert_datatree_perms_to_sql.php
+			scripts/upgrades/convert_datatree_perms_to_sql.php \
+			scripts/import_squirrelmail_file_prefs.php \
+			scripts/import_squirrelmail_sql_prefs.php
 
 CONF_FILES+=		${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
 CONF_FILES_PERMS+=	${HORDEDIR}/config/conf.php.dist \
diff --git a/www/horde/PLIST b/www/horde/PLIST
index 3b34b71876c..96081735b6c 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/10/12 12:00:52 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/12/15 23:05:14 adrianp Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -45,6 +45,7 @@ share/horde/config/prefs.php.dist
 share/horde/config/registry.php.dist
 share/horde/index.php
 share/horde/js/QuickFinder.js
+share/horde/js/accesskeys.js
 share/horde/js/addEvent.php
 share/horde/js/colorpicker.js
 share/horde/js/controls.js
@@ -73,6 +74,7 @@ share/horde/js/sidebar.js
 share/horde/js/slider.js
 share/horde/js/sorter.js
 share/horde/js/src/QuickFinder.js
+share/horde/js/src/accesskeys.js
 share/horde/js/src/colorpicker.js
 share/horde/js/src/controls.js
 share/horde/js/src/dhtmlHistory.js
@@ -307,6 +309,16 @@ share/horde/lib/Horde/Image/svg.php
 share/horde/lib/Horde/Image/swf.php
 share/horde/lib/Horde/Kolab.php
 share/horde/lib/Horde/Kolab/Deprecated.php
+share/horde/lib/Horde/Kolab/IMAP.php
+share/horde/lib/Horde/Kolab/IMAP/cclient.php
+share/horde/lib/Horde/Kolab/IMAP/pear.php
+share/horde/lib/Horde/Kolab/IMAP/test.php
+share/horde/lib/Horde/Kolab/Server/Object/adminrole.php
+share/horde/lib/Horde/Kolab/Server/Object/distlist.php
+share/horde/lib/Horde/Kolab/Session.php
+share/horde/lib/Horde/Kolab/Test.php
+share/horde/lib/Horde/Kolab/Test/Server.php
+share/horde/lib/Horde/Kolab/Test/Storage.php
 share/horde/lib/Horde/Kolab/Format.php
 share/horde/lib/Horde/Kolab/Format/Date.php
 share/horde/lib/Horde/Kolab/Format/XML.php
@@ -333,13 +345,8 @@ share/horde/lib/Horde/Kolab/Storage.php
 share/horde/lib/Horde/Kolab/Storage/Cache.php
 share/horde/lib/Horde/Kolab/Storage/Data.php
 share/horde/lib/Horde/Kolab/Storage/Folder.php
-share/horde/lib/Horde/Kolab/Storage/IMAP.php
-share/horde/lib/Horde/Kolab/Storage/IMAP/cclient.php
-share/horde/lib/Horde/Kolab/Storage/IMAP/pear.php
-share/horde/lib/Horde/Kolab/Storage/IMAP/test.php
 share/horde/lib/Horde/Kolab/Storage/List.php
 share/horde/lib/Horde/Kolab/Storage/Perms.php
-share/horde/lib/Horde/Kolab/Storage/Session.php
 share/horde/lib/Horde/LDAP.php
 share/horde/lib/Horde/Lens.php
 share/horde/lib/Horde/Lens/Interface.php
@@ -801,6 +808,8 @@ share/horde/scripts/get_login.php
 share/horde/scripts/horde.logrotate
 share/horde/scripts/http_login_refer.php
 share/horde/scripts/import_squirrelmail_prefs.php
+share/horde/scripts/import_squirrelmail_file_prefs.php
+share/horde/scripts/import_squirrelmail_sql_prefs.php
 share/horde/scripts/ldap/horde.prefs.acl
 share/horde/scripts/ldap/horde.schema
 share/horde/scripts/set_perms.sh
@@ -1587,6 +1596,7 @@ share/horde/templates/javascript/open_calendar.js
 share/horde/templates/javascript/open_html_helper.js
 share/horde/templates/javascript/print.js
 share/horde/templates/javascript/tree.js
+share/horde/templates/login/header.inc
 share/horde/templates/login/login.inc
 share/horde/templates/login/mobile.inc
 share/horde/templates/maintenance/maintenance.html
@@ -4124,12 +4134,13 @@ share/horde/util/icon_browser.php
 @dirrm share/horde/lib/Horde/Log
 @dirrm share/horde/lib/Horde/Lock
 @dirrm share/horde/lib/Horde/Lens
-@dirrm share/horde/lib/Horde/Kolab/Storage/IMAP
 @dirrm share/horde/lib/Horde/Kolab/Storage
 @dirrm share/horde/lib/Horde/Kolab/Server/Object
 @dirrm share/horde/lib/Horde/Kolab/Server
 @dirrm share/horde/lib/Horde/Kolab/Format/XML
 @dirrm share/horde/lib/Horde/Kolab/Format
+@dirrm share/horde/lib/Horde/Kolab/IMAP
+@dirrm share/horde/lib/Horde/Kolab/Test
 @dirrm share/horde/lib/Horde/Kolab
 @dirrm share/horde/lib/Horde/Image/Effect/im
 @dirrm share/horde/lib/Horde/Image/Effect/gd
diff --git a/www/horde/distinfo b/www/horde/distinfo
index daf408b1b7c..392f8dd3b5f 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2008/10/12 12:00:53 adrianp Exp $
+$NetBSD: distinfo,v 1.25 2008/12/15 23:05:14 adrianp Exp $
 
-SHA1 (horde-3.3.tar.gz) = 6ed165d0488dd5ce0648b3228c41eb83e7d57bcb
-RMD160 (horde-3.3.tar.gz) = fd3aed1351346b5c9c95bd70abf489d896bc1514
-Size (horde-3.3.tar.gz) = 8468714 bytes
+SHA1 (horde-3.3.2.tar.gz) = fe74b5c0c70f646f56b2f0aa83cead8d792b295b
+RMD160 (horde-3.3.2.tar.gz) = c90778f7966df203c334f4e80fc12160553965ec
+Size (horde-3.3.2.tar.gz) = 8462747 bytes
 SHA1 (patch-aa) = 91150235a9739231e5c4da8622f9d48ec26f1115