Update horde to version 3.3.6 in order to fix a cross-site scripting

vulnerability.

Changes since version 3.3.3 are not found on the web site for some
reason (while changes before 3.3.3 are).

3 files changed, 62 insertions, 20 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index f13cc9d028e..178f992ef79 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2009/07/17 18:00:26 adrianp Exp $
+# $NetBSD: Makefile,v 1.64 2009/12/20 22:15:13 tonnerre Exp $
 
-DISTNAME=	horde-3.3.3
+DISTNAME=	horde-3.3.6
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
diff --git a/www/horde/PLIST b/www/horde/PLIST
index ba7a2fd010f..915b123863c 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 22:00:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/12/20 22:15:13 tonnerre Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -33,15 +33,24 @@ share/horde/admin/setup/config.php
 share/horde/admin/setup/diff.php
 share/horde/admin/setup/index.php
 share/horde/admin/setup/scripts.php
+share/horde/admin/signup_confirm.php
 share/horde/admin/sqlshell.php
 share/horde/admin/user.php
+share/horde/config/conf.php
 share/horde/config/conf.php.dist
+share/horde/config/conf.xml
 share/horde/config/conf.xml.dist
+share/horde/config/hooks.php
 share/horde/config/hooks.php.dist
+share/horde/config/mime_drivers.php
 share/horde/config/mime_drivers.php.dist
+share/horde/config/motd.php
 share/horde/config/motd.php.dist
+share/horde/config/nls.php
 share/horde/config/nls.php.dist
+share/horde/config/prefs.php
 share/horde/config/prefs.php.dist
+share/horde/config/registry.php
 share/horde/config/registry.php.dist
 share/horde/index.php
 share/horde/js/QuickFinder.js
@@ -309,16 +318,20 @@ 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/Filter/Base.php
+share/horde/lib/Horde/Kolab/Filter/Content.php
+share/horde/lib/Horde/Kolab/Filter/Incoming.php
+share/horde/lib/Horde/Kolab/Filter/Outlook.php
+share/horde/lib/Horde/Kolab/Filter/Response.php
+share/horde/lib/Horde/Kolab/Filter/Transport.php
+share/horde/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php
+share/horde/lib/Horde/Kolab/Filter/Transport/LMTPTLS.php
+share/horde/lib/Horde/Kolab/Filter/Transport/drop.php
+share/horde/lib/Horde/Kolab/Filter/Transport/echo.php
+share/horde/lib/Horde/Kolab/Filter/Transport/lda.php
+share/horde/lib/Horde/Kolab/Filter/Transport/lmtp.php
+share/horde/lib/Horde/Kolab/Filter/Transport/smtp.php
+share/horde/lib/Horde/Kolab/Filter/Transport/stdout.php
 share/horde/lib/Horde/Kolab/Format.php
 share/horde/lib/Horde/Kolab/Format/Date.php
 share/horde/lib/Horde/Kolab/Format/XML.php
@@ -329,10 +342,23 @@ share/horde/lib/Horde/Kolab/Format/XML/event.php
 share/horde/lib/Horde/Kolab/Format/XML/hprefs.php
 share/horde/lib/Horde/Kolab/Format/XML/note.php
 share/horde/lib/Horde/Kolab/Format/XML/task.php
+share/horde/lib/Horde/Kolab/FreeBusy.php
+share/horde/lib/Horde/Kolab/FreeBusy/Access.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Imap.php
+share/horde/lib/Horde/Kolab/FreeBusy/Report.php
+share/horde/lib/Horde/Kolab/FreeBusy/View.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/Resource.php
 share/horde/lib/Horde/Kolab/Server.php
 share/horde/lib/Horde/Kolab/Server/Object.php
 share/horde/lib/Horde/Kolab/Server/Object/address.php
 share/horde/lib/Horde/Kolab/Server/Object/administrator.php
+share/horde/lib/Horde/Kolab/Server/Object/adminrole.php
+share/horde/lib/Horde/Kolab/Server/Object/distlist.php
 share/horde/lib/Horde/Kolab/Server/Object/domainmaintainer.php
 share/horde/lib/Horde/Kolab/Server/Object/group.php
 share/horde/lib/Horde/Kolab/Server/Object/maintainer.php
