Thu Dec 4 10:24:38 2008 UTC ()
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.


(tron)
diff -r1.99 -r1.99.2.1 pkgsrc/mail/squirrelmail/Makefile
diff -r1.27 -r1.27.2.1 pkgsrc/mail/squirrelmail/PLIST
diff -r1.19 -r1.19.2.1 pkgsrc/mail/squirrelmail/buildlink3.mk
diff -r1.48 -r1.48.2.1 pkgsrc/mail/squirrelmail/distinfo
diff -r1.8 -r1.8.8.1 pkgsrc/mail/squirrelmail/options.mk
cvs diff -r1.99 -r1.99.2.1 pkgsrc/mail/squirrelmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/Makefile 2008/09/28 17:32:26 1.99
+++ pkgsrc/mail/squirrelmail/Makefile 2008/12/04 10:24:38 1.99.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.99 2008/09/28 17:32:26 martti Exp $ 1# $NetBSD: Makefile,v 1.99.2.1 2008/12/04 10:24:38 tron Exp $
2 2
3DISTNAME= squirrelmail-1.4.16 3DISTNAME= squirrelmail-1.4.17
4#PKGREVISION= 1 4#PKGREVISION= 1
5CATEGORIES= mail www 5CATEGORIES= mail www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= martti@NetBSD.org 9MAINTAINER= martti@NetBSD.org
10HOMEPAGE= http://www.squirrelmail.org/ 10HOMEPAGE= http://www.squirrelmail.org/
11COMMENT= PHP webmail package 11COMMENT= PHP webmail package
12#LICENSE= gnu-gpl-v2 12#LICENSE= gnu-gpl-v2
13 13
14CONFLICTS= sq-attachment-handlers-[0-9]* 14CONFLICTS= sq-attachment-handlers-[0-9]*
15CONFLICTS+= sq-squirrelspell-[0-9]* 15CONFLICTS+= sq-squirrelspell-[0-9]*
16CONFLICTS+= ja-squirrelspell-[0-9]* 16CONFLICTS+= ja-squirrelspell-[0-9]*
cvs diff -r1.27 -r1.27.2.1 pkgsrc/mail/squirrelmail/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/PLIST 2008/09/28 17:32:26 1.27
+++ pkgsrc/mail/squirrelmail/PLIST 2008/12/04 10:24:38 1.27.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.27 2008/09/28 17:32:26 martti Exp $ 1@comment $NetBSD: PLIST,v 1.27.2.1 2008/12/04 10:24:38 tron Exp $
2man/man8/squirrelmail-conf.pl.8 2man/man8/squirrelmail-conf.pl.8
3share/examples/squirrelmail/squirrelmail.conf 3share/examples/squirrelmail/squirrelmail.conf
4share/squirrelmail/AUTHORS 4share/squirrelmail/AUTHORS
5share/squirrelmail/COPYING 5share/squirrelmail/COPYING
6share/squirrelmail/ChangeLog 6share/squirrelmail/ChangeLog
7share/squirrelmail/INSTALL 7share/squirrelmail/INSTALL
8share/squirrelmail/README 8share/squirrelmail/README
9share/squirrelmail/ReleaseNotes 9share/squirrelmail/ReleaseNotes
10share/squirrelmail/UPGRADE 10share/squirrelmail/UPGRADE
11share/squirrelmail/class/deliver/Deliver.class.php 11share/squirrelmail/class/deliver/Deliver.class.php
12share/squirrelmail/class/deliver/Deliver_IMAP.class.php 12share/squirrelmail/class/deliver/Deliver_IMAP.class.php
13share/squirrelmail/class/deliver/Deliver_SMTP.class.php 13share/squirrelmail/class/deliver/Deliver_SMTP.class.php
14share/squirrelmail/class/deliver/Deliver_SendMail.class.php 14share/squirrelmail/class/deliver/Deliver_SendMail.class.php
@@ -50,26 +50,27 @@ share/squirrelmail/doc/ReleaseNotes/1.2/ @@ -50,26 +50,27 @@ share/squirrelmail/doc/ReleaseNotes/1.2/
50share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt 50share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
51share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt 51share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
52share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt 52share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
53share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt 53share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
54share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt 54share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt
55share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt 55share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
56share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt 56share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
57share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10.txt 57share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10.txt
58share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10a.txt 58share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10a.txt
59share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.11.txt 59share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.11.txt
60share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.12.txt 60share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.12.txt
61share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.13.txt 61share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.13.txt
62share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt 62share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt
 63share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.16.txt
