Update to horde-2.2.4rc1, to fix a security issue.

Changes since 2.2.1:
[mms] SECURITY: Add code to protect against session fixation issues.
[jan] Add Macedonian translation (Stojan Pesov <ssp@eureka.com.mk>).
[mir] Fix a bug that incorrectly quotes pref values (Bug #1224)
[cjh] Fix a bug that prevented logging.
[mms] DB session handlers do not use persistent connections by default.
[mms] Fix parse error in Horde_Cipher_BlockMode_ofb64::.
[mms] Optimization of Secret:: and Horde_Cipher:: drivers.
[jan] Add Catalan translation (Angels Guimerà <angels.Guimera@uab.es>).
[mms] Added a RADIUS Auth:: driver.
[mir] Added a Samba Auth:: driver.
[cjh] Added the Horde_Image:: class.

4 files changed, 44 insertions, 21 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index f13be93a064..c5d45677d96 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 22:55:36 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/08/16 21:08:40 bouyer Exp $
 
-DISTNAME=	horde-2.2.1
+DISTNAME=	horde-2.2.4-RC1
+PKGNAME=	horde-2.2.4rc1
+WRKSRC=		${WRKDIR}/horde-2.2.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
diff --git a/www/horde/PLIST b/www/horde/PLIST
index fbdb3654d25..dff0d31d396 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/17 17:58:13 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/08/16 21:08:40 bouyer Exp $
+
+
 share/horde/config/horde.php.dist
 share/horde/config/html.php.dist
 share/horde/config/lang.php.dist
@@ -77,6 +79,8 @@ share/horde/lib/Auth/imap.php
 share/horde/lib/Auth/krb5.php
 share/horde/lib/Auth/ldap.php
 share/horde/lib/Auth/mcal.php
+share/horde/lib/Auth/radius.php
+share/horde/lib/Auth/smb.php
 share/horde/lib/Auth/sql.php
 share/horde/lib/Browser.php
 share/horde/lib/Cache.php
@@ -98,6 +102,7 @@ share/horde/lib/Group.php
 share/horde/lib/Help.php
 share/horde/lib/Horde.php
 share/horde/lib/Identity.php
+share/horde/lib/Image.php
 share/horde/lib/Lang.php
 share/horde/lib/MIME.php
 share/horde/lib/MIME/Magic.php
@@ -155,6 +160,7 @@ share/horde/lib/VFS/sql_file.php
 share/horde/lib/base.php
 share/horde/lib/version.php
 share/horde/locale/bg_BG/LC_MESSAGES/horde.mo
+share/horde/locale/ca_ES/LC_MESSAGES/horde.mo
 share/horde/locale/cs_CZ/LC_MESSAGES/horde.mo
 share/horde/locale/da_DK/LC_MESSAGES/horde.mo
 share/horde/locale/de_DE/LC_MESSAGES/horde.mo
@@ -171,10 +177,12 @@ share/horde/locale/ja_JP/LC_MESSAGES/horde.mo
 share/horde/locale/ko_KR/LC_MESSAGES/horde.mo
 share/horde/locale/lt_LT/LC_MESSAGES/horde.mo
 share/horde/locale/lv_LV/LC_MESSAGES/horde.mo
+share/horde/locale/mk_MK/LC_MESSAGES/horde.mo
 share/horde/locale/nb_NO/LC_MESSAGES/horde.mo
 share/horde/locale/nl_NL/LC_MESSAGES/horde.mo
 share/horde/locale/nn_NO/LC_MESSAGES/horde.mo
 share/horde/locale/pl_PL/LC_MESSAGES/horde.mo
+share/horde/locale/pl_PL/help.xml
 share/horde/locale/pt_BR/LC_MESSAGES/horde.mo
 share/horde/locale/pt_PT/LC_MESSAGES/horde.mo
 share/horde/locale/ro_RO/LC_MESSAGES/horde.mo
@@ -189,9 +197,11 @@ share/horde/locale/zh_TW/LC_MESSAGES/horde.mo
 share/horde/login.php
 share/horde/maintenance.php
 share/horde/menu.php
+share/horde/navbar.php
 share/horde/po/Makefile
 share/horde/po/README
 share/horde/po/bg_BG.po
+share/horde/po/ca_ES.po
 share/horde/po/cs_CZ.po
 share/horde/po/da_DK.po
 share/horde/po/de_DE.po
@@ -208,6 +218,7 @@ share/horde/po/ja_JP.po
 share/horde/po/ko_KR.po
 share/horde/po/lt_LT.po
 share/horde/po/lv_LV.po
+share/horde/po/mk_MK.po
 share/horde/po/nb_NO.po
 share/horde/po/nl_NL.po
 share/horde/po/nn_NO.po
@@ -241,11 +252,13 @@ share/horde/scripts/db/pgsql_drop.sql
 share/horde/scripts/db/prefs.sql
 share/horde/scripts/db/sessionhandler_sapdb.sql
 share/horde/scripts/db/sessionhandler.sql
+share/horde/scripts/db/vfs.sql
 share/horde/scripts/horde-rsync.sh
 share/horde/scripts/ldap/horde.schema
 share/horde/scripts/mime_mapping/Makefile
 share/horde/scripts/mime_mapping/convert.pl
 share/horde/scripts/mime_mapping/mime.types
+share/horde/scripts/mime_mapping/mime.types.horde
 share/horde/scripts/set_perms.sh
 share/horde/status.php
 share/horde/templates/categorytree/rowend.inc
@@ -273,6 +286,7 @@ share/horde/templates/maintenance/confirm_bottom.inc
 share/horde/templates/maintenance/confirm_middle.inc
 share/horde/templates/maintenance/confirm_top.inc
 share/horde/templates/maintenance/javascript.inc
+share/horde/templates/navbar/menu.inc
 share/horde/templates/prefs/begin.inc
 share/horde/templates/prefs/checkbox.inc
 share/horde/templates/prefs/end.inc
@@ -302,6 +316,7 @@ share/doc/horde/CREDITS
 share/doc/horde/HACKING
 share/doc/horde/INSTALL
 share/doc/horde/TRANSLATIONS
+share/doc/horde/SECURITY
 share/examples/horde/horde.conf
 
 @dirrm share/horde/util
@@ -309,6 +324,7 @@ share/examples/horde/horde.conf
 @dirrm share/horde/templates/wml
 @dirrm share/horde/templates/problem
 @dirrm share/horde/templates/prefs
+@dirrm share/horde/templates/navbar
 @dirrm share/horde/templates/maintenance
 @dirrm share/horde/templates/login
 @dirrm share/horde/templates/javascript
@@ -353,6 +369,8 @@ share/examples/horde/horde.conf
 @dirrm share/horde/locale/nl_NL
 @dirrm share/horde/locale/nb_NO/LC_MESSAGES
 @dirrm share/horde/locale/nb_NO
+@dirrm share/horde/locale/mk_MK/LC_MESSAGES
+@dirrm share/horde/locale/mk_MK
 @dirrm share/horde/locale/lv_LV/LC_MESSAGES
 @dirrm share/horde/locale/lv_LV
 @dirrm share/horde/locale/lt_LT/LC_MESSAGES
@@ -382,6 +400,8 @@ share/examples/horde/horde.conf
 @dirrm share/horde/locale/da_DK
 @dirrm share/horde/locale/cs_CZ/LC_MESSAGES
 @dirrm share/horde/locale/cs_CZ
+@dirrm share/horde/locale/ca_ES/LC_MESSAGES
+@dirrm share/horde/locale/ca_ES
 @dirrm share/horde/locale/bg_BG/LC_MESSAGES
 @dirrm share/horde/locale/bg_BG
 @dirrm share/horde/locale
diff --git a/www/horde/distinfo b/www/horde/distinfo
index ae3d4a1984e..f558c26c4c2 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/03/17 17:58:13 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2003/08/16 21:08:40 bouyer Exp $
 
-SHA1 (horde-2.2.1.tar.gz) = adcfe2c546898a89f8f44a6e512d7cd58db6a560
-Size (horde-2.2.1.tar.gz) = 537836 bytes
-SHA1 (patch-aa) = d61d8c69c3f1cc2bf596a8609b7e0f034179b85c
+SHA1 (horde-2.2.4-RC1.tar.gz) = 5732b81671a07830add3bfbe952c5e2b50f5a5e3
+Size (horde-2.2.4-RC1.tar.gz) = 605427 bytes
+SHA1 (patch-aa) = 1fe41104d78cd1224c831b4521700191c08dc453
diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index 4b98c77b107..c69e6d76087 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,25 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
+$NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
 
---- config/horde.php.dist.orig	Thu Jan 23 09:46:48 2003
-+++ config/horde.php.dist	Mon Mar 17 17:30:44 2003
-@@ -86,14 +86,14 @@
- 
+--- config/horde.php.dist.orig	Mon May 19 17:56:12 2003
++++ config/horde.php.dist	Fri Aug 15 23:36:57 2003
+@@ -94,7 +94,7 @@
  // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp' and 'krb5'.
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp', 'smb',
+ // 'krb5' and 'radius'.
 -$conf['auth']['driver'] = '';
 +$conf['auth']['driver'] = 'imap';
  
  // An array holding any parameters that the Auth object will need to
  // function correctly.
- $conf['auth']['params'] = array();
- 
- // For IMAP, this is the server name, port, protocol, etc.
+@@ -105,7 +105,7 @@
+ // c-client version 2000c or older), 'imap/ssl', or imap/ssl/novalidate-cert
+ // (for a self-signed certificate).  Default ports are 143 for imap and
+ // 993 for imap over ssl.
 -// $conf['auth']['params']['dsn'] = '{imap.example.com:143/imap}INBOX';
 +$conf['auth']['params']['dsn'] = '{localhost:143/imap}INBOX';
  
  // See $conf['prefs']['params'] further down for an example how to
  // setup a SQL backend. But you must use the horde_users SQL table for
-@@ -113,14 +113,14 @@
+@@ -127,14 +127,14 @@
  
  // What log driver should we use? Valid values are 'file', 'mcal',
  // 'sql', and 'syslog'.
@@ -36,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
  
  // What level of messages should we log? The values are LOG_EMERG,
  // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
-@@ -145,7 +145,7 @@
+@@ -159,7 +159,7 @@
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap',
  // and 'sql'.
@@ -45,7 +46,7 @@ $NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
-@@ -154,12 +154,12 @@
+@@ -168,12 +168,12 @@
  // This is an example configuration for a MySQL preference backend.
  // The SQL script to setup the preference database is placed in
  // horde/scripts/db/prefs.sql.
@@ -64,7 +65,7 @@ $NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
  
  // This is an example configuration for an LDAP preference backend.
  // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -208,8 +208,8 @@
+@@ -222,8 +222,8 @@
  // option; SMTP requires at least a server and a port (if nonstandard).
  // SMTP authentication can be enabled by setting the 'auth' parameter
  // to true.
@@ -75,7 +76,7 @@ $NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
  // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
  
  
-@@ -282,10 +282,10 @@
+@@ -298,10 +298,10 @@
  
  // Should we display a problem reporting link in Horde application
  // menus?