@@ -341,12 +367,18 @@ share/horde/lib/Horde/Kolab/Server/Object/sharedfolder.php
 share/horde/lib/Horde/Kolab/Server/Object/user.php
 share/horde/lib/Horde/Kolab/Server/ldap.php
 share/horde/lib/Horde/Kolab/Server/test.php
+share/horde/lib/Horde/Kolab/Session.php
 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/List.php
 share/horde/lib/Horde/Kolab/Storage/Perms.php
+share/horde/lib/Horde/Kolab/Test.php
+share/horde/lib/Horde/Kolab/Test/Filter.php
+share/horde/lib/Horde/Kolab/Test/FreeBusy.php
+share/horde/lib/Horde/Kolab/Test/Server.php
+share/horde/lib/Horde/Kolab/Test/Storage.php
 share/horde/lib/Horde/LDAP.php
 share/horde/lib/Horde/Lens.php
 share/horde/lib/Horde/Lens/Interface.php
@@ -710,6 +742,8 @@ share/horde/locale/fr_FR/LC_MESSAGES/horde.mo
 share/horde/locale/fr_FR/help.xml
 share/horde/locale/gl_ES/LC_MESSAGES/horde.mo
 share/horde/locale/he_IL/LC_MESSAGES/horde.mo
+share/horde/locale/hr_HR/LC_MESSAGES/horde.mo
+share/horde/locale/hr_HR/help.xml
 share/horde/locale/hu_HU/LC_MESSAGES/horde.mo
 share/horde/locale/hu_HU/help.xml
 share/horde/locale/id_ID/LC_MESSAGES/horde.mo
@@ -773,6 +807,7 @@ share/horde/po/fr_FR.po
 share/horde/po/gl_ES.po
 share/horde/po/he_IL.po
 share/horde/po/horde.pot
+share/horde/po/hr_HR.po
 share/horde/po/hu_HU.po
 share/horde/po/id_ID.po
 share/horde/po/is_IS.po
@@ -807,15 +842,15 @@ share/horde/scripts/cookie_login.php
 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_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
 share/horde/scripts/sql/README
 share/horde/scripts/sql/README.OCI8
-share/horde/scripts/sql/create.msde.sql
+share/horde/scripts/sql/create.mssql.sql
 share/horde/scripts/sql/create.mysql.sql
 share/horde/scripts/sql/create.oci8.sql
 share/horde/scripts/sql/create.pgsql.sql
@@ -872,15 +907,17 @@ share/horde/scripts/upgrades/2.2_to_3.0.pgsql.sql
 share/horde/scripts/upgrades/2005-09-22_horde_prefs_varchar2.oci8.sql
 share/horde/scripts/upgrades/2006-06-29_horde_prefs_indexes.sql
 share/horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.php
+share/horde/scripts/upgrades/2009-02-13_horde_sessionhandler_lastmodified_index.sql
 share/horde/scripts/upgrades/3.0_to_3.1.mysql.sql
 share/horde/scripts/upgrades/3.0_to_3.1.oci8.sql
 share/horde/scripts/upgrades/3.0_to_3.1.sql
-share/horde/scripts/upgrades/3.1_to_3.2.msde.sql
+share/horde/scripts/upgrades/3.1_to_3.2.mssql.sql
 share/horde/scripts/upgrades/3.1_to_3.2.mysql.sql
 share/horde/scripts/upgrades/3.1_to_3.2.oci8.sql
 share/horde/scripts/upgrades/3.1_to_3.2.pgsql.sql
 share/horde/scripts/upgrades/3.1_to_3.2.sql
 share/horde/scripts/upgrades/3.1_to_3.2.sybase.sql
+share/horde/scripts/upgrades/3.3_to_3.3.5.sql
 share/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
 share/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
 share/horde/scripts/upgrades/migrate_user_categories.php
@@ -1400,6 +1437,7 @@ share/horde/services/editor/xinha/lang/th.js
 share/horde/services/editor/xinha/lang/vn.js
 share/horde/services/editor/xinha/license.txt
 share/horde/services/editor/xinha/modules/ColorPicker/ColorPicker.js
