Pullup ticket 1747 - requested by adrianp

security update for horde

Revisions pulled up:
- pkgsrc/www/horde/Makefile			1.46
- pkgsrc/www/horde/PLIST			1.12
- pkgsrc/www/horde/distinfo			1.15
- pkgsrc/www/horde/patches/patch-ab		removed
- pkgsrc/www/horde/patches/patch-ac		removed

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Thu Jul 13 20:41:52 UTC 2006

   Modified Files:
   	pkgsrc/www/horde: PLIST distinfo
   Removed Files:
   	pkgsrc/www/horde/patches: patch-ab patch-ac

   Log Message:
   Update to 3.1.2
   Major changes compared to Horde 3.1.1 are:

   * Security Fixes
   - Closed XSS problems in dereferrer (IE only), help viewer and problem
     reporting screen.
   - Removed unused image proxy code from dereferrer.

   * Bugfixes and improvements
   - Added configuration option to disable GET-based sessions.
   - Added Oracle and generic SQL upgrade scripts.
   - Improved default charset support.
   - Improved API and RPC interface.
   - Fixed the preference cache.

   The full list of changes (from version 3.1.1) can be viewed here:
   http://cvs.horde.org/diff.php/horde/docs/CHANGES?r1=1.515.2.231&r2=1.515.2.252&ty=h
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Thu Jul 13 20:42:21 UTC 2006

   Modified Files:
   	pkgsrc/www/horde: Makefile

   Log Message:
   Update Makefile missed in 3.1.2 update

5 files changed, 16 insertions, 84 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index b4274dfabe6..5f81dd29f97 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2006/06/16 09:23:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.45.2.1 2006/07/23 14:46:05 salo Exp $
 
-DISTNAME=	horde-3.1.1
-PKGREVISION=	2
+DISTNAME=	horde-3.1.2
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
@@ -97,7 +96,6 @@ SUBST_MESSAGE.files=	Fixing configuration files.
 
 do-build:
 	${RM} ${WRKSRC}/lib/Horde/Auth/login.php.orig
