Pullup ticket #3310 - requested by taca

pkgsrc/www/horde security fix

Revisions pulled up:
- pkgsrc/www/horde/Makefile		1.70, 1.71
- pkgsrc/www/horde/PLIST		1.25
- pkgsrc/www/horde/distinfo		1.28, 1.29

-------------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Nov 10 12:46:53 UTC 2010

   Modified Files:
   	pkgsrc/www/horde: Makefile PLIST distinfo

   Log Message:
   Changes 3.3.10:
   * Fix searching DataTree elements (groups) if backend charset is different
     from interface charset
   * Fix accessing IMAP ACLs that contain non-alphanumeric characters
   * Avoid fatal errors when using DateTime with not properly configured PHP 5.3+
   * Fix importing recurrence exceptions from vCalendar 1.0.
   * Fix preferences management regression
   * Fix conversion of all-day events and certain yearly recurring events for
     Funambol clients.
   * Fix memcache cache regression.
   * Fix SyncML page sometimes deleting more anchors than selected.


-------------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Dec 16 03:38:32 UTC 2010

   Modified Files:
   	pkgsrc/www/horde: Makefile distinfo

   Log Message:
   Update horde pacakge to 3.3.11.

   Fixing http://secunia.com/advisories/42355/.

   -------
   v3.3.11
   -------

   [mms] SECURITY: Fix XSS when viewing details of a vCard (Bug #9357).
   [jan] Fix exporting recurrence exceptions to vCalendar 1.0.
   [jan] Skip event status synchronization with Outlook, which is broken.
   [jan] Don't send SIF data to recent Funambol clients, unless requested.
   [jan] Log all queries and errors by the history library.

3 files changed, 125 insertions, 25 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 0d0963aa8ed..9182ce2d662 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2010/09/30 08:17:23 obache Exp $
+# $NetBSD: Makefile,v 1.69.2.1 2010/12/23 10:51:51 sbd Exp $
 
-DISTNAME=	horde-3.3.6
-PKGREVISION=	2
+DISTNAME=	horde-3.3.11
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
@@ -43,7 +42,7 @@ SENDMAIL?=	/usr/sbin/sendmail
 PKG_USERS_VARS+=APACHE_USER
 
 PKG_SYSCONFSUBDIR?=	httpd
-MESSAGE_SUBST+=		HORDEDIR=${HORDEDIR:Q}
+MESSAGE_SUBST+=		HORDEDIR=${HORDEDIR}
 
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*/bin/php
@@ -129,15 +128,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${DOCDIR}
-
-.	for d in ${PAXDIRS}
+.for d in ${PAXDIRS}
 		${INSTALL_DATA_DIR} ${DESTDIR}${HORDEDIR}/${d}
-.	endfor
-
-.	for d in ${PAXDIRS}
+.endfor
+.for d in ${PAXDIRS}
 		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d}
-.	endfor
-
+.endfor
 	cd ${WRKSRC}/config && for f in *.dist; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$${f%.dist}; \
 	done
diff --git a/www/horde/PLIST b/www/horde/PLIST
index f58ff3650cb..ec48e2d6d50 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2010/02/16 16:08:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24.6.1 2010/12/23 10:51:51 sbd Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -337,14 +337,105 @@ 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/Cache/Acl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Acl/Base.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Acl/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Acl/Null.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Combined/Freebusy.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Db.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Db/Acl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Db/Base.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Db/Xacl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/File.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/File/Acl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/File/Pvcal.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/File/Xacl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Partial.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Partial/Freebusy/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Structure.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Structure/Base.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Structure/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Xacl.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Xacl/Base.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Xacl/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Xacl/Configuration.php
+share/horde/lib/Horde/Kolab/FreeBusy/Cache/Xacl/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Exception.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Null.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Backend.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Backend/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined/Decorator/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Fwthree.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Cache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Configuration.php
+share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Decorator/Log.php
 share/horde/lib/Horde/Kolab/FreeBusy/Imap.php
+share/horde/lib/Horde/Kolab/FreeBusy/Logger.php
+share/horde/lib/Horde/Kolab/FreeBusy/Object/Event.php
+share/horde/lib/Horde/Kolab/FreeBusy/Owner.php
+share/horde/lib/Horde/Kolab/FreeBusy/Owner/Event.php
+share/horde/lib/Horde/Kolab/FreeBusy/Owner/Event/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Owner/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Folder.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Owner.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Resource/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Owner.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/User.php
 share/horde/lib/Horde/Kolab/FreeBusy/Report.php