+share/horde/services/editor/xinha/modules/ColorPicker/lang/da.js
 share/horde/services/editor/xinha/modules/ColorPicker/lang/pt_br.js
 share/horde/services/editor/xinha/modules/ColorPicker/src/ColorPicker.js
 share/horde/services/editor/xinha/modules/CreateLink/link.html
@@ -1414,6 +1452,7 @@ share/horde/services/editor/xinha/modules/Dialogs/src/inline-dialog.js
 share/horde/services/editor/xinha/modules/Dialogs/src/panel-dialog.js
 share/horde/services/editor/xinha/modules/Dialogs/src/popupwin.js
 share/horde/services/editor/xinha/modules/FullScreen/full-screen.js
+share/horde/services/editor/xinha/modules/FullScreen/lang/da.js
 share/horde/services/editor/xinha/modules/FullScreen/lang/de.js
 share/horde/services/editor/xinha/modules/FullScreen/lang/fr.js
 share/horde/services/editor/xinha/modules/FullScreen/lang/ja.js
@@ -1450,6 +1489,7 @@ share/horde/services/editor/xinha/plugins/AnselImage/src/ansel-image.js
 share/horde/services/editor/xinha/plugins/CharacterMap/CharacterMap.css
 share/horde/services/editor/xinha/plugins/CharacterMap/character-map.js
 share/horde/services/editor/xinha/plugins/CharacterMap/img/ed_charmap.gif
+share/horde/services/editor/xinha/plugins/CharacterMap/lang/da.js
 share/horde/services/editor/xinha/plugins/CharacterMap/lang/de.js
 share/horde/services/editor/xinha/plugins/CharacterMap/lang/fr.js
 share/horde/services/editor/xinha/plugins/CharacterMap/lang/it.js
@@ -1462,6 +1502,7 @@ share/horde/services/editor/xinha/plugins/CharacterMap/lang/sv.js
 share/horde/services/editor/xinha/plugins/CharacterMap/popups/select_character.html
 share/horde/services/editor/xinha/plugins/CharacterMap/src/character-map.js
 share/horde/services/editor/xinha/plugins/ContextMenu/context-menu.js
+share/horde/services/editor/xinha/plugins/ContextMenu/lang/da.js
 share/horde/services/editor/xinha/plugins/ContextMenu/lang/de.js
 share/horde/services/editor/xinha/plugins/ContextMenu/lang/el.js
 share/horde/services/editor/xinha/plugins/ContextMenu/lang/fr.js
@@ -1484,6 +1525,7 @@ share/horde/services/editor/xinha/plugins/ListType/img/none.png
 share/horde/services/editor/xinha/plugins/ListType/img/square.png
 share/horde/services/editor/xinha/plugins/ListType/img/upper-alpha.png
 share/horde/services/editor/xinha/plugins/ListType/img/upper-roman.png
+share/horde/services/editor/xinha/plugins/ListType/lang/da.js
 share/horde/services/editor/xinha/plugins/ListType/lang/de.js
 share/horde/services/editor/xinha/plugins/ListType/lang/fr.js
 share/horde/services/editor/xinha/plugins/ListType/lang/ja.js
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 11245f947df..4a5e9417898 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2009/01/30 22:22:26 adrianp Exp $
+$NetBSD: distinfo,v 1.27 2009/12/20 22:15:13 tonnerre Exp $
 
-SHA1 (horde-3.3.3.tar.gz) = 99bd377bf04a5fd7ed7e8dd9a453ca87c74a5e2c
-RMD160 (horde-3.3.3.tar.gz) = eb1d88b8583dc993e66eed41a446e55789af6a17
-Size (horde-3.3.3.tar.gz) = 8472775 bytes
+SHA1 (horde-3.3.6.tar.gz) = d23d651ddc95fae2d10b7a3363a4745aded83083
+RMD160 (horde-3.3.6.tar.gz) = 098aed42a397577e743ac5372ef22b2cbb31a601
+Size (horde-3.3.6.tar.gz) = 8776361 bytes
 SHA1 (patch-aa) = 91150235a9739231e5c4da8622f9d48ec26f1115