Pullup ticket 2108 - requested by ghen

security update for seamonkey

Revisions pulled up:
- pkgsrc/www/seamonkey/Makefile					1.22
- pkgsrc/www/seamonkey/Makefile-seamonkey.common		1.10
- pkgsrc/www/seamonkey/PLIST					1.12
- pkgsrc/www/seamonkey/distinfo					1.21, 1.22
- pkgsrc/www/seamonkey/patches/patch-ab				1.7
- pkgsrc/www/seamonkey/patches/patch-cn				1.3
- pkgsrc/www/seamonkey-gtk1/Makefile				1.15
- pkgsrc/www/seamonkey-gtk1/PLIST				1.7
- pkgsrc/www/seamonkey-bin/Makefile				1.13
- pkgsrc/www/seamonkey-bin/distinfo				1.11

   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Sun Apr 15 12:17:06 UTC 2007

   Modified Files:
   	pkgsrc/www/seamonkey: distinfo
   	pkgsrc/www/seamonkey/patches: patch-ab

   Log Message:
   Fixed the build on Solaris. The same fix is already in patch-ab from
   www/firefox.
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Thu May 31 12:29:39 UTC 2007

   Modified Files:
   	pkgsrc/www/seamonkey: Makefile Makefile-seamonkey.common PLIST
   distinfo
   	pkgsrc/www/seamonkey-bin: Makefile distinfo
   	pkgsrc/www/seamonkey-gtk1: Makefile PLIST
   	pkgsrc/www/seamonkey/patches: patch-cn

   Log Message:
   Update seamonkey, seamonkey-bin and seamonkey-gtk1 to Seamonkey 1.1.2.

   Security fixes in this version:

   MFSA 2007-17 XUL Popup Spoofing
   MFSA 2007-16 XSS using addEventListener
   MFSA 2007-15 Security Vulnerability in APOP Authentication
   MFSA 2007-14 Path Abuse in Cookies
   MFSA 2007-12 Crashes with evidence of memory corruption

   For the complete changelog, see
   http://www.mozilla.org/projects/seamonkey/releases/seamonkey1.1.2/changelog.html

10 files changed, 41 insertions, 45 deletions

diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index 51d442321ce..73ac6cefd23 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/03/05 11:46:21 ghen Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2007/06/14 00:18:39 salo Exp $
 
 MOZILLA=		seamonkey
-MOZ_VER=		1.1.1
+MOZ_VER=		1.1.2
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
diff --git a/www/seamonkey-bin/distinfo b/www/seamonkey-bin/distinfo
index 3f9c507497d..5d49f07d5e6 100644
--- a/www/seamonkey-bin/distinfo
+++ b/www/seamonkey-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2007/03/05 11:46:21 ghen Exp $
+$NetBSD: distinfo,v 1.10.2.1 2007/06/14 00:18:39 salo Exp $
 
-SHA1 (seamonkey/releases/1.1.1/seamonkey-1.1.1.en-US.linux-i686.tar.gz) = 979a3bc6e3d923ada5a85b9c35ed893db56d1e08
-RMD160 (seamonkey/releases/1.1.1/seamonkey-1.1.1.en-US.linux-i686.tar.gz) = f40f802593ee66167736e8e88e32afbb0363b7c4
-Size (seamonkey/releases/1.1.1/seamonkey-1.1.1.en-US.linux-i686.tar.gz) = 14762685 bytes
+SHA1 (seamonkey/releases/1.1.2/seamonkey-1.1.2.en-US.linux-i686.tar.gz) = a85fd4924e56895378d4ce770a7dc399fb499c19
+RMD160 (seamonkey/releases/1.1.2/seamonkey-1.1.2.en-US.linux-i686.tar.gz) = 762731d89f99435ddffcece82ce6861b5e863d47
+Size (seamonkey/releases/1.1.2/seamonkey-1.1.2.en-US.linux-i686.tar.gz) = 14770947 bytes
diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile
index 42ac24c8ed4..d088d8014ec 100644
--- a/www/seamonkey-gtk1/Makefile
+++ b/www/seamonkey-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2007/03/31 22:51:24 ghen Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2007/06/14 00:18:40 salo Exp $
 
 MOZILLA=		seamonkey-gtk1
-PKGREVISION=		2
 
 COMMENT=		Full featured gecko-based browser built with GTK1
 
diff --git a/www/seamonkey-gtk1/PLIST b/www/seamonkey-gtk1/PLIST
index 47c501c8d28..e7794af4e72 100644
--- a/www/seamonkey-gtk1/PLIST
+++ b/www/seamonkey-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/03/07 21:32:56 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2007/06/14 00:18:40 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -359,10 +359,6 @@ lib/${MOZILLA}/components/xuldoc.xpt
 lib/${MOZILLA}/components/xultmpl.xpt
 lib/${MOZILLA}/defaults/autoconfig/platform.js
 lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