-	${RM} ${WRKSRC}/templates/problem/problem.inc.orig
 	${CP} ${FILESDIR}/horde.conf.dist ${WRKSRC}/horde.conf.dist
 	${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
 	${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
@@ -118,7 +116,7 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		@cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${HORDEDIR}/${d}
+		cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${HORDEDIR}/${d}
 .	endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${HORDEDIR}/config
diff --git a/www/horde/PLIST b/www/horde/PLIST
index 46663c7f92f..be56137cf35 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/06/16 09:23:21 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2006/07/23 14:46:05 salo Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -48,6 +48,7 @@ share/horde/js/alphaImageLoader.php
 share/horde/js/enter_key_trap.js
 share/horde/js/form_assign.js
 share/horde/js/form_helpers.js
+share/horde/js/form_sections.js
 share/horde/js/hideable.js
 share/horde/js/horde.ie.js
 share/horde/js/horde.js
@@ -281,18 +282,6 @@ share/horde/lib/Horde/Prefs/kolab.php
 share/horde/lib/Horde/Prefs/ldap.php
 share/horde/lib/Horde/Prefs/session.php
 share/horde/lib/Horde/Prefs/sql.php
-share/horde/lib/Horde/RDO.php
-share/horde/lib/Horde/RDO/Criteria.php
-share/horde/lib/Horde/RDO/Exception.php
-share/horde/lib/Horde/RDO/Mapper.php
-share/horde/lib/Horde/RDO/MetaData.php
-share/horde/lib/Horde/RDO/Results.php
-share/horde/lib/Horde/RDO/Storage.php
-share/horde/lib/Horde/RDO/Storage/mysql.php
-share/horde/lib/Horde/RDO/Storage/peardb.php
-share/horde/lib/Horde/RDO/Storage/pgsql.php
-share/horde/lib/Horde/RDO/Storage/sql.php
-share/horde/lib/Horde/RDO/Storage/sqlite.php
 share/horde/lib/Horde/RPC.php
 share/horde/lib/Horde/RPC/rest.php
 share/horde/lib/Horde/RPC/soap.php
@@ -300,7 +289,6 @@ share/horde/lib/Horde/RPC/syncml.php
 share/horde/lib/Horde/RPC/syncml_wbxml.php
 share/horde/lib/Horde/RPC/webdav.php
 share/horde/lib/Horde/RPC/xmlrpc.php
-share/horde/lib/Horde/Rampage.php
 share/horde/lib/Horde/Registry.php
 share/horde/lib/Horde/SQL.php
 share/horde/lib/Horde/SQL/Attributes.php
@@ -312,7 +300,7 @@ share/horde/lib/Horde/Serialize.php
 share/horde/lib/Horde/SessionHandler.php
 share/horde/lib/Horde/SessionHandler/dbm.php
 share/horde/lib/Horde/SessionHandler/ldap.php
-share/horde/lib/Horde/SessionHandler/memcached.php
+share/horde/lib/Horde/SessionHandler/memcache.php
 share/horde/lib/Horde/SessionHandler/mysql.php
 share/horde/lib/Horde/SessionHandler/none.php
 share/horde/lib/Horde/SessionHandler/oci8.php
@@ -584,7 +572,9 @@ share/horde/scripts/sql/create.msde.sql
 share/horde/scripts/sql/create.mysql.sql
 share/horde/scripts/sql/create.oci8.sql
 share/horde/scripts/sql/create.pgsql.sql
+share/horde/scripts/sql/create.sql
 share/horde/scripts/sql/create.sybase.sql
+share/horde/scripts/sql/create.xml
 share/horde/scripts/sql/horde_datatree.mssql.sql
 share/horde/scripts/sql/horde_datatree.mysql.sql
 share/horde/scripts/sql/horde_datatree.sql
@@ -612,9 +602,13 @@ share/horde/scripts/sql/script.initial_horde_user.sql
 share/horde/scripts/temp-cleanup.cron
 share/horde/scripts/themes_check.php
 share/horde/scripts/upgrades/2.2_to_3.0.mysql.sql
+share/horde/scripts/upgrades/2.2_to_3.0.oci8.sql
 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/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/move_history_out_of_datatree.php
 share/horde/services/cacheview.php
 share/horde/services/changepassword.php
@@ -721,7 +715,6 @@ share/horde/services/prefs.php
 share/horde/services/problem.php
 share/horde/services/resetpassword.php
 share/horde/services/shares/edit.php
-share/horde/services/toggle_js.php
 share/horde/signup.php
 share/horde/templates/admin/common-header.inc
 share/horde/templates/admin/groups/addchild.inc
@@ -753,7 +746,6 @@ share/horde/templates/help/about.inc
 share/horde/templates/help/index.inc
 share/horde/templates/help/menu.inc
 share/horde/templates/index/frames_index.inc
-share/horde/templates/javascript/form_sections.js
 share/horde/templates/javascript/htmlarea.js
 share/horde/templates/javascript/htmlarea_anselimage_lang.js
 share/horde/templates/javascript/htmlarea_context_lang.js
@@ -766,7 +758,6 @@ share/horde/templates/javascript/open_google_win.js
 share/horde/templates/javascript/open_html_helper.js
 share/horde/templates/javascript/print.js
 share/horde/templates/javascript/quoteBlocks.js
-share/horde/templates/javascript/test_javascript.js
 share/horde/templates/javascript/tree.js
 share/horde/templates/login/login.inc
 share/horde/templates/login/mobile.inc
@@ -1672,8 +1663,6 @@ share/horde/util/regex_test.php
 @dirrm share/horde/lib/Horde/Scheduler
 @dirrm share/horde/lib/Horde/SQL
 @dirrm share/horde/lib/Horde/RPC
-@dirrm share/horde/lib/Horde/RDO/Storage
-@dirrm share/horde/lib/Horde/RDO
 @dirrm share/horde/lib/Horde/Prefs
 @dirrm share/horde/lib/Horde/Perms
 @dirrm share/horde/lib/Horde/Notification/Listener
diff --git a/www/horde/distinfo b/www/horde/distinfo
index c4348b37fc7..4d041c32778 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.14 2006/06/16 09:23:21 adrianp Exp $
+$NetBSD: distinfo,v 1.14.2.1 2006/07/23 14:46:05 salo Exp $
 
-SHA1 (horde-3.1.1.tar.gz) = 8735a11bc42f5aae7b70a555763d239614e4aca5
-RMD160 (horde-3.1.1.tar.gz) = bb98dbc34caa3410382dcf34afba20e257c62a8d
-Size (horde-3.1.1.tar.gz) = 5068434 bytes
+SHA1 (horde-3.1.2.tar.gz) = db1ff36d3c1f54f8a1d67059a5cae86c53582cc8
+RMD160 (horde-3.1.2.tar.gz) = f37d8d4d21d46c6fc4c7284a60c20c9f10f459aa
+Size (horde-3.1.2.tar.gz) = 5176353 bytes
 SHA1 (patch-aa) = 9edb110586805d5efd84541b9d3821889967e785
-SHA1 (patch-ab) = 3d248b02c59abb26e548f93b532fd1657fbb640d
-SHA1 (patch-ac) = da4ed065b39a30d459dfb9e1f00e38246ff3ab8f
diff --git a/www/horde/patches/patch-ab b/www/horde/patches/patch-ab
deleted file mode 100644
index aab309a74d5..00000000000
--- a/www/horde/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/06/16 09:23:21 adrianp Exp $
-
---- test.php.orig	2006-06-14 09:30:57.000000000 +0100
-+++ test.php
-@@ -250,12 +250,12 @@ if (!empty($_GET['mode'])) {
-         exit;
- 
-     case 'phpinfo':
--        echo '<a href="' . $url . '?mode=test">&lt;&lt; Back to test.php</a>';
-+        echo '<a href="' . htmlspecialchars($url) . '?mode=test">&lt;&lt; Back to test.php</a>';
-         phpinfo();
-         exit;
- 
-     case 'filetest':
--        echo '<a href="' . $url . '?mode=test">&lt;&lt; Back to test.php</a>';
-+        echo '<a href="' . htmlspecialchars($url) . '?mode=test">&lt;&lt; Back to test.php</a>';
-         ?>
-         <html>
-         <body bgcolor="white" text="black">
diff --git a/www/horde/patches/patch-ac b/www/horde/patches/patch-ac
deleted file mode 100644
index 00026b16c8d..00000000000
--- a/www/horde/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/06/16 09:23:21 adrianp Exp $
-
---- templates/problem/problem.inc.orig	2005-10-18 12:34:09.000000000 +0100
-+++ templates/problem/problem.inc
-@@ -31,17 +31,17 @@ function validate()
- 
- <tr>
-     <td class="light rightAlign"><?php echo _("Your Name") ?></td>
--    <td><input type="text" tabindex="1" name="name" value="<?php echo $name ?>" size="70" /></td>
-+    <td><input type="text" tabindex="1" name="name" value="<?php echo htmlspecialchars($name) ?>" size="70" /></td>
- </tr>
- 
- <tr>
-     <td class="light rightAlign"><?php echo _("Your Email Address") ?></td>
--    <td><input type="text" tabindex="2" name="email" value="<?php echo $email ?>" size="70" /></td>
-+    <td><input type="text" tabindex="2" name="email" value="<?php echo htmlspecialchars($email) ?>" size="70" /></td>
- </tr>
- 
- <tr>
-     <td class="light rightAlign"><?php echo _("Short Summary") ?></td>
--    <td><input type="text" tabindex="3" name="subject" value="<?php echo $subject ?>" size="70" /></td>
-+    <td><input type="text" tabindex="3" name="subject" value="<?php echo htmlspecialchars($subject) ?>" size="70" /></td>
- </tr>
- 
- <tr>
-@@ -49,7 +49,7 @@ function validate()
- </tr>
- <tr>
-     <td></td>
--    <td><textarea tabindex="4" name="message" rows="20" cols="80" wrap="hard"><?php echo $message ?></textarea></td>
-+    <td><textarea tabindex="4" name="message" rows="20" cols="80" wrap="hard"><?php echo htmlspecialchars($message) ?></textarea></td>
- </tr>
- 
- <tr>