Update to 1.2.4 (OK'd by Johnny Lam).

Changes:
Version 1.2.4 -- 25 January 2002
--------------------------------
  - Fixes a nasty remote arbitrary command execution vulnerability
    in the spellchecker plugin.

Version 1.2.3 -- 21 January 2002
--------------------------------
  - Fixed focus system on pages that contain forms.
  - Fixed IMAP code to send different command identifiers as per
    section 2.2.1 of RFC 2060.
  - Fixed 'sticky priority' so that replies are set to the same
    priority as the original message.
  - Fixed Printer Friendly to print HTML messages.
  - Fixed multiple receivers in Sent mailbox (#500910).
  - Disabled prefs caching under PHP 4.1
  - Added "Search Memory". Enabling to store up to
    9 predefined searchs.
  - Increased security in html message.
  - Added the possibility to specify system-defined css in order to
    allow users to change the font family and size of SM. Making possible to
    make it bigger or smaller depending on their screen size. Sysops may add
    or remove these system-defined css located in themes/css/
  - Fixed a bug appearing on some apache virtual hosts
  - Fixed javascript error (#505255)
  - Fixed the db_prefs so they work again (#499609, thanks to Simon Dick)

3 files changed, 31 insertions, 17 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 3ddf233b094..d96a97abb40 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2002/01/07 11:49:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/01/28 15:34:57 bouyer Exp $
 
-DISTNAME=	squirrelmail-1.2.2
+DISTNAME=	squirrelmail-1.2.4
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 0cad1e21fa6..9c4d96c938f 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/07 11:49:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/28 15:34:57 bouyer Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -18,6 +18,8 @@ share/squirrelmail/data/index.php
 share/squirrelmail/doc/README.russian_apache
 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/addressbook.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -224,6 +226,7 @@ share/squirrelmail/help/th_TH/read_mail.hlp
 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/sm_logo.jpg
 share/squirrelmail/images/sm_logo.png
 share/squirrelmail/images/sort_none.png
@@ -324,6 +327,10 @@ share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
 share/squirrelmail/plugins/newmail/sounds/Notify.wav
 share/squirrelmail/plugins/newmail/testsound.php
 share/squirrelmail/plugins/sent_subfolders/setup.php
+share/squirrelmail/plugins/spamcop/options.php
+share/squirrelmail/plugins/spamcop/README
+share/squirrelmail/plugins/spamcop/setup.php
+share/squirrelmail/plugins/spamcop/spamcop.php
 share/squirrelmail/plugins/squirrelspell/INSTALL
 share/squirrelmail/plugins/squirrelspell/doc/CRYPTO
 share/squirrelmail/plugins/squirrelspell/doc/ChangeLog
@@ -339,18 +346,18 @@ 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/WHATISTHIS
-share/squirrelmail/plugins/squirrelspell/modules/check_me.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/crypto.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/check_me.mod
+share/squirrelmail/plugins/squirrelspell/modules/crypto.mod
+share/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod
+share/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod
+share/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod
+share/squirrelmail/plugins/squirrelspell/modules/forget_me.mod
+share/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod
 share/squirrelmail/plugins/squirrelspell/modules/index.php
-share/squirrelmail/plugins/squirrelspell/modules/init.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php
-share/squirrelmail/plugins/squirrelspell/modules/options_main.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/init.mod
+share/squirrelmail/plugins/squirrelspell/modules/lang_change.mod
+share/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod
+share/squirrelmail/plugins/squirrelspell/modules/options_main.mod
 share/squirrelmail/plugins/squirrelspell/setup.php
 share/squirrelmail/plugins/squirrelspell/sqspell_config.php
 share/squirrelmail/plugins/squirrelspell/sqspell_functions.php
@@ -414,6 +421,11 @@ share/squirrelmail/themes/blue_grey_theme.php
 share/squirrelmail/themes/bluesnews_theme.php
 share/squirrelmail/themes/bluesteel_theme.php
 share/squirrelmail/themes/christmas.php
+share/squirrelmail/themes/css/sans-08.css
+share/squirrelmail/themes/css/sans-10.css
+share/squirrelmail/themes/css/sans-12.css
+share/squirrelmail/themes/css/serif-10.css
+share/squirrelmail/themes/css/serif-12.css
 share/squirrelmail/themes/dark_grey_theme.php
 share/squirrelmail/themes/darkness.php
 share/squirrelmail/themes/deepocean2_theme.php
@@ -442,6 +454,7 @@ share/squirrelmail/themes/slashdot_theme.php
 share/squirrelmail/themes/spice_of_life.php
 share/squirrelmail/themes/spice_of_life_dark.php
 share/squirrelmail/themes/spice_of_life_lite.php
+@dirrm share/squirrelmail/themes/css
 @dirrm share/squirrelmail/themes
 @dirrm share/squirrelmail/src
 @dirrm share/squirrelmail/po
@@ -450,6 +463,7 @@ share/squirrelmail/themes/spice_of_life_lite.php
 @dirrm share/squirrelmail/plugins/squirrelspell/js
 @dirrm share/squirrelmail/plugins/squirrelspell/doc
 @dirrm share/squirrelmail/plugins/squirrelspell
+@dirrm share/squirrelmail/plugins/spamcop
 @dirrm share/squirrelmail/plugins/sent_subfolders
 @dirrm share/squirrelmail/plugins/newmail/sounds
 @dirrm share/squirrelmail/plugins/newmail
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 47e8a4095cd..a1a428fd18c 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/01/07 11:49:45 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/01/28 15:34:58 bouyer Exp $
 
-SHA1 (squirrelmail-1.2.2.tar.bz2) = 1e36b290887a90d842aecd4d90cefc5e4d8e03f0
-Size (squirrelmail-1.2.2.tar.bz2) = 989808 bytes
+SHA1 (squirrelmail-1.2.4.tar.bz2) = d9b93b1d01b9da1e62c0680843ca23b17c196554
+Size (squirrelmail-1.2.4.tar.bz2) = 1027492 bytes
 SHA1 (patch-aa) = eb638bec1a858d70ba67063ac0a1b6a1bc0d4237