-lib/${MOZILLA}/defaults/isp/US/movemail.rdf
-lib/${MOZILLA}/defaults/isp/movemail.rdf
-lib/${MOZILLA}/defaults/messenger/SpamAssassin.sfd
-lib/${MOZILLA}/defaults/messenger/SpamPal.sfd
 lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
 lib/${MOZILLA}/defaults/messenger/mailViews.dat
 lib/${MOZILLA}/defaults/pref/browser-prefs.js
@@ -403,6 +399,9 @@ lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
 lib/${MOZILLA}/install.rdf
+lib/${MOZILLA}/isp/SpamAssassin.sfd
+lib/${MOZILLA}/isp/SpamPal.sfd
+lib/${MOZILLA}/isp/movemail.rdf
 @comment libfreebl.chk
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
@@ -1839,6 +1838,7 @@ include/${MOZILLA}/msgcompose/nsIMsgComposeProgressParams.h
 include/${MOZILLA}/msgcompose/nsIMsgComposeSecure.h
 include/${MOZILLA}/msgcompose/nsIMsgComposeService.h
 include/${MOZILLA}/msgcompose/nsIMsgQuote.h
+include/${MOZILLA}/msgcompose/nsIMsgQuotingOutputStreamListener.h
 include/${MOZILLA}/msgcompose/nsIMsgRecipientArray.h
 include/${MOZILLA}/msgcompose/nsIMsgSend.h
 include/${MOZILLA}/msgcompose/nsIMsgSendLater.h
@@ -3056,6 +3056,7 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/res/dtd
 @dirrm lib/${MOZILLA}/res
 @dirrm lib/${MOZILLA}/plugins
+@dirrm lib/${MOZILLA}/isp
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/icons
 @dirrm lib/${MOZILLA}/greprefs
@@ -3068,8 +3069,6 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/defaults/pref
 @dirrm lib/${MOZILLA}/defaults/messenger/US
 @dirrm lib/${MOZILLA}/defaults/messenger
-@dirrm lib/${MOZILLA}/defaults/isp/US
-@dirrm lib/${MOZILLA}/defaults/isp
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
 @dirrm lib/${MOZILLA}/components
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 615009cb06a..09b55d0a94b 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2007/03/31 22:51:24 ghen Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2007/06/14 00:18:38 salo Exp $
 
 MOZILLA=		seamonkey
-PKGREVISION=		2
 
 COMMENT=		Full featured gecko-based browser
 
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index 8a4beaae806..997d18f2607 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.9 2007/03/05 11:46:21 ghen Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.9.2.1 2007/06/14 00:18:38 salo Exp $
 
 MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.1.1
+MOZ_VER=		1.1.2
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		seamonkey-${MOZ_DIST_VER}.source
 
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index 19daa3c8938..149c1662f04 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/03/07 21:32:56 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2007/06/14 00:18:38 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -366,10 +366,6 @@ lib/${MOZILLA}/components/xuldoc.xpt
 lib/${MOZILLA}/components/xultmpl.xpt
 lib/${MOZILLA}/defaults/autoconfig/platform.js
 lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
-lib/${MOZILLA}/defaults/isp/US/movemail.rdf
-lib/${MOZILLA}/defaults/isp/movemail.rdf
-lib/${MOZILLA}/defaults/messenger/SpamAssassin.sfd
-lib/${MOZILLA}/defaults/messenger/SpamPal.sfd
 lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
 lib/${MOZILLA}/defaults/messenger/mailViews.dat
 lib/${MOZILLA}/defaults/pref/browser-prefs.js
@@ -409,6 +405,9 @@ lib/${MOZILLA}/greprefs/security-prefs.js
 lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/init.d/README
 lib/${MOZILLA}/install.rdf
+lib/${MOZILLA}/isp/SpamAssassin.sfd
+lib/${MOZILLA}/isp/SpamPal.sfd
+lib/${MOZILLA}/isp/movemail.rdf
 @comment libfreebl.chk
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
@@ -1849,6 +1848,7 @@ include/${MOZILLA}/msgcompose/nsIMsgComposeProgressParams.h
 include/${MOZILLA}/msgcompose/nsIMsgComposeSecure.h
 include/${MOZILLA}/msgcompose/nsIMsgComposeService.h
 include/${MOZILLA}/msgcompose/nsIMsgQuote.h
+include/${MOZILLA}/msgcompose/nsIMsgQuotingOutputStreamListener.h
 include/${MOZILLA}/msgcompose/nsIMsgRecipientArray.h
 include/${MOZILLA}/msgcompose/nsIMsgSend.h
 include/${MOZILLA}/msgcompose/nsIMsgSendLater.h
@@ -3066,6 +3066,7 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/res/dtd
 @dirrm lib/${MOZILLA}/res
 @dirrm lib/${MOZILLA}/plugins
+@dirrm lib/${MOZILLA}/isp
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/greprefs
 @dirrm lib/${MOZILLA}/dictionaries