+share/horde/lib/Horde/Kolab/FreeBusy/Request.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Decorator/Mcache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Fwthree.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/User.php
+share/horde/lib/Horde/Kolab/FreeBusy/User/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/User/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/UserDb.php
+share/horde/lib/Horde/Kolab/FreeBusy/UserDb/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/UserDb/User.php
+share/horde/lib/Horde/Kolab/FreeBusy/UserDb/User/Kolab.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/Resource/Availability.php
+share/horde/lib/Horde/Kolab/Resource/Data.php
+share/horde/lib/Horde/Kolab/Resource/Epoch.php
+share/horde/lib/Horde/Kolab/Resource/Exception.php
+share/horde/lib/Horde/Kolab/Resource/Exception/NotBookable.php
+share/horde/lib/Horde/Kolab/Resource/Freebusy.php
+share/horde/lib/Horde/Kolab/Resource/Freebusy/Kolab.php
+share/horde/lib/Horde/Kolab/Resource/Freebusy/Mock.php
+share/horde/lib/Horde/Kolab/Resource/Itip.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Event.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Event/Vevent.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Exception.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Resource.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Resource/Base.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response/Type.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response/Type/Accept.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response/Type/Base.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response/Type/Decline.php
+share/horde/lib/Horde/Kolab/Resource/Itip/Response/Type/Tentative.php
+share/horde/lib/Horde/Kolab/Resource/Lock.php
+share/horde/lib/Horde/Kolab/Resource/Reply.php
+share/horde/lib/Horde/Kolab/Resource/Request.php
+share/horde/lib/Horde/Kolab/Resource/Storage.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
@@ -365,6 +456,15 @@ 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/Namespace.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Config.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Element.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Fixed.php
+share/horde/lib/Horde/Kolab/Storage/Namespace/Imap.php
 share/horde/lib/Horde/Kolab/Storage/Perms.php
 share/horde/lib/Horde/Kolab/Test.php
 share/horde/lib/Horde/Kolab/Test/Filter.php
@@ -702,6 +802,7 @@ share/horde/lib/XML/WBXML/Encoder.php
 share/horde/lib/api.php
 share/horde/lib/base.php
 share/horde/lib/core.php
+share/horde/lib/lib/VFS/kolab.php
 share/horde/lib/prefs.php
 share/horde/lib/tests/webroot.phpt
 share/horde/lib/version.php
@@ -2378,6 +2479,9 @@ share/horde/themes/grey/info.php
 share/horde/themes/grey/screen.css
 share/horde/themes/hi-contrast/info.php
 share/horde/themes/hi-contrast/screen.css
+share/horde/themes/hordeweb/graphics/horde-halfgear-ie.png
+share/horde/themes/hordeweb/graphics/horde-halfgear.png
+share/horde/themes/hordeweb/ie6_or_less.css
 share/horde/themes/hordeweb/info.php
 share/horde/themes/hordeweb/screen.css
 share/horde/themes/ideas/graphics/background.png
@@ -3770,13 +3874,13 @@ share/horde/themes/tango-blue/screen.css
 share/horde/themes/tango-blue/themed_graphics
 share/horde/util/barcode.php
 share/horde/util/icon_browser.php
-@pkgdir share/horde/lib/data
-@pkgdir share/horde/lib/XML/tests
-@pkgdir share/horde/lib/XML/docs/examples
-@pkgdir share/horde/lib/VFS/tests
-@pkgdir share/horde/lib/Text/tests
-@pkgdir share/horde/lib/Text/docs/examples
-@pkgdir share/horde/lib/Horde/tests
-@pkgdir share/horde/lib/Horde/docs/examples
-@pkgdir share/horde/lib/Horde/Text/tests
 @pkgdir share/horde/lib/File/tests
+@pkgdir share/horde/lib/Horde/Text/tests
+@pkgdir share/horde/lib/Horde/docs/examples
+@pkgdir share/horde/lib/Horde/tests
+@pkgdir share/horde/lib/Text/docs/examples
+@pkgdir share/horde/lib/Text/tests
+@pkgdir share/horde/lib/VFS/tests
+@pkgdir share/horde/lib/XML/docs/examples
+@pkgdir share/horde/lib/XML/tests
+@pkgdir share/horde/lib/data
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 4a5e9417898..3206397cf57 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2009/12/20 22:15:13 tonnerre Exp $
+$NetBSD: distinfo,v 1.27.8.1 2010/12/23 10:51:51 sbd Exp $
 
-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 (horde-3.3.11.tar.gz) = 66710a5026d78e462422969b187e78ff52b04e34
+RMD160 (horde-3.3.11.tar.gz) = e5e80e47a564b69e8e5db8648614a4fc6f6e06fd
+Size (horde-3.3.11.tar.gz) = 8788320 bytes
 SHA1 (patch-aa) = 91150235a9739231e5c4da8622f9d48ec26f1115