Updated squirrelmail to 1.4.4

We are pleased to announce the release of SquirrelMail 1.4.4.  This
release is a strongly recommended upgrade due to a number of security
issues that have been resolved since 1.4.3a.

About This Release
------------------
This release contains a number of bug fixes, and security updates.  The
list is very long, as this version has been hiding in the trees for a
while.  For a full list of the changes, you can see the changelog here:

  http://www.squirrelmail.org/changelog.php

A general summary of updates includes a few cross site scripting issues,
and two possible file inclusion issue (one remote, one local).  Better
IMAP handling introduced for certain IMAP servers that advertise
LOGINDISABLED, folder handling, and a number of locales issues.

Locales
-------
Shortly after the release of 1.4.3, the locales were broken out of the
main branch into their own branch.  This makes the SquirrelMail package
itself a lot smaller, along with allowing administrators to download just
the packages they need.  Details on this change can be found in the
ReleaseNotes and the INSTALL files.

4 files changed, 50 insertions, 518 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f1d89d9ccbd..5f70742f49a 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2004/12/22 08:08:08 martti Exp $
+# $NetBSD: Makefile,v 1.49 2005/01/23 07:02:03 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.3a
-PKGREVISION=	1
+DISTNAME=	squirrelmail-1.4.4
+#PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -68,6 +68,7 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 
+	${CHMOD} a+x ${SMDIR}/config/conf.pl
 	${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
 	${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
 
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 6e33ec86e23..d48199492f8 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/05/31 20:14:39 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/01/23 07:02:03 martti Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -52,21 +52,21 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/addressbook.txt
 share/squirrelmail/doc/authentication.txt
-share/squirrelmail/doc/compose.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
 share/squirrelmail/doc/index.html
 share/squirrelmail/doc/mime.txt
 share/squirrelmail/doc/plugin.txt
+share/squirrelmail/doc/presets.txt
 share/squirrelmail/doc/rfc_documents.txt
 share/squirrelmail/doc/themes.txt
 share/squirrelmail/doc/translating.txt
 share/squirrelmail/doc/translating_help.txt
 share/squirrelmail/doc/tree.txt
 share/squirrelmail/functions/abook_database.php
-share/squirrelmail/functions/abook_global_file.php
 share/squirrelmail/functions/abook_ldap_server.php
 share/squirrelmail/functions/abook_local_file.php
 share/squirrelmail/functions/addressbook.php
@@ -75,14 +75,6 @@ share/squirrelmail/functions/auth.php
 share/squirrelmail/functions/constants.php
 share/squirrelmail/functions/date.php
 share/squirrelmail/functions/db_prefs.php
-share/squirrelmail/functions/decode/big5.php
-share/squirrelmail/functions/decode/cp10000.php
-share/squirrelmail/functions/decode/cp10006.php
-share/squirrelmail/functions/decode/cp10007.php
-share/squirrelmail/functions/decode/cp10017.php
-share/squirrelmail/functions/decode/cp10029.php
-share/squirrelmail/functions/decode/cp10079.php
-share/squirrelmail/functions/decode/cp10081.php
 share/squirrelmail/functions/decode/cp1250.php
 share/squirrelmail/functions/decode/cp1251.php
 share/squirrelmail/functions/decode/cp1252.php
@@ -94,28 +86,42 @@ share/squirrelmail/functions/decode/cp1257.php
 share/squirrelmail/functions/decode/cp1258.php
 share/squirrelmail/functions/decode/cp855.php
 share/squirrelmail/functions/decode/cp866.php
-share/squirrelmail/functions/decode/gb2312.php
-share/squirrelmail/functions/decode/iso-ir-111.php
-share/squirrelmail/functions/decode/iso8859-1.php
-share/squirrelmail/functions/decode/iso8859-10.php
-share/squirrelmail/functions/decode/iso8859-11.php
-share/squirrelmail/functions/decode/iso8859-13.php
-share/squirrelmail/functions/decode/iso8859-14.php
-share/squirrelmail/functions/decode/iso8859-15.php
-share/squirrelmail/functions/decode/iso8859-16.php
-share/squirrelmail/functions/decode/iso8859-2.php
-share/squirrelmail/functions/decode/iso8859-3.php
-share/squirrelmail/functions/decode/iso8859-4.php
-share/squirrelmail/functions/decode/iso8859-5.php
-share/squirrelmail/functions/decode/iso8859-6.php
-share/squirrelmail/functions/decode/iso8859-7.php
-share/squirrelmail/functions/decode/iso8859-8.php
-share/squirrelmail/functions/decode/iso8859-9.php
-share/squirrelmail/functions/decode/koi8-r.php
-share/squirrelmail/functions/decode/koi8-u.php
-share/squirrelmail/functions/decode/tis620.php
-share/squirrelmail/functions/decode/utf-8.php
+share/squirrelmail/functions/decode/iso_8859_1.php
+share/squirrelmail/functions/decode/iso_8859_10.php
+share/squirrelmail/functions/decode/iso_8859_11.php
+share/squirrelmail/functions/decode/iso_8859_13.php
+share/squirrelmail/functions/decode/iso_8859_14.php
+share/squirrelmail/functions/decode/iso_8859_15.php
+share/squirrelmail/functions/decode/iso_8859_16.php
+share/squirrelmail/functions/decode/iso_8859_2.php
+share/squirrelmail/functions/decode/iso_8859_3.php
+share/squirrelmail/functions/decode/iso_8859_4.php
+share/squirrelmail/functions/decode/iso_8859_5.php
+share/squirrelmail/functions/decode/iso_8859_6.php
+share/squirrelmail/functions/decode/iso_8859_7.php
+share/squirrelmail/functions/decode/iso_8859_8.php
+share/squirrelmail/functions/decode/iso_8859_9.php
+share/squirrelmail/functions/decode/iso_ir_111.php
+share/squirrelmail/functions/decode/koi8_r.php
+share/squirrelmail/functions/decode/koi8_u.php
+share/squirrelmail/functions/decode/ns_4551_1.php
+share/squirrelmail/functions/decode/tis_620.php
+share/squirrelmail/functions/decode/us_ascii.php
+share/squirrelmail/functions/decode/utf_8.php
 share/squirrelmail/functions/display_messages.php
+share/squirrelmail/functions/encode/cp1251.php
+share/squirrelmail/functions/encode/cp1255.php
+share/squirrelmail/functions/encode/cp1256.php
+share/squirrelmail/functions/encode/iso_8859_1.php
+share/squirrelmail/functions/encode/iso_8859_15.php
+share/squirrelmail/functions/encode/iso_8859_2.php
+share/squirrelmail/functions/encode/iso_8859_7.php
+share/squirrelmail/functions/encode/iso_8859_9.php
+share/squirrelmail/functions/encode/koi8_r.php
+share/squirrelmail/functions/encode/koi8_u.php
+share/squirrelmail/functions/encode/tis_620.php
+share/squirrelmail/functions/encode/us_ascii.php
+share/squirrelmail/functions/encode/utf_8.php
 share/squirrelmail/functions/file_prefs.php
 share/squirrelmail/functions/forms.php
 share/squirrelmail/functions/gettext.php
@@ -139,69 +145,6 @@ share/squirrelmail/functions/prefs.php
 share/squirrelmail/functions/strings.php
 share/squirrelmail/functions/tree.php
 share/squirrelmail/functions/url_parser.php
-share/squirrelmail/help/bg_BG/FAQ.hlp
-share/squirrelmail/help/bg_BG/addresses.hlp
-share/squirrelmail/help/bg_BG/basic.hlp
-share/squirrelmail/help/bg_BG/compose.hlp
-share/squirrelmail/help/bg_BG/folders.hlp
-share/squirrelmail/help/bg_BG/main_folder.hlp
-share/squirrelmail/help/bg_BG/options.hlp
-share/squirrelmail/help/bg_BG/read_mail.hlp
-share/squirrelmail/help/bg_BG/search.hlp
-share/squirrelmail/help/ca_ES/FAQ.hlp
-share/squirrelmail/help/ca_ES/addresses.hlp
-share/squirrelmail/help/ca_ES/basic.hlp
-share/squirrelmail/help/ca_ES/compose.hlp
-share/squirrelmail/help/ca_ES/folders.hlp
-share/squirrelmail/help/ca_ES/main_folder.hlp
-share/squirrelmail/help/ca_ES/options.hlp
-share/squirrelmail/help/ca_ES/read_mail.hlp
-share/squirrelmail/help/ca_ES/search.hlp
-share/squirrelmail/help/cs_CZ/FAQ.hlp
-share/squirrelmail/help/cs_CZ/addresses.hlp
-share/squirrelmail/help/cs_CZ/basic.hlp
-share/squirrelmail/help/cs_CZ/compose.hlp
-share/squirrelmail/help/cs_CZ/folders.hlp
-share/squirrelmail/help/cs_CZ/main_folder.hlp
-share/squirrelmail/help/cs_CZ/options.hlp
-share/squirrelmail/help/cs_CZ/read_mail.hlp
-share/squirrelmail/help/cs_CZ/search.hlp
-share/squirrelmail/help/cy_GB/FAQ.hlp
-share/squirrelmail/help/cy_GB/addresses.hlp
-share/squirrelmail/help/cy_GB/basic.hlp
-share/squirrelmail/help/cy_GB/compose.hlp
-share/squirrelmail/help/cy_GB/folders.hlp
-share/squirrelmail/help/cy_GB/main_folder.hlp
-share/squirrelmail/help/cy_GB/options.hlp
-share/squirrelmail/help/cy_GB/read_mail.hlp
-share/squirrelmail/help/cy_GB/search.hlp
-share/squirrelmail/help/da_DK/FAQ.hlp
-share/squirrelmail/help/da_DK/addresses.hlp
-share/squirrelmail/help/da_DK/basic.hlp
-share/squirrelmail/help/da_DK/compose.hlp
-share/squirrelmail/help/da_DK/folders.hlp
-share/squirrelmail/help/da_DK/main_folder.hlp
-share/squirrelmail/help/da_DK/options.hlp
-share/squirrelmail/help/da_DK/read_mail.hlp
-share/squirrelmail/help/da_DK/search.hlp
-share/squirrelmail/help/de_DE/FAQ.hlp
-share/squirrelmail/help/de_DE/addresses.hlp
-share/squirrelmail/help/de_DE/basic.hlp
-share/squirrelmail/help/de_DE/compose.hlp
-share/squirrelmail/help/de_DE/folders.hlp
-share/squirrelmail/help/de_DE/main_folder.hlp
-share/squirrelmail/help/de_DE/options.hlp
-share/squirrelmail/help/de_DE/read_mail.hlp
-share/squirrelmail/help/de_DE/search.hlp
-share/squirrelmail/help/en_GB/FAQ.hlp
-share/squirrelmail/help/en_GB/addresses.hlp
-share/squirrelmail/help/en_GB/basic.hlp
-share/squirrelmail/help/en_GB/compose.hlp
-share/squirrelmail/help/en_GB/folders.hlp
-share/squirrelmail/help/en_GB/main_folder.hlp
-share/squirrelmail/help/en_GB/options.hlp
-share/squirrelmail/help/en_GB/read_mail.hlp
-share/squirrelmail/help/en_GB/search.hlp
 share/squirrelmail/help/en_US/FAQ.hlp
 share/squirrelmail/help/en_US/addresses.hlp
 share/squirrelmail/help/en_US/basic.hlp
@@ -211,178 +154,7 @@ share/squirrelmail/help/en_US/main_folder.hlp
 share/squirrelmail/help/en_US/options.hlp
 share/squirrelmail/help/en_US/read_mail.hlp
 share/squirrelmail/help/en_US/search.hlp
-share/squirrelmail/help/es_ES/FAQ.hlp
-share/squirrelmail/help/es_ES/addresses.hlp
-share/squirrelmail/help/es_ES/basic.hlp
-share/squirrelmail/help/es_ES/compose.hlp
-share/squirrelmail/help/es_ES/folders.hlp
-share/squirrelmail/help/es_ES/main_folder.hlp
-share/squirrelmail/help/es_ES/options.hlp
-share/squirrelmail/help/es_ES/read_mail.hlp
-share/squirrelmail/help/es_ES/search.hlp
-share/squirrelmail/help/fi_FI/FAQ.hlp
-share/squirrelmail/help/fi_FI/addresses.hlp
-share/squirrelmail/help/fi_FI/basic.hlp
-share/squirrelmail/help/fi_FI/compose.hlp
-share/squirrelmail/help/fi_FI/folders.hlp
-share/squirrelmail/help/fi_FI/main_folder.hlp
-share/squirrelmail/help/fi_FI/options.hlp
-share/squirrelmail/help/fi_FI/read_mail.hlp
-share/squirrelmail/help/fi_FI/search.hlp
-share/squirrelmail/help/fr_FR/FAQ.hlp
-share/squirrelmail/help/fr_FR/addresses.hlp
-share/squirrelmail/help/fr_FR/basic.hlp
-share/squirrelmail/help/fr_FR/compose.hlp
-share/squirrelmail/help/fr_FR/folders.hlp
-share/squirrelmail/help/fr_FR/main_folder.hlp
-share/squirrelmail/help/fr_FR/options.hlp
-share/squirrelmail/help/fr_FR/read_mail.hlp
-share/squirrelmail/help/fr_FR/search.hlp
-share/squirrelmail/help/id_ID/FAQ.hlp
-share/squirrelmail/help/id_ID/addresses.hlp
-share/squirrelmail/help/id_ID/basic.hlp
-share/squirrelmail/help/id_ID/compose.hlp
-share/squirrelmail/help/id_ID/folders.hlp
-share/squirrelmail/help/id_ID/main_folder.hlp
-share/squirrelmail/help/id_ID/options.hlp
-share/squirrelmail/help/id_ID/read_mail.hlp
-share/squirrelmail/help/id_ID/search.hlp
 share/squirrelmail/help/index.php
-share/squirrelmail/help/it_IT/FAQ.hlp
-share/squirrelmail/help/it_IT/addresses.hlp
-share/squirrelmail/help/it_IT/basic.hlp
-share/squirrelmail/help/it_IT/compose.hlp
-share/squirrelmail/help/it_IT/folders.hlp
-share/squirrelmail/help/it_IT/main_folder.hlp
-share/squirrelmail/help/it_IT/options.hlp
-share/squirrelmail/help/it_IT/read_mail.hlp
-share/squirrelmail/help/it_IT/search.hlp
-share/squirrelmail/help/ja_JP/FAQ.hlp
-share/squirrelmail/help/ja_JP/addresses.hlp
-share/squirrelmail/help/ja_JP/basic.hlp
-share/squirrelmail/help/ja_JP/compose.hlp
-share/squirrelmail/help/ja_JP/folders.hlp
-share/squirrelmail/help/ja_JP/main_folder.hlp
-share/squirrelmail/help/ja_JP/options.hlp
-share/squirrelmail/help/ja_JP/read_mail.hlp
-share/squirrelmail/help/ja_JP/search.hlp
-share/squirrelmail/help/ko_KR/FAQ.hlp
-share/squirrelmail/help/ko_KR/addresses.hlp
-share/squirrelmail/help/ko_KR/basic.hlp
-share/squirrelmail/help/ko_KR/compose.hlp
-share/squirrelmail/help/ko_KR/folders.hlp
-share/squirrelmail/help/ko_KR/main_folder.hlp
-share/squirrelmail/help/ko_KR/options.hlp
-share/squirrelmail/help/ko_KR/read_mail.hlp
-share/squirrelmail/help/ko_KR/search.hlp
-share/squirrelmail/help/lt_LT/FAQ.hlp
-share/squirrelmail/help/lt_LT/addresses.hlp
-share/squirrelmail/help/lt_LT/basic.hlp
-share/squirrelmail/help/lt_LT/compose.hlp
-share/squirrelmail/help/lt_LT/folders.hlp
-share/squirrelmail/help/lt_LT/main_folder.hlp
-share/squirrelmail/help/lt_LT/options.hlp
-share/squirrelmail/help/lt_LT/read_mail.hlp
-share/squirrelmail/help/lt_LT/search.hlp
-share/squirrelmail/help/nl_NL/FAQ.hlp
-share/squirrelmail/help/nl_NL/addresses.hlp
-share/squirrelmail/help/nl_NL/basic.hlp
-share/squirrelmail/help/nl_NL/compose.hlp
-share/squirrelmail/help/nl_NL/folders.hlp
-share/squirrelmail/help/nl_NL/main_folder.hlp
-share/squirrelmail/help/nl_NL/options.hlp
-share/squirrelmail/help/nl_NL/read_mail.hlp
-share/squirrelmail/help/nl_NL/search.hlp
-share/squirrelmail/help/pl_PL/FAQ.hlp
-share/squirrelmail/help/pl_PL/addresses.hlp
-share/squirrelmail/help/pl_PL/basic.hlp
-share/squirrelmail/help/pl_PL/compose.hlp
-share/squirrelmail/help/pl_PL/folders.hlp
-share/squirrelmail/help/pl_PL/main_folder.hlp
-share/squirrelmail/help/pl_PL/options.hlp
-share/squirrelmail/help/pl_PL/read_mail.hlp
-share/squirrelmail/help/pl_PL/search.hlp
-share/squirrelmail/help/pt_BR/FAQ.hlp
-share/squirrelmail/help/pt_BR/addresses.hlp
-share/squirrelmail/help/pt_BR/basic.hlp
-share/squirrelmail/help/pt_BR/compose.hlp
-share/squirrelmail/help/pt_BR/folders.hlp
-share/squirrelmail/help/pt_BR/main_folder.hlp
-share/squirrelmail/help/pt_BR/options.hlp
-share/squirrelmail/help/pt_BR/read_mail.hlp
-share/squirrelmail/help/pt_BR/search.hlp
-share/squirrelmail/help/pt_PT/FAQ.hlp
-share/squirrelmail/help/pt_PT/addresses.hlp
-share/squirrelmail/help/pt_PT/basic.hlp
-share/squirrelmail/help/pt_PT/compose.hlp
-share/squirrelmail/help/pt_PT/folders.hlp
-share/squirrelmail/help/pt_PT/main_folder.hlp
-share/squirrelmail/help/pt_PT/options.hlp
-share/squirrelmail/help/pt_PT/read_mail.hlp
-share/squirrelmail/help/pt_PT/search.hlp
-share/squirrelmail/help/ru_RU/FAQ.hlp
-share/squirrelmail/help/ru_RU/addresses.hlp
-share/squirrelmail/help/ru_RU/basic.hlp
-share/squirrelmail/help/ru_RU/compose.hlp
-share/squirrelmail/help/ru_RU/folders.hlp
-share/squirrelmail/help/ru_RU/main_folder.hlp
-share/squirrelmail/help/ru_RU/options.hlp
-share/squirrelmail/help/ru_RU/read_mail.hlp
-share/squirrelmail/help/ru_RU/search.hlp
-share/squirrelmail/help/sk_SK/FAQ.hlp
-share/squirrelmail/help/sk_SK/addresses.hlp
-share/squirrelmail/help/sk_SK/basic.hlp
-share/squirrelmail/help/sk_SK/compose.hlp
-share/squirrelmail/help/sk_SK/folders.hlp
-share/squirrelmail/help/sk_SK/main_folder.hlp
-share/squirrelmail/help/sk_SK/options.hlp
-share/squirrelmail/help/sk_SK/read_mail.hlp
-share/squirrelmail/help/sk_SK/search.hlp
-share/squirrelmail/help/sl_SI/FAQ.hlp
-share/squirrelmail/help/sl_SI/addresses.hlp
-share/squirrelmail/help/sl_SI/basic.hlp
-share/squirrelmail/help/sl_SI/compose.hlp
-share/squirrelmail/help/sl_SI/folders.hlp
-share/squirrelmail/help/sl_SI/main_folder.hlp
-share/squirrelmail/help/sl_SI/options.hlp
-share/squirrelmail/help/sl_SI/read_mail.hlp
-share/squirrelmail/help/sl_SI/search.hlp
-share/squirrelmail/help/sr_YU/FAQ.hlp
-share/squirrelmail/help/sr_YU/addresses.hlp
-share/squirrelmail/help/sr_YU/basic.hlp
-share/squirrelmail/help/sr_YU/compose.hlp
-share/squirrelmail/help/sr_YU/folders.hlp
-share/squirrelmail/help/sr_YU/main_folder.hlp
-share/squirrelmail/help/sr_YU/options.hlp
-share/squirrelmail/help/sr_YU/read_mail.hlp
-share/squirrelmail/help/sr_YU/search.hlp
-share/squirrelmail/help/sv_SE/FAQ.hlp
-share/squirrelmail/help/sv_SE/addresses.hlp
-share/squirrelmail/help/sv_SE/basic.hlp
-share/squirrelmail/help/sv_SE/compose.hlp
-share/squirrelmail/help/sv_SE/folders.hlp
-share/squirrelmail/help/sv_SE/main_folder.hlp
-share/squirrelmail/help/sv_SE/options.hlp
-share/squirrelmail/help/sv_SE/read_mail.hlp
-share/squirrelmail/help/sv_SE/search.hlp
-share/squirrelmail/help/th_TH/FAQ.hlp
-share/squirrelmail/help/th_TH/addresses.hlp
-share/squirrelmail/help/th_TH/basic.hlp
-share/squirrelmail/help/th_TH/compose.hlp
-share/squirrelmail/help/th_TH/folders.hlp
-share/squirrelmail/help/th_TH/main_folder.hlp
-share/squirrelmail/help/th_TH/options.hlp
-share/squirrelmail/help/th_TH/read_mail.hlp
-share/squirrelmail/help/th_TH/search.hlp
-share/squirrelmail/help/zh_CN/FAQ.hlp
-share/squirrelmail/help/zh_CN/addresses.hlp
-share/squirrelmail/help/zh_CN/basic.hlp
-share/squirrelmail/help/zh_CN/compose.hlp
-share/squirrelmail/help/zh_CN/folders.hlp
-share/squirrelmail/help/zh_CN/main_folder.hlp
-share/squirrelmail/help/zh_CN/options.hlp
-share/squirrelmail/help/zh_CN/read_mail.hlp
-share/squirrelmail/help/zh_CN/search.hlp
 share/squirrelmail/images/delitem.png
 share/squirrelmail/images/down_pointer.png
 share/squirrelmail/images/draft.png
@@ -391,28 +163,7 @@ share/squirrelmail/images/inbox.png
 share/squirrelmail/images/index.php
 share/squirrelmail/images/minus.png
 share/squirrelmail/images/plus.png
-share/squirrelmail/images/sec_remove_da_DK.png
-share/squirrelmail/images/sec_remove_de_DE.png
-share/squirrelmail/images/sec_remove_el_GR.png
 share/squirrelmail/images/sec_remove_eng.png
-share/squirrelmail/images/sec_remove_es_ES.png
-share/squirrelmail/images/sec_remove_fr_FR.png
-share/squirrelmail/images/sec_remove_hr_HR.png
-share/squirrelmail/images/sec_remove_hu_HU.png
-share/squirrelmail/images/sec_remove_id_ID.png
-share/squirrelmail/images/sec_remove_it_IT.png
-share/squirrelmail/images/sec_remove_ja_JP.png
-share/squirrelmail/images/sec_remove_ko_KR.png
-share/squirrelmail/images/sec_remove_lt_LT.png
-share/squirrelmail/images/sec_remove_nb_NO.png
-share/squirrelmail/images/sec_remove_nl_NL.png
-share/squirrelmail/images/sec_remove_nn_NO.png
-share/squirrelmail/images/sec_remove_pt_PT.png
-share/squirrelmail/images/sec_remove_ru_RU.png
-share/squirrelmail/images/sec_remove_sl_SI.png
-share/squirrelmail/images/sec_remove_sr_YU.png
-share/squirrelmail/images/sec_remove_sv_SE.png
-share/squirrelmail/images/sec_remove_tr_TR.png
 share/squirrelmail/images/senti.png
 share/squirrelmail/images/sm_logo.png
 share/squirrelmail/images/sort_none.png
@@ -425,92 +176,9 @@ share/squirrelmail/include/options/index.php
 share/squirrelmail/include/options/personal.php
 share/squirrelmail/include/validate.php
 share/squirrelmail/index.php
-share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/README.locales
 share/squirrelmail/locale/index.php
-share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/th_TH/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/th_TH/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/locale/timezones.cfg
-share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/vi_VN/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/vi_VN/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/plugins/README.plugins
 share/squirrelmail/plugins/abook_take/README
 share/squirrelmail/plugins/abook_take/setup.php
@@ -557,6 +225,7 @@ share/squirrelmail/plugins/fortune/setup.php
 share/squirrelmail/plugins/index.php
 share/squirrelmail/plugins/info/README
 share/squirrelmail/plugins/info/functions.php
+share/squirrelmail/plugins/info/index.php
 share/squirrelmail/plugins/info/options.php
 share/squirrelmail/plugins/info/setup.php
 share/squirrelmail/plugins/listcommands/README
@@ -643,6 +312,7 @@ share/squirrelmail/src/addrbook_search.php
 share/squirrelmail/src/addrbook_search_html.php
 share/squirrelmail/src/addressbook.php
 share/squirrelmail/src/compose.php
+share/squirrelmail/src/configtest.php
 share/squirrelmail/src/delete_message.php
 share/squirrelmail/src/download.php
 share/squirrelmail/src/empty_trash.php
@@ -711,6 +381,7 @@ share/squirrelmail/themes/methodical_theme.php
 share/squirrelmail/themes/midnight.php
 share/squirrelmail/themes/minimal_bw.php
 share/squirrelmail/themes/monostochastic.php
+share/squirrelmail/themes/netstyle_theme.php
 share/squirrelmail/themes/penguin.php
 share/squirrelmail/themes/plain_blue_theme.php
 share/squirrelmail/themes/purple_theme.php
@@ -750,122 +421,13 @@ share/squirrelmail/themes/spice_of_life_lite.php
 @dirrm share/squirrelmail/plugins/administrator
 @dirrm share/squirrelmail/plugins/abook_take
 @dirrm share/squirrelmail/plugins
-@dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_TW
-@dirrm share/squirrelmail/locale/zh_CN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_CN
-@dirrm share/squirrelmail/locale/vi_VN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/vi_VN
-@dirrm share/squirrelmail/locale/uk_UA/LC_MESSAGES
-@dirrm share/squirrelmail/locale/uk_UA
-@dirrm share/squirrelmail/locale/tr_TR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/tr_TR
-@dirrm share/squirrelmail/locale/th_TH/LC_MESSAGES
-@dirrm share/squirrelmail/locale/th_TH
-@dirrm share/squirrelmail/locale/sv_SE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sv_SE
-@dirrm share/squirrelmail/locale/sr_YU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sr_YU
-@dirrm share/squirrelmail/locale/sl_SI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sl_SI
-@dirrm share/squirrelmail/locale/sk_SK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sk_SK
-@dirrm share/squirrelmail/locale/ru_RU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ru_RU
-@dirrm share/squirrelmail/locale/ro_RO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ro_RO
-@dirrm share/squirrelmail/locale/pt_PT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_PT
-@dirrm share/squirrelmail/locale/pt_BR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_BR
-@dirrm share/squirrelmail/locale/pl_PL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pl_PL
-@dirrm share/squirrelmail/locale/nn_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nn_NO
-@dirrm share/squirrelmail/locale/nb_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nb_NO
-@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nl_NL
-@dirrm share/squirrelmail/locale/ms_MY/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ms_MY
-@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/lt_LT
-@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ko_KR
-@dirrm share/squirrelmail/locale/ja_JP/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ja_JP
-@dirrm share/squirrelmail/locale/it_IT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/it_IT
-@dirrm share/squirrelmail/locale/is_IS/LC_MESSAGES
-@dirrm share/squirrelmail/locale/is_IS
-@dirrm share/squirrelmail/locale/id_ID/LC_MESSAGES
-@dirrm share/squirrelmail/locale/id_ID
-@dirrm share/squirrelmail/locale/hu_HU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hu_HU
-@dirrm share/squirrelmail/locale/hr_HR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hr_HR
-@dirrm share/squirrelmail/locale/he_IL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/he_IL
-@dirrm share/squirrelmail/locale/fr_FR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fr_FR
-@dirrm share/squirrelmail/locale/fo_FO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fo_FO
-@dirrm share/squirrelmail/locale/fi_FI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fi_FI
-@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/et_EE
-@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/es_ES
-@dirrm share/squirrelmail/locale/en_GB/LC_MESSAGES
-@dirrm share/squirrelmail/locale/en_GB
-@dirrm share/squirrelmail/locale/el_GR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/el_GR
-@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/de_DE
-@dirrm share/squirrelmail/locale/da_DK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/da_DK
-@dirrm share/squirrelmail/locale/cy_GB/LC_MESSAGES
-@dirrm share/squirrelmail/locale/cy_GB
-@dirrm share/squirrelmail/locale/cs_CZ/LC_MESSAGES
-@dirrm share/squirrelmail/locale/cs_CZ
-@dirrm share/squirrelmail/locale/ca_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ca_ES
-@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
-@dirrm share/squirrelmail/locale/bg_BG
-@dirrm share/squirrelmail/locale/ar/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ar
 @dirrm share/squirrelmail/locale
 @dirrm share/squirrelmail/include/options
 @dirrm share/squirrelmail/include
 @dirrm share/squirrelmail/images
-@dirrm share/squirrelmail/help/zh_CN
-@dirrm share/squirrelmail/help/th_TH
-@dirrm share/squirrelmail/help/sv_SE
-@dirrm share/squirrelmail/help/sr_YU
-@dirrm share/squirrelmail/help/sl_SI
-@dirrm share/squirrelmail/help/sk_SK
-@dirrm share/squirrelmail/help/ru_RU
-@dirrm share/squirrelmail/help/pt_PT
-@dirrm share/squirrelmail/help/pt_BR
-@dirrm share/squirrelmail/help/pl_PL
-@dirrm share/squirrelmail/help/nl_NL
-@dirrm share/squirrelmail/help/lt_LT
-@dirrm share/squirrelmail/help/ko_KR
-@dirrm share/squirrelmail/help/ja_JP
-@dirrm share/squirrelmail/help/it_IT
-@dirrm share/squirrelmail/help/id_ID
-@dirrm share/squirrelmail/help/fr_FR
-@dirrm share/squirrelmail/help/fi_FI
-@dirrm share/squirrelmail/help/es_ES
 @dirrm share/squirrelmail/help/en_US
-@dirrm share/squirrelmail/help/en_GB
-@dirrm share/squirrelmail/help/de_DE
-@dirrm share/squirrelmail/help/da_DK
-@dirrm share/squirrelmail/help/cy_GB
-@dirrm share/squirrelmail/help/cs_CZ
-@dirrm share/squirrelmail/help/ca_ES
-@dirrm share/squirrelmail/help/bg_BG
 @dirrm share/squirrelmail/help
+@dirrm share/squirrelmail/functions/encode
 @dirrm share/squirrelmail/functions/decode
 @dirrm share/squirrelmail/functions
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.4
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index aca5bdeede4..8050d86d7bb 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.21 2004/11/16 14:18:01 martti Exp $
+$NetBSD: distinfo,v 1.22 2005/01/23 07:02:04 martti Exp $
 
-SHA1 (squirrelmail-1.4.3a.tar.bz2) = 8cb22905ddedbe94c9a174d12074263ce84c9a27
-Size (squirrelmail-1.4.3a.tar.bz2) = 2254039 bytes
+SHA1 (squirrelmail-1.4.4.tar.bz2) = 52bdb31e826e845464d7d53e0745c50ead9ba6fe
+Size (squirrelmail-1.4.4.tar.bz2) = 468790 bytes
 SHA1 (patch-aa) = b850165c4ed863faca1b8786e43c2cc16abba060
-SHA1 (patch-ab) = c994d1287465f4b3ffa79d1e9c0f27c50ce27aa6
diff --git a/mail/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab
deleted file mode 100644
index b1de49d39b0..00000000000
--- a/mail/squirrelmail/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2004/11/16 14:18:01 martti Exp $
-
-diff -urN functions/mime.php functions/mime.php
---- functions/mime.php	2004-05-23 19:14:11.000000000 +0300
-+++ functions/mime.php	2004-11-03 19:16:50.000000000 +0200
-@@ -602,13 +602,22 @@
-             }
-             $iLastMatch = $i;
-             $j = $i;
--            $ret .= $res[1];
-+            if ($htmlsave) {
-+                $ret .= htmlspecialchars($res[1]);
-+            } else {
-+                $ret .= $res[1];
-+            }
-             $encoding = ucfirst($res[3]);
-             switch ($encoding)
-             {
-             case 'B':
-                 $replace = base64_decode($res[4]);
--                $ret .= charset_decode($res[2],$replace);
-+                if ($utfencode) {
-+                    $replace = charset_decode($res[2],$replace);
-+                } elseif ($htmlsave) {
-+                    $replace = htmlspecialchars($replace);
-+                }
-+                $ret .= $replace;
-                 break;
-             case 'Q':
-                 $replace = str_replace('_', ' ', $res[4]);