@@ -3077,8 +3078,6 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/defaults/pref
 @dirrm lib/${MOZILLA}/defaults/messenger/US
 @dirrm lib/${MOZILLA}/defaults/messenger
-@dirrm lib/${MOZILLA}/defaults/isp/US
-@dirrm lib/${MOZILLA}/defaults/isp
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
 @dirrm lib/${MOZILLA}/components
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 9880e9c5ce6..ce5eec6430d 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2007/03/05 11:46:21 ghen Exp $
+$NetBSD: distinfo,v 1.20.2.1 2007/06/14 00:18:39 salo Exp $
 
-SHA1 (seamonkey-1.1.1.source.tar.bz2) = 08a6a66a1e69e112680e8ad2116c54d7ccb54c3b
-RMD160 (seamonkey-1.1.1.source.tar.bz2) = 65f029523e9e44d1fb6c3308c8caa90ab321792f
-Size (seamonkey-1.1.1.source.tar.bz2) = 34995363 bytes
+SHA1 (seamonkey-1.1.2.source.tar.bz2) = d0aa219b54a54cd75e690a458280b0d12bcf9607
+RMD160 (seamonkey-1.1.2.source.tar.bz2) = aa681ebe1e68ab8fba0d04e3c0c0434b65e6f1ad
+Size (seamonkey-1.1.2.source.tar.bz2) = 35220020 bytes
 SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
-SHA1 (patch-ab) = 84409c0d9bfd3749434fb51d93b310580df8e608
+SHA1 (patch-ab) = b83dc786559d010f9bbb1adde697975166e0735e
 SHA1 (patch-ac) = b05971f672c83c80a29edc69c2055fd6ca855fa1
 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
@@ -43,7 +43,7 @@ SHA1 (patch-cj) = 8716afb433a9cab1202cd39db1611ec784859c43
 SHA1 (patch-ck) = 157fad436bb71795e5ff4b6b8efb26f7f6a84e90
 SHA1 (patch-cl) = 0c6d7f86739ec8cb805d8ddc0034a421488274bc
 SHA1 (patch-cm) = f3de952dd8eedfb5e4a11a2b05500d37890b13f5
-SHA1 (patch-cn) = 50ce66acc8df8cab48f281b93ae74edcaf939d21
+SHA1 (patch-cn) = 87390175d5a33026988d5049e1fb9b0aa21885bc
 SHA1 (patch-da) = 356e37429832ffd296fa79b9aa7ef20c05d851e0
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index 67ccd4e5ad9..13c26e9aea2 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2007/01/20 10:54:44 ghen Exp $
+$NetBSD: patch-ab,v 1.6.2.1 2007/06/14 00:18:39 salo Exp $
 
 --- configure.in.orig	2007-01-11 19:45:06.000000000 +0100
 +++ configure.in
@@ -48,7 +48,7 @@ $NetBSD: patch-ab,v 1.6 2007/01/20 10:54:44 ghen Exp $
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
 -       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
-+       DSO_LDOPTS='-G -z,muldefs'
++       DSO_LDOPTS='-G -z muldefs'
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
diff --git a/www/seamonkey/patches/patch-cn b/www/seamonkey/patches/patch-cn
index f1ad01964d1..20659f4a0a0 100644
--- a/www/seamonkey/patches/patch-cn
+++ b/www/seamonkey/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
+$NetBSD: patch-cn,v 1.2.6.1 2007/06/14 00:18:39 salo Exp $
 
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2006-06-13 22:58:31.000000000 +0200
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2007-05-03 03:37:36.000000000 +0200
 +++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
 @@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          res = (res/i);
@@ -20,16 +20,16 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
        nsresult rv = xformsService->GetDaysFromDateTime(date, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -222,7 +222,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -211,7 +211,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 index = 0;
 -      double res = Double::NaN;
 +      double res = Double::NaN();
-       rv = xformsService->GetRepeatIndex(repeatEle, &index);
+       rv = xformsService->GetRepeatIndexById(mResolverNode, indexId, &index);
        NS_ENSURE_SUCCESS(rv, rv);
  
-@@ -354,7 +354,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -344,7 +344,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -38,7 +38,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -362,7 +362,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -352,7 +352,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -47,7 +47,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
            break;
          }
          if (test > res || i == 0) {
-@@ -382,7 +382,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -372,7 +372,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -56,7 +56,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -390,7 +390,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -380,7 +380,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -65,7 +65,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
            break;
          }
          if ((test < res) || (i==0)) {
-@@ -413,7 +413,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -403,7 +403,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 result = 0;
@@ -74,7 +74,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
        nsresult rv = xformsService->GetMonths(duration, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -489,7 +489,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -479,7 +479,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }
@@ -83,7 +83,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/31 11:58:04 ghen Exp $
        }
  
        return aContext->recycler()->getNumberResult(res, aResult);
-@@ -514,7 +514,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -504,7 +504,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }