Update to 2.3.1

------
v2.3.1
------

[jan] SECURITY: Escape output in test.php.
[jan] Add script to import contacts from SquirrelMail database.
[gwr] Correct support for the freebusy URL in Kolab.
[gwr] Add photo support for the Kolab driver.
[jan] Import broken vCards from Synthesis clients (Bug #7407).
[cjh] Add two retries to find a contact after adding it (Bug #7478).
[cjh] Add a PostgreSQL-specific upgrade script for 2.2.1 to 2.3
      (michael.menge@zdv.uni-tuebingen.de, Bug #7462).
[jan] Don't overwrite empty address books preference when creating new shares
      (Bug #7399).
[mms] Upgrade prototype.js to v1.6.0.3.

3 files changed, 15 insertions, 10 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index dfb4ac15872..c5e487c51f5 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/10/12 12:06:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.32 2008/12/15 23:19:35 adrianp Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -20,7 +20,7 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.3
+TURBAVER=	2.3.1
 PAXDIRS=	lib locale po scripts templates themes js
 USE_TOOLS+=	pax perl:run
 
@@ -46,7 +46,9 @@ REPLACE_FILES.php=	scripts/import_vcards.php \
 			scripts/upgrades/create_default_histories.php \
 			scripts/upgrades/public_to_horde_share.php \
 			scripts/import_squirrelmail_abook.php \
-			scripts/upgrades/2.1_to_2.2_sql_schema.php
+			scripts/upgrades/2.1_to_2.2_sql_schema.php \
+			scripts/import_squirrelmail_file_abook.php \
+			scripts/import_squirrelmail_sql_abook.php
 
 CONF_FILES=		${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
 CONF_FILES_PERMS+=	${TURBADIR}/config/sources.php.dist \
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index c41dc45af47..ac0e80aa692 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/10/12 12:06:52 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/12/15 23:19:35 adrianp Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -75,13 +75,14 @@ share/horde/turba/lib/tests/ApiTest.php
 share/horde/turba/lib/tests/BrowsePageTest.php
 share/horde/turba/lib/tests/DriverTest.php
 share/horde/turba/lib/tests/GroupTest.php
+share/horde/turba/lib/tests/KolabTest.php
+share/horde/turba/lib/tests/KolabTestBase.php
 share/horde/turba/lib/tests/ListTest.php
 share/horde/turba/lib/tests/ListViewTest.php
 share/horde/turba/lib/tests/TestBase.php
 share/horde/turba/lib/tests/ViewBrowseTest.php
 share/horde/turba/lib/tests/az.png
 share/horde/turba/lib/tests/bug_6518.phpt
-share/horde/turba/lib/tests/bug5476.phpt
 share/horde/turba/lib/tests/import.ldif
 share/horde/turba/lib/tests/importCRLF.ldif
 share/horde/turba/lib/tests/ldif_exportFile.phpt
@@ -180,7 +181,8 @@ share/horde/turba/po/uk_UA.po
 share/horde/turba/po/zh_CN.po
 share/horde/turba/po/zh_TW.po
 share/horde/turba/scripts/Turba.reg
-share/horde/turba/scripts/import_squirrelmail_abook.php
+share/horde/turba/scripts/import_squirrelmail_file_abook.php
+share/horde/turba/scripts/import_squirrelmail_sql_abook.php
 share/horde/turba/scripts/import_vcards.php
 share/horde/turba/scripts/ldap/addou
 share/horde/turba/scripts/ldap/addou.pl
@@ -201,6 +203,7 @@ share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_sql_schema.php
 share/horde/turba/scripts/upgrades/2.2.1_to_2.3.sql
+share/horde/turba/scripts/upgrades/2.2.1_to_2.3.pgsql.sql
 share/horde/turba/scripts/upgrades/2007-06-17_flatten_shares.php
 share/horde/turba/scripts/upgrades/2008-09-23_fix_group_uid.sql
 share/horde/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 3751ba0f85c..8fb87b7828c 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2008/10/12 12:06:52 adrianp Exp $
+$NetBSD: distinfo,v 1.15 2008/12/15 23:19:35 adrianp Exp $
 
-SHA1 (turba-h3-2.3.tar.gz) = 1efe5d975f22bf71db9ef7550a5231dbcccc5017
-RMD160 (turba-h3-2.3.tar.gz) = 177b7868c0d39b2c250e3b9d6d5115172838851b
-Size (turba-h3-2.3.tar.gz) = 2354452 bytes
+SHA1 (turba-h3-2.3.1.tar.gz) = dc40c389575e405f071828586c1772c4bc27cd04
+RMD160 (turba-h3-2.3.1.tar.gz) = 315e896ebbceefe6a87eafcc26eac020a36380be
+Size (turba-h3-2.3.1.tar.gz) = 2363301 bytes