Update to 1.2.5. Main change is that it has been fully ported to PHP 4.1

(no more warnings that fills in apache error_log).
Changes since 1.2.4:
  - Multiple mailbox list calls cached.
  - Added 'View unsafe images' link to the bottom of pages which contain
    unsafe images.
  - Fixed 'too many close table tags' and various other issues
    which meant SM output didn't always validate as clean HTML.
  - Added the ability to add special folders through plugins.
  - Added an Always compose in a pop-up window option.
  - Search page update with ability to save searches and search
    all folders at once.
  - Made searching on multiple criteria possible, with thanks to Jason Munro
  - Fixed 'list all' in addressbook (#506624, thanks to Kurt Yoder)
  - Fixed small bugs in db_prefs
  - Allowed SquirrelMail to work from within a frame, eg. not using _top
    this is configureable. (thanks to Simon Dick)
  - Added options to conf.pl to enable automated plugin installation:
    ./conf.pl --install-plugin <pluginname>. This allows plugins to be
    distributed in packages. Conf.pl now also reports when saving fails.
  - Attachment hooks now also allow specification of generic rules like
    text/* which will be used when no specific rule is available.
  - conf.pl can now configure database backed address books and
    preferences.
  - Version 0.3.7 of SquirrelSpell. Fixes a potential privacy
    vulnerability (symlink attack), plus introduces formatting fixes
    and javadoc-style comments.
  - Bugfix in mailfetch reported by Mateusz Mazur
  - Administrator plugin. A web based conf.pl replacement.
  - Removed GLOBALS from conf.pl
  - HTML messages optimization.
  - Added support for requesting read receipts (MDN) and delivery receipts.
  - Added the ability to stop users changing their names and email addresses.
  - Added signature into multiple identities (Stefan Meier <Stefan.Meier@cimsource.com>)
  - Updated user help files to reflect UI chanegs and added functionality.

3 files changed, 47 insertions, 7 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index d96a97abb40..93338b40445 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2002/01/28 15:34:57 bouyer Exp $
+# $NetBSD: Makefile,v 1.21 2002/03/18 22:11:51 bouyer Exp $
 
-DISTNAME=	squirrelmail-1.2.4
+DISTNAME=	squirrelmail-1.2.5
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 9c4d96c938f..f768a231511 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/28 15:34:57 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/18 22:11:51 bouyer Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -20,6 +20,7 @@ share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.3.txt
+share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.4.txt
 share/squirrelmail/doc/addressbook.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -43,6 +44,7 @@ share/squirrelmail/functions/constants.php
 share/squirrelmail/functions/date.php
 share/squirrelmail/functions/db_prefs.php
 share/squirrelmail/functions/display_messages.php
+share/squirrelmail/functions/file_prefs.php
 share/squirrelmail/functions/gettext.php
 share/squirrelmail/functions/i18n.php
 share/squirrelmail/functions/imap.php
@@ -227,11 +229,16 @@ share/squirrelmail/help/th_TH/search.hlp
 share/squirrelmail/images/down_pointer.png
 share/squirrelmail/images/index.php
 share/squirrelmail/images/sec_remove_eng.png
+share/squirrelmail/images/sec_remove_es_ES.png
+share/squirrelmail/images/sec_remove_lt_LT.png
+share/squirrelmail/images/sec_remove_ru.png
+share/squirrelmail/images/sec_remove_sl_SI.png
 share/squirrelmail/images/sm_logo.jpg
 share/squirrelmail/images/sm_logo.png
 share/squirrelmail/images/sort_none.png
 share/squirrelmail/images/up_pointer.png
 share/squirrelmail/index.php
+share/squirrelmail/locale/timezones.cfg
 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
@@ -296,10 +303,30 @@ share/squirrelmail/locale/tr_TR/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/administrator/INSTALL
+share/squirrelmail/plugins/administrator/auth.php
+share/squirrelmail/plugins/administrator/defines.php
+share/squirrelmail/plugins/administrator/index.php
+share/squirrelmail/plugins/administrator/options.php
+share/squirrelmail/plugins/administrator/setup.php
 share/squirrelmail/plugins/bug_report/INSTALL
 share/squirrelmail/plugins/bug_report/README
 share/squirrelmail/plugins/bug_report/bug_report.php
+share/squirrelmail/plugins/bug_report/index.php
 share/squirrelmail/plugins/bug_report/setup.php
+share/squirrelmail/plugins/calendar/setup.php
+share/squirrelmail/plugins/calendar/README
+share/squirrelmail/plugins/calendar/calendar_data.php
+share/squirrelmail/plugins/calendar/day.php
+share/squirrelmail/plugins/calendar/event_create.php
+share/squirrelmail/plugins/calendar/event_delete.php
+share/squirrelmail/plugins/calendar/event_edit.php
+share/squirrelmail/plugins/calendar/functions.php
+share/squirrelmail/plugins/calendar/index.php
+share/squirrelmail/plugins/calendar/calendar.php
+share/squirrelmail/plugins/delete_move_next/index.php
+share/squirrelmail/plugins/delete_move_next/README
+share/squirrelmail/plugins/delete_move_next/setup.php
 share/squirrelmail/plugins/filters/CHANGES
 share/squirrelmail/plugins/filters/README
 share/squirrelmail/plugins/filters/filters.php
@@ -308,13 +335,17 @@ share/squirrelmail/plugins/filters/options.php
 share/squirrelmail/plugins/filters/setup.php
 share/squirrelmail/plugins/filters/spamoptions.php
 share/squirrelmail/plugins/index.php
+share/squirrelmail/plugins/listcommands/index.php
+share/squirrelmail/plugins/listcommands/README
+share/squirrelmail/plugins/listcommands/mailout.php
+share/squirrelmail/plugins/listcommands/setup.php
 share/squirrelmail/plugins/mail_fetch/README
 share/squirrelmail/plugins/mail_fetch/class.POP3.php
 share/squirrelmail/plugins/mail_fetch/fetch.php
 share/squirrelmail/plugins/mail_fetch/functions.php
-share/squirrelmail/plugins/mail_fetch/mailfetch.po
 share/squirrelmail/plugins/mail_fetch/options.php
 share/squirrelmail/plugins/mail_fetch/setup.php
+share/squirrelmail/plugins/mail_fetch/index.php
 share/squirrelmail/plugins/make_archive.pl
 share/squirrelmail/plugins/newmail/HISTORY
 share/squirrelmail/plugins/newmail/README
@@ -326,7 +357,10 @@ share/squirrelmail/plugins/newmail/sounds/Friends.wav
 share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
 share/squirrelmail/plugins/newmail/sounds/Notify.wav
 share/squirrelmail/plugins/newmail/testsound.php
+share/squirrelmail/plugins/newmail/index.php
 share/squirrelmail/plugins/sent_subfolders/setup.php
+share/squirrelmail/plugins/sent_subfolders/index.php
+share/squirrelmail/plugins/spamcop/index.php
 share/squirrelmail/plugins/spamcop/options.php
 share/squirrelmail/plugins/spamcop/README
 share/squirrelmail/plugins/spamcop/setup.php
@@ -345,6 +379,7 @@ share/squirrelmail/plugins/squirrelspell/js/crypto_settings.js
 share/squirrelmail/plugins/squirrelspell/js/decrypt_error.js
 share/squirrelmail/plugins/squirrelspell/js/index.php
 share/squirrelmail/plugins/squirrelspell/js/init.js
+share/squirrelmail/plugins/squirrelspell/modules/.htaccess
 share/squirrelmail/plugins/squirrelspell/modules/WHATISTHIS
 share/squirrelmail/plugins/squirrelspell/modules/check_me.mod
 share/squirrelmail/plugins/squirrelspell/modules/crypto.mod
@@ -370,6 +405,7 @@ share/squirrelmail/plugins/translate/options.php
 share/squirrelmail/plugins/translate/setup.php
 share/squirrelmail/po/charsetconvert.pl
 share/squirrelmail/po/compilepo
+share/squirrelmail/po/independent_strings.txt
 share/squirrelmail/po/index.php
 share/squirrelmail/po/mergepo
 share/squirrelmail/po/squirrelmail.po
@@ -468,8 +504,12 @@ share/squirrelmail/themes/spice_of_life_lite.php
 @dirrm share/squirrelmail/plugins/newmail/sounds
 @dirrm share/squirrelmail/plugins/newmail
 @dirrm share/squirrelmail/plugins/mail_fetch
+@dirrm share/squirrelmail/plugins/listcommands
 @dirrm share/squirrelmail/plugins/filters
+@dirrm share/squirrelmail/plugins/delete_move_next
+@dirrm share/squirrelmail/plugins/calendar
 @dirrm share/squirrelmail/plugins/bug_report
+@dirrm share/squirrelmail/plugins/administrator
 @dirrm share/squirrelmail/plugins
 @dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
 @dirrm share/squirrelmail/locale/zh_TW
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index a1a428fd18c..10d4aeed431 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/01/28 15:34:58 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2002/03/18 22:11:52 bouyer Exp $
 
-SHA1 (squirrelmail-1.2.4.tar.bz2) = d9b93b1d01b9da1e62c0680843ca23b17c196554
-Size (squirrelmail-1.2.4.tar.bz2) = 1027492 bytes
+SHA1 (squirrelmail-1.2.5.tar.bz2) = 14b873c72822c07052357d0c8661acb412faf6f9
+Size (squirrelmail-1.2.5.tar.bz2) = 1138398 bytes
 SHA1 (patch-aa) = eb638bec1a858d70ba67063ac0a1b6a1bc0d4237