Pullup ticket #2605 - requested by martti

squirremal: security update

Revisions pulled up:
- mail/squirrelmail/Makefile			1.100-1.101
- mail/squirrelmail/PLIST			1.28
- mail/squirrelmail/buildlink3.mk		1.20
- mail/squirrelmail/distinfo			1.49-1.50
- mail/squirrelmail/options.mk			1.9
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Nov 19 14:47:51 UTC 2008

Modified Files:
         pkgsrc/mail/squirrelmail: Makefile distinfo options.mk

Log Message:
Update Japanese patch to squirrelmail-1.4.16-ja-20081013.
No functional should be changed though.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	martti
Date:		Thu Dec  4 07:18:47 UTC 2008

Modified Files:
	pkgsrc/mail/squirrelmail: Makefile PLIST buildlink3.mk distinfo

Log Message:
Updated mail/squirrelmail to 1.4.17

The SquirrelMail team is happy to announce the release of version 1.4.17.  The
most notable change is a security fix that prevents certain specially-crafted
hyperlinks within messages from executing cross-site scripting attacks.  For
other details, see the ReleaseNotes file included in this release.  We advise
all users of SquirrelMail software to upgrade.

5 files changed, 17 insertions, 16 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index e5efea95d40..116893f9e21 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2008/09/28 17:32:26 martti Exp $
+# $NetBSD: Makefile,v 1.99.2.1 2008/12/04 10:24:38 tron Exp $
 
-DISTNAME=	squirrelmail-1.4.16
+DISTNAME=	squirrelmail-1.4.17
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index f3429f26049..76a0c97a061 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2008/09/28 17:32:26 martti Exp $
+@comment $NetBSD: PLIST,v 1.27.2.1 2008/12/04 10:24:38 tron Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
@@ -60,6 +60,7 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.11.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.12.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.13.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.16.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/ReleaseNotes/1.4/Notes-1.4.3a.txt
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 6565a221a70..eaa386bea2d 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/09/28 17:32:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19.2.1 2008/12/04 10:24:38 tron Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	squirrelmail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
 
 .if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.16
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.17
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 3cb324756ae..3b32db28f43 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.48 2008/09/28 17:32:26 martti Exp $
+$NetBSD: distinfo,v 1.48.2.1 2008/12/04 10:24:38 tron Exp $
 
 SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895
 RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e
 Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes
-SHA1 (squirrelmail-1.4.15-ja-20080527-patch.gz) = c610ea923598086d6ba78121ce07620355126b53
-RMD160 (squirrelmail-1.4.15-ja-20080527-patch.gz) = a5dead7379935b195cfdd8ec8e87478a56a2f68f
-Size (squirrelmail-1.4.15-ja-20080527-patch.gz) = 7974 bytes
-SHA1 (squirrelmail-1.4.16.tar.bz2) = 61c6676c33209addfc2a33d5db26433ed2a3072a
-RMD160 (squirrelmail-1.4.16.tar.bz2) = c6bb4a1ec2951aefe2d56224d97428072cda7d28
-Size (squirrelmail-1.4.16.tar.bz2) = 509058 bytes
+SHA1 (squirrelmail-1.4.16-ja-20081013-patch.gz) = 6e89e77416aeb478005963aecc814ae9d7b4eebd
+RMD160 (squirrelmail-1.4.16-ja-20081013-patch.gz) = e38ae26051bb2a617b570d8f4721ffd2576a4bed
+Size (squirrelmail-1.4.16-ja-20081013-patch.gz) = 7989 bytes
+SHA1 (squirrelmail-1.4.17.tar.bz2) = da21a447ada4e120b82210e93a737bb4c4509c34
+RMD160 (squirrelmail-1.4.17.tar.bz2) = 41ecb9367f72785ee402d239cd62b225f17e270c
+Size (squirrelmail-1.4.17.tar.bz2) = 507158 bytes
 SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
diff --git a/mail/squirrelmail/options.mk b/mail/squirrelmail/options.mk
index 7e477a7f473..11cbcde2c8f 100644
--- a/mail/squirrelmail/options.mk
+++ b/mail/squirrelmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2008/05/27 12:40:37 martti Exp $
+# $NetBSD: options.mk,v 1.8.8.1 2008/12/04 10:24:38 tron Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squirrelmail
 PKG_SUPPORTED_OPTIONS=	squirrelmail-japanese squirrelmail-lite
@@ -6,10 +6,10 @@ PKG_SUPPORTED_OPTIONS=	squirrelmail-japanese squirrelmail-lite
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
-PATCHFILES+=		squirrelmail-1.4.15-ja-20080527-patch.gz
-SITES.squirrelmail-1.4.15-ja-20080527-patch.gz= \
+PATCHFILES+=		squirrelmail-1.4.16-ja-20081013-patch.gz
+SITES.squirrelmail-1.4.16-ja-20081013-patch.gz= \
 			http://www.yamaai-tech.com/~masato/Download/
-PATCH_DIST_STRIP.squirrelmail-1.4.15-ja-20080527-patch.gz=	-p1
+PATCH_DIST_STRIP.squirrelmail-1.4.16-ja-20081013-patch.gz=	-p1
 
 .endif