[pkgsrc/pkgsrc-2005Q2]: pkgsrc/mail Pullup ticket 664 - requested by Manuel B...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ea606cf3d79
branches:  pkgsrc-2005Q2
changeset: 496035:3ea606cf3d79
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Aug 24 13:06:03 2005 +0000

description:
Pullup ticket 664 - requested by Manuel Bouyer
security update for squirrelmail

Revisions pulled up:
- pkgsrc/mail/ja-squirrelmail/Makefile          1.15
- pkgsrc/mail/ja-squirrelmail/PLIST             1.3
- pkgsrc/mail/ja-squirrelmail/distinfo          1.6
- pkgsrc/mail/squirrelmail/Makefile             1.56
- pkgsrc/mail/squirrelmail/PLIST                1.16
- pkgsrc/mail/squirrelmail/buildlink3.mk        1.3
- pkgsrc/mail/squirrelmail/distinfo             1.26
- pkgsrc/mail/squirrelmail/patches/patch-aa     1.10
- pkgsrc/mail/squirrelmail/patches/patch-ab     removed
- pkgsrc/mail/squirrelmail-locales/Makefile     1.8
- pkgsrc/mail/squirrelmail-locales/PLIST        1.4
- pkgsrc/mail/squirrelmail-locales/distinfo     1.3

   Module Name:         pkgsrc
   Committed By:        martti
   Date:                Mon Jul 18 07:04:25 UTC 2005

   Modified Files:
        pkgsrc/mail/ja-squirrelmail: Makefile PLIST distinfo

   Log Message:
   Updated mail/ja-squirrelmail to 1.4.5

   * lots of bug fixes
   * translation updates
---
   Module Name:         pkgsrc
   Committed By:        martti
   Date:                Mon Jul 18 07:04:27 UTC 2005

   Modified Files:
        pkgsrc/mail/squirrelmail: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/mail/squirrelmail/patches: patch-aa
   Removed Files:
        pkgsrc/mail/squirrelmail/patches: patch-ab

   Log Message:
   Updated mail/squirrelmail to 1.4.5

   * lots of bug fixes
   * translation updates
--
   Module Name:         pkgsrc
   Committed By:        martti
   Date:                Mon Jul 18 07:04:29 UTC 2005

   Modified Files:
        pkgsrc/mail/squirrelmail-locales: Makefile PLIST distinfo

   Log Message:
   Updated mail/squirrelmail-locales

   * sync with squirrelmail 1.4.5

diffstat:

 mail/ja-squirrelmail/Makefile         |   11 +-
 mail/ja-squirrelmail/PLIST            |  555 ++---------------------
 mail/ja-squirrelmail/distinfo         |   19 +-
 mail/ja-squirrelmail/patches/patch-aa |   19 +-
 mail/squirrelmail-locales/Makefile    |    6 +-
 mail/squirrelmail-locales/PLIST       |  776 ++-------------------------------
 mail/squirrelmail-locales/distinfo    |    8 +-
 mail/squirrelmail/Makefile            |    6 +-
 mail/squirrelmail/PLIST               |   28 +-
 mail/squirrelmail/buildlink3.mk       |    4 +-
 mail/squirrelmail/distinfo            |   11 +-
 mail/squirrelmail/patches/patch-aa    |   12 +-
 mail/squirrelmail/patches/patch-ab    |  651 ----------------------------
 13 files changed, 197 insertions(+), 1909 deletions(-)

diffs (truncated from 2652 to 300 lines):

diff -r 63eb17c16676 -r 3ea606cf3d79 mail/ja-squirrelmail/Makefile
--- a/mail/ja-squirrelmail/Makefile     Wed Aug 24 10:02:49 2005 +0000
+++ b/mail/ja-squirrelmail/Makefile     Wed Aug 24 13:06:03 2005 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2005/08/24 13:06:03 salo Exp $
 
-DISTNAME=      squirrelmail-1.4.3a
+DISTNAME=      squirrelmail-1.4.5
 PKGNAME=       ja-${DISTNAME}
-PKGREVISION=   3
+#PKGREVISION=  1
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
-DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX} sm143a-xss.diff
+DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_SUFX=  .tar.bz2
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=   http://www.yamaai-tech.com/~masato/Download/
-PATCHFILES=    squirrelmail-1.4.3a-ja-20041014-patch.gz
+PATCHFILES=    squirrelmail-1.4.5-ja-20050714-patch.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=    martti%NetBSD.org@localhost
@@ -53,7 +53,6 @@
 
 post-patch:
        cd ${WRKSRC};                                                   \
-       ${PATCH} --forward --quiet -E -p0 < ${DISTDIR}/sm143a-xss.diff; \
        for f in config/config_default.php; do                          \
                ${SED}  -e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g"   \
                        -e "s|@USER_PREFS_DIR@|${USER_PREFS_DIR}|g"     \
diff -r 63eb17c16676 -r 3ea606cf3d79 mail/ja-squirrelmail/PLIST
--- a/mail/ja-squirrelmail/PLIST        Wed Aug 24 10:02:49 2005 +0000
+++ b/mail/ja-squirrelmail/PLIST        Wed Aug 24 13:06:03 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/06 14:32:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.10.1 2005/08/24 13:06:03 salo Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -34,16 +34,25 @@
 share/squirrelmail/contrib/RPM/squirrelmail.conf
 share/squirrelmail/contrib/RPM/squirrelmail.cron
 share/squirrelmail/contrib/RPM/squirrelmail.spec
+share/squirrelmail/contrib/decrypt_headers.php
+share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
+share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
+share/squirrelmail/contrib/squirrelmail.mailto.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
-share/squirrelmail/doc/README.russian_apache
+share/squirrelmail/doc/Development/addressbook.txt
+share/squirrelmail/doc/Development/index.html
+share/squirrelmail/doc/Development/mime.txt
+share/squirrelmail/doc/Development/plugin.txt
+share/squirrelmail/doc/Development/rfc_documents.txt
+share/squirrelmail/doc/Development/tree.txt
 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/ReleaseNotes/1.2/Notes-1.2.5
+share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
 share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
@@ -52,21 +61,18 @@
 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/addressbook.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.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/rfc_documents.txt
+share/squirrelmail/doc/presets.txt
+share/squirrelmail/doc/russian_apache.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
@@ -74,14 +80,7 @@
 share/squirrelmail/functions/auth.php
 share/squirrelmail/functions/constants.php
 share/squirrelmail/functions/date.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/db_prefs.php
 share/squirrelmail/functions/decode/cp1250.php
 share/squirrelmail/functions/decode/cp1251.php
 share/squirrelmail/functions/decode/cp1252.php
@@ -93,36 +92,50 @@
 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/db_prefs.php
+share/squirrelmail/functions/decode/iso_2022_jp.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
 share/squirrelmail/functions/global.php
 share/squirrelmail/functions/html.php
+share/squirrelmail/functions/i18n.php
 share/squirrelmail/functions/identity.php
-share/squirrelmail/functions/i18n.php
 share/squirrelmail/functions/imap.php
 share/squirrelmail/functions/imap_general.php
 share/squirrelmail/functions/imap_mailbox.php
@@ -139,69 +152,6 @@
 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 +161,8 @@
 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