summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2004-11-19 17:38:15 +0000
committersalo <salo>2004-11-19 17:38:15 +0000
commit7e6e99eb1ffb4db99afa808d764518082a17926b (patch)
treeb151bef1b3355161998c3369af42361bbd5f2344
parent20a3ae2ea452a49e622094a47432269f47e7afcc (diff)
downloadpkgsrc-7e6e99eb1ffb4db99afa808d764518082a17926b.tar.gz
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.
-rw-r--r--mail/ja-squirrelmail/Makefile8
-rw-r--r--mail/ja-squirrelmail/distinfo8
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 1cddef2470d..965ff4eb6d9 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -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
@@ -51,6 +54,7 @@ OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
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 --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index 959dcb81f2c..6d0a652a54c 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -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