Changes 4.3.9:

* Fix error if user's account only contains an INBOX

Changes 4.3.8:
* SECURITY: Properly escape user input in Fetchmail configuration.
* Fix updating POP3 indices when using mailbox caching
* Include "anyone" user when listing users in the ACL screen
* Turn DNS prefetching off when displaying untrusted message content

Changes 4.3.7:
* Fix spellcheck-on-send when using fckeditor and no errors exist
* Fix authenticate API call and synchronization when using realms
* Optimize folder tree initialization
* Add command line fetchmail script
* Workaround broken PHP number formatting with some locales

3 files changed, 21 insertions, 19 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 6a2ff2f76a0..5cc008b7c1d 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2009/07/17 18:00:16 adrianp Exp $
+# $NetBSD: Makefile,v 1.55 2010/11/10 12:48:31 adam Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -26,15 +26,15 @@ DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
 HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
-IMPVER=		4.3.4
+IMPVER=		4.3.9
 PAXDIRS=	lib locale po scripts templates themes js
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 PKG_USERS_VARS+=	APACHE_USER
 BUILD_DEFS+=		APACHE_USER
 
-MESSAGE_SUBST+=	IMPDIR=${IMPDIR:Q}
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR?=	httpd
 
@@ -94,15 +94,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}${IMPDIR}/${d}
-.	endfor
-
-.	for d in ${PAXDIRS}
+.endfor
+.for d in ${PAXDIRS}
 		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${IMPDIR}/${d}
-.	endfor
-
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${IMPDIR}/config
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${IMPDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${IMPDIR}
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index 8244080d871..929e0442b1e 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 20:45:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/11/10 12:48:31 adam Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
@@ -164,8 +164,8 @@ share/horde/imp/lib/UI/Message.php
 share/horde/imp/lib/api.php
 share/horde/imp/lib/base.php
 share/horde/imp/lib/prefs.php
-share/horde/imp/lib/tests/mime_viewer_html.phpt
 share/horde/imp/lib/tests/fixtures/maildirsize
+share/horde/imp/lib/tests/mime_viewer_html.phpt
 share/horde/imp/lib/tests/quota_maildir.phpt
 share/horde/imp/lib/version.php
 share/horde/imp/locale/ar_OM/LC_MESSAGES/imp.mo
@@ -197,6 +197,8 @@ share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
 share/horde/imp/locale/fr_FR/help.xml
 share/horde/imp/locale/gl_ES/LC_MESSAGES/imp.mo
 share/horde/imp/locale/he_IL/LC_MESSAGES/imp.mo
+share/horde/imp/locale/hr_HR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/hr_HR/help.xml
 share/horde/imp/locale/hu_HU/LC_MESSAGES/imp.mo
 share/horde/imp/locale/hu_HU/help.xml
 share/horde/imp/locale/id_ID/LC_MESSAGES/imp.mo
@@ -260,6 +262,7 @@ share/horde/imp/po/fi_FI.po
 share/horde/imp/po/fr_FR.po
 share/horde/imp/po/gl_ES.po
 share/horde/imp/po/he_IL.po
+share/horde/imp/po/hr_HR.po
 share/horde/imp/po/hu_HU.po
 share/horde/imp/po/id_ID.po
 share/horde/imp/po/imp.pot
@@ -293,6 +296,8 @@ share/horde/imp/saveimage.php
 share/horde/imp/scripts/Imp.reg
 share/horde/imp/scripts/bounce_spam.php
 share/horde/imp/scripts/custom_login.php
+share/horde/imp/scripts/fetch.php
+share/horde/imp/scripts/sql/imp.oci8.sql
 share/horde/imp/scripts/sql/imp.sql
 share/horde/imp/scripts/sql/imp.xml
 share/horde/imp/scripts/upgrades/convert_vfolders.php
@@ -413,8 +418,8 @@ share/horde/imp/themes/graphics/mime/encryption.png
 share/horde/imp/themes/graphics/mime/html.png
 share/horde/imp/themes/graphics/mime/image.png
 share/horde/imp/themes/graphics/mime/itip.png
-share/horde/imp/themes/graphics/mime/pdf.png
 share/horde/imp/themes/graphics/mime/mail.png
+share/horde/imp/themes/graphics/mime/pdf.png
 share/horde/imp/themes/graphics/mime/text.png
 share/horde/imp/themes/graphics/mini-error.png
 share/horde/imp/themes/graphics/newmail.png
@@ -545,8 +550,8 @@ share/horde/imp/themes/tango-blue/graphics/mime/encryption.png
 share/horde/imp/themes/tango-blue/graphics/mime/html.png
 share/horde/imp/themes/tango-blue/graphics/mime/image.png
 share/horde/imp/themes/tango-blue/graphics/mime/itip.png
-share/horde/imp/themes/tango-blue/graphics/mime/pdf.png
 share/horde/imp/themes/tango-blue/graphics/mime/mail.png
+share/horde/imp/themes/tango-blue/graphics/mime/pdf.png
 share/horde/imp/themes/tango-blue/graphics/mime/text.png
 share/horde/imp/themes/tango-blue/graphics/mini-error.png
 share/horde/imp/themes/tango-blue/graphics/newmail.png
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index ab5c369fece..e09dd05d61a 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2009/04/13 22:25:25 adrianp Exp $
+$NetBSD: distinfo,v 1.25 2010/11/10 12:48:31 adam Exp $
 
-SHA1 (imp-h3-4.3.4.tar.gz) = 97d719c82967aa6a110352f7039ef6f537e2f31d
-RMD160 (imp-h3-4.3.4.tar.gz) = 68716009f7198e0032e3e70339d9003cff7c3516
-Size (imp-h3-4.3.4.tar.gz) = 5270045 bytes
+SHA1 (imp-h3-4.3.9.tar.gz) = 763dd8b797b1039a5ecf9a9d6dc97b824b92a3c1
+RMD160 (imp-h3-4.3.9.tar.gz) = ec5709ab5fc53e0fa522b57b23b4fb5a6435ad39
+Size (imp-h3-4.3.9.tar.gz) = 5504324 bytes