63share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt 64share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
64share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt 65share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
65share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt 66share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
66share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt 67share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
67share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt 68share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
68share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt 69share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
69share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt 70share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
70share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.8.txt 71share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.8.txt
71share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9.txt 72share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9.txt
72share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9a.txt 73share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9a.txt
73share/squirrelmail/doc/authentication.txt 74share/squirrelmail/doc/authentication.txt
74share/squirrelmail/doc/ie_ssl.txt 75share/squirrelmail/doc/ie_ssl.txt
75share/squirrelmail/doc/index.html 76share/squirrelmail/doc/index.html
cvs diff -r1.19 -r1.19.2.1 pkgsrc/mail/squirrelmail/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/buildlink3.mk 2008/09/28 17:32:26 1.19
+++ pkgsrc/mail/squirrelmail/buildlink3.mk 2008/12/04 10:24:38 1.19.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.19 2008/09/28 17:32:26 martti Exp $ 1# $NetBSD: buildlink3.mk,v 1.19.2.1 2008/12/04 10:24:38 tron Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+ 4SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= squirrelmail 7BUILDLINK_DEPENDS+= squirrelmail
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail}
11BUILDLINK_PACKAGES+= squirrelmail 11BUILDLINK_PACKAGES+= squirrelmail
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
13 13
14.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+" 14.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.squirrelmail+= squirrelmail>=1.4.16 15BUILDLINK_API_DEPENDS.squirrelmail+= squirrelmail>=1.4.17
16BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail 16BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail
17.endif # SQUIRRELMAIL_BUILDLINK3_MK 17.endif # SQUIRRELMAIL_BUILDLINK3_MK
18 18
19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.48 -r1.48.2.1 pkgsrc/mail/squirrelmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/distinfo 2008/09/28 17:32:26 1.48
+++ pkgsrc/mail/squirrelmail/distinfo 2008/12/04 10:24:38 1.48.2.1
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.48 2008/09/28 17:32:26 martti Exp $ 1$NetBSD: distinfo,v 1.48.2.1 2008/12/04 10:24:38 tron Exp $
2 2
3SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895 3SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895
4RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e 4RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e
5Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes 5Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes
6SHA1 (squirrelmail-1.4.15-ja-20080527-patch.gz) = c610ea923598086d6ba78121ce07620355126b53 6SHA1 (squirrelmail-1.4.16-ja-20081013-patch.gz) = 6e89e77416aeb478005963aecc814ae9d7b4eebd
7RMD160 (squirrelmail-1.4.15-ja-20080527-patch.gz) = a5dead7379935b195cfdd8ec8e87478a56a2f68f 7RMD160 (squirrelmail-1.4.16-ja-20081013-patch.gz) = e38ae26051bb2a617b570d8f4721ffd2576a4bed
8Size (squirrelmail-1.4.15-ja-20080527-patch.gz) = 7974 bytes 8Size (squirrelmail-1.4.16-ja-20081013-patch.gz) = 7989 bytes
9SHA1 (squirrelmail-1.4.16.tar.bz2) = 61c6676c33209addfc2a33d5db26433ed2a3072a 9SHA1 (squirrelmail-1.4.17.tar.bz2) = da21a447ada4e120b82210e93a737bb4c4509c34
10RMD160 (squirrelmail-1.4.16.tar.bz2) = c6bb4a1ec2951aefe2d56224d97428072cda7d28 10RMD160 (squirrelmail-1.4.17.tar.bz2) = 41ecb9367f72785ee402d239cd62b225f17e270c
11Size (squirrelmail-1.4.16.tar.bz2) = 509058 bytes 11Size (squirrelmail-1.4.17.tar.bz2) = 507158 bytes
12SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a 12SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
cvs diff -r1.8 -r1.8.8.1 pkgsrc/mail/squirrelmail/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/squirrelmail/Attic/options.mk 2008/05/27 12:40:37 1.8
+++ pkgsrc/mail/squirrelmail/Attic/options.mk 2008/12/04 10:24:38 1.8.8.1
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.8 2008/05/27 12:40:37 martti Exp $ 1# $NetBSD: options.mk,v 1.8.8.1 2008/12/04 10:24:38 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squirrelmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.squirrelmail
4PKG_SUPPORTED_OPTIONS= squirrelmail-japanese squirrelmail-lite 4PKG_SUPPORTED_OPTIONS= squirrelmail-japanese squirrelmail-lite
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Msquirrelmail-japanese) 8.if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
9PATCHFILES+= squirrelmail-1.4.15-ja-20080527-patch.gz 9PATCHFILES+= squirrelmail-1.4.16-ja-20081013-patch.gz
10SITES.squirrelmail-1.4.15-ja-20080527-patch.gz= \ 10SITES.squirrelmail-1.4.16-ja-20081013-patch.gz= \
11 http://www.yamaai-tech.com/~masato/Download/ 11 http://www.yamaai-tech.com/~masato/Download/
12PATCH_DIST_STRIP.squirrelmail-1.4.15-ja-20080527-patch.gz= -p1 12PATCH_DIST_STRIP.squirrelmail-1.4.16-ja-20081013-patch.gz= -p1
13 13
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Msquirrelmail-lite) 16.if !empty(PKG_OPTIONS:Msquirrelmail-lite)
17PATCHFILES+= squirrelmail-1.4.11-lite-20071003-patch.bz2 17PATCHFILES+= squirrelmail-1.4.11-lite-20071003-patch.bz2
18SITES.squirrelmail-1.4.11-lite-20071003-patch.bz2= \ 18SITES.squirrelmail-1.4.11-lite-20071003-patch.bz2= \
19 ftp://ftp.back-street.net/pub/squirrelmail/ 19 ftp://ftp.back-street.net/pub/squirrelmail/
20 20
21DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring 21DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
22.endif 22.endif