[pkgsrc/pkgsrc-2004Q3]: pkgsrc/mail/ja-squirrelmail Pullup ticket 143 - reque...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaeb4ad6eb7a
branches:  pkgsrc-2004Q3
changeset: 480747:eaeb4ad6eb7a
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Nov 19 17:38:15 2004 +0000

description:
Pullup ticket 143 - requested by Takahiro Kambe
security and usability fixes for ja-squirrelmail

        Module Name:    pkgsrc
        Committed By:   taca
        Date:           Wed Oct 20 14:38:58 UTC 2004

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

        Log Message:
        Update ja-squirrelmail to 20041014 release (1.4.3a-ja-20041014).

        Fix these bugs..

        (1) A problem with displaying mails in Japanese unless they are specified
            charset to ISO-2022-JP in Content-Type header;

                - encoded with euc-JP or Shift_JIS
                - encoded with ISO-2022-JP but no Content-Type header

        (2) A problem with replying to a mail with HTML format.

        Bump package revision.
---
        Module Name:    pkgsrc
        Committed By:   taca
        Date:           Tue Nov 16 11:51:16 UTC 2004

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

        Log Message:
        Apply XSS patch:

                http://article.gmane.org/gmane.mail.squirrelmail.user/21169

        Bump package revision.

diffstat:

 mail/ja-squirrelmail/Makefile |  8 ++++++--
 mail/ja-squirrelmail/distinfo |  8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 90cf18fe6fbf -r eaeb4ad6eb7a mail/ja-squirrelmail/Makefile
--- a/mail/ja-squirrelmail/Makefile     Thu Nov 18 22:30:35 2004 +0000
+++ b/mail/ja-squirrelmail/Makefile     Fri Nov 19 17:38:15 2004 +0000
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/06 14:32:11 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2004/11/19 17:38:15 salo Exp $
 
 DISTNAME=      squirrelmail-1.4.3a
 PKGNAME=       ja-${DISTNAME}
+PKGREVISION=   3
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
+DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX} sm143a-xss.diff
 EXTRACT_SUFX=  .tar.bz2
+EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=   http://www.yamaai-tech.com/~masato/Download/
-PATCHFILES=    squirrelmail-1.4.3a-ja-20040603-patch.gz
+PATCHFILES=    squirrelmail-1.4.3a-ja-20041014-patch.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=    martti%NetBSD.org@localhost
@@ -51,6 +54,7 @@
 
 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 90cf18fe6fbf -r eaeb4ad6eb7a mail/ja-squirrelmail/distinfo
--- a/mail/ja-squirrelmail/distinfo     Thu Nov 18 22:30:35 2004 +0000
+++ b/mail/ja-squirrelmail/distinfo     Fri Nov 19 17:38:15 2004 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/06 14:32:11 taca Exp $
+$NetBSD: distinfo,v 1.1.1.1.4.1 2004/11/19 17:38:15 salo Exp $
 
 SHA1 (squirrelmail-1.4.3a.tar.bz2) = 8cb22905ddedbe94c9a174d12074263ce84c9a27
 Size (squirrelmail-1.4.3a.tar.bz2) = 2254039 bytes
-SHA1 (squirrelmail-1.4.3a-ja-20040603-patch.gz) = 566ac0ff36202143de093a8a09cc5bb9f9fe1d12
-Size (squirrelmail-1.4.3a-ja-20040603-patch.gz) = 6444 bytes
+SHA1 (sm143a-xss.diff) = 295faad20d2c6c9f3a93dadb861c45352606222d
+Size (sm143a-xss.diff) = 1025 bytes
+SHA1 (squirrelmail-1.4.3a-ja-20041014-patch.gz) = 57ddeb8963ebbe94841d3286aae79c6c68ce94cc
+Size (squirrelmail-1.4.3a-ja-20041014-patch.gz) = 8133 bytes
 SHA1 (patch-aa) = d74a0ec819419b0f6327a38c7dc6b3625b833741