Pullup ticket 1907 - requested by ghen

security update for seamonkey

Revisions pulled up:
- pkgsrc/www/seamonkey/Makefile				1.11, 1.12, 1.13
- pkgsrc/www/seamonkey/Makefile-seamonkey.common	1.2
- pkgsrc/www/seamonkey/distinfo				1.11, 1.12, 1.13, 1.14
- pkgsrc/www/seamonkey/patches/patch-ai			1.2
- pkgsrc/www/seamonkey/patches/patch-at			1.1
- pkgsrc/www/seamonkey/patches/patch-ec			1.1
- pkgsrc/www/seamonkey-bin/Makefile			1.9
- pkgsrc/www/seamonkey-bin/distinfo			1.7

   Module Name:		pkgsrc
   Committed By:	markd
   Date:		Thu Oct 19 10:25:36 UTC 2006

   Modified Files:
   	pkgsrc/www/seamonkey: Makefile distinfo
   	pkgsrc/www/seamonkey/patches: patch-ai

   Log Message:
   Fix crash after printing caused by trying to destroy the same charset
   structure multiple times.  Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Fri Oct 20 10:28:51 UTC 2006

   Modified Files:
   	pkgsrc/www/seamonkey: distinfo
   Added Files:
   	pkgsrc/www/seamonkey/patches: patch-ec

   Log Message:
   Fixed "test ==".
--
   Module Name:		pkgsrc
   Committed By:	markd
   Date:		Mon Oct 23 10:49:35 UTC 2006

   Modified Files:
   	pkgsrc/www/seamonkey: Makefile distinfo
   Added Files:
   	pkgsrc/www/seamonkey/patches: patch-at

   Log Message:
   thunderbird's ldap doesn't work talking to an ipv4 ldap server if
   talking to ipv4 addresses using ipv6 addresses isn't allowed, which is
   the default on NetBSD.  Patch to use a v4 socket when talking to an ipv4
   ldap server.  Fixes my PR 33511.
   seamonkey/firefox/sunbird have the same code so make the same patch.
   OKed ghen.  Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Wed Nov  8 14:39:16 UTC 2006

   Modified Files:
   	pkgsrc/www/seamonkey: Makefile Makefile-seamonkey.common distinfo
   	pkgsrc/www/seamonkey-bin: Makefile distinfo

   Log Message:
   Update seamonkey, seamonkey-bin and seamonkey-gtk1 to 1.0.6.  Fixed in this version:

   MFSA 2006-67 Running Script can be recompiled
   MFSA 2006-66 RSA signature forgery (variant)
   MFSA 2006-65 Crashes with evidence of memory corruption (rv:1.8.0.8)

   For more info, see http://www.mozilla.org/projects/seamonkey/releases/seamonkey1.0.6/README.html

8 files changed, 80 insertions, 21 deletions

diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index c90f366884f..af4e49150cb 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/09/24 16:35:39 salo Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2006/11/09 11:49:00 salo Exp $
 
 MOZILLA=		seamonkey
-MOZ_VER=		1.0.5
+MOZ_VER=		1.0.6
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey
diff --git a/www/seamonkey-bin/distinfo b/www/seamonkey-bin/distinfo
index e04247635da..a8a19da5d92 100644
--- a/www/seamonkey-bin/distinfo
+++ b/www/seamonkey-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/09/15 09:24:30 ghen Exp $
+$NetBSD: distinfo,v 1.6.2.1 2006/11/09 11:49:00 salo Exp $
 
-SHA1 (seamonkey/releases/1.0.5/seamonkey-1.0.5.en-US.linux-i686.tar.gz) = f2c976a1176734ef09fb6b2fa1465911cba21f00
-RMD160 (seamonkey/releases/1.0.5/seamonkey-1.0.5.en-US.linux-i686.tar.gz) = 8796e4b26fc59439487b3064bd6a328636906d97
-Size (seamonkey/releases/1.0.5/seamonkey-1.0.5.en-US.linux-i686.tar.gz) = 14148966 bytes
+SHA1 (seamonkey/releases/1.0.6/seamonkey-1.0.6.en-US.linux-i686.tar.gz) = 1f0ce09678e60608a9232bb757ae86610e21b43a
+RMD160 (seamonkey/releases/1.0.6/seamonkey-1.0.6.en-US.linux-i686.tar.gz) = 505af01a9ceeebaee7a211a592d814270f8c038a
+Size (seamonkey/releases/1.0.6/seamonkey-1.0.6.en-US.linux-i686.tar.gz) = 14152343 bytes
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 4691bb57153..8eecd917e8f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/09/26 22:21:32 salo Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2006/11/09 11:49:00 salo Exp $
 
 MOZILLA=		seamonkey
-PKGREVISION=		1
 
 COMMENT=		Full featured gecko-based browser
 
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index c8f789d2243..1df0631993b 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.1 2006/09/26 22:21:32 salo Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.1.2.1 2006/11/09 11:49:00 salo Exp $
 
 MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.0.5
+MOZ_VER=		1.0.6
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		seamonkey-${MOZ_DIST_VER}.source
 
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index df532e8d470..fa41f5e1eec 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/09/15 15:54:04 ghen Exp $
+$NetBSD: distinfo,v 1.10.2.1 2006/11/09 11:49:00 salo Exp $
 
-SHA1 (seamonkey-1.0.5.source.tar.bz2) = 60be0112e369a06958c0295ad2de995ab476cef1
-RMD160 (seamonkey-1.0.5.source.tar.bz2) = 9f99f4a542c3a4e1c7e054e73c9ca08cd7252e63
-Size (seamonkey-1.0.5.source.tar.bz2) = 35886383 bytes
+SHA1 (seamonkey-1.0.6.source.tar.bz2) = 01c8de239518bfe778978062efd85b050380b5e3
+RMD160 (seamonkey-1.0.6.source.tar.bz2) = 61ba4a30c28d857f6f64649879ba12d64001c7a6
+Size (seamonkey-1.0.6.source.tar.bz2) = 35900661 bytes
 SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
 SHA1 (patch-ab) = 4bcabb447ca151c5e87e8799398ee239e69f3f90
 SHA1 (patch-ac) = b05971f672c83c80a29edc69c2055fd6ca855fa1
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
 SHA1 (patch-af) = 4844013ad49c77b87be7c30931ca786f246b40f3
 SHA1 (patch-ag) = eaebefa81d03b2ebc8a32465f59889d92944d750
 SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
-SHA1 (patch-ai) = 89b0fb6fb691a6d40e7f1a5bdc8335d63e491c7b
+SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
 SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf
 SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32
 SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612
@@ -19,6 +19,7 @@ SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
 SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
 SHA1 (patch-ap) = 856f74f774b4db7df9b4453aea4d849893ee6bf1
 SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43
+SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
 SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e
 SHA1 (patch-ax) = b32483c5259cbe95202944683889bf20a7c1650e
 SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190
@@ -60,3 +61,4 @@ SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-dw) = 263a64d06c6b62041c62ed4532858339d37e1873
+SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
diff --git a/www/seamonkey/patches/patch-ai b/www/seamonkey/patches/patch-ai
index d307f181584..ffc7258a0f9 100644
--- a/www/seamonkey/patches/patch-ai
+++ b/www/seamonkey/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ai,v 1.1.1.1.4.1 2006/11/09 11:49:00 salo Exp $
 
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	2005-04-28 10:04:00.000000000 +0200
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	2006-05-07 14:01:25.000000000 +1200
 +++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
+ 
+         fontps *fps = new fontps;
+         fps->entry = xftEntry;
+-        fps->charset = fc_charset;
++        fps->charset = FcCharSetCopy (fc_charset);
+         fps->fontps = nsnull;
+         fpi.fontps->AppendElement(fps);
+     }
+@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -17,7 +26,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
    if (!face)
      return 0;
  
@@ -26,7 +35,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -37,7 +46,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont
+@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    
diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at
new file mode 100644
index 00000000000..ea3772965d1
--- /dev/null
+++ b/www/seamonkey/patches/patch-at
@@ -0,0 +1,36 @@
+$NetBSD: patch-at,v 1.1.2.2 2006/11/09 11:49:00 salo Exp $
+
+--- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig	2006-05-25 11:38:04.000000000 +1200
++++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
+@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
+      * Set up address and open a TCP socket:
+      */
+     if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
+-		PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) { 
++		PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) { 
+ 	return( -1 );
+     }
+ 
+     if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
+-		PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
++		PR_NetAddrFamily( addrp ))) == NULL ) {
+ 	return( -1 );
+     }
+ 
+@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
+ 
+ 	if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
+ 		
+-		if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
++		/*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
+ 				PR_AF_INET == PR_NetAddrFamily( &addr )) {
+ 			PRUint32	ipv4ip = addr.inet.ip;
+ 			memset( &addr, 0, sizeof(addr));
+ 			PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
+ 			addr.ipv6.family = PR_AF_INET6;
+ 			
+-		}
++		}*/
+ 	    rc = prldap_try_one_address( prsockp, &addr, port,
+ 			timeout, options );
+ 	} else {
diff --git a/www/seamonkey/patches/patch-ec b/www/seamonkey/patches/patch-ec
new file mode 100644
index 00000000000..ca48a78b9f1
--- /dev/null
+++ b/www/seamonkey/patches/patch-ec
@@ -0,0 +1,13 @@
+$NetBSD: patch-ec,v 1.1.2.2 2006/11/09 11:49:00 salo Exp $
+
+--- build/autoconf/mozconfig2configure.orig	2006-02-22 16:41:28.000000000 +0000
++++ build/autoconf/mozconfig2configure
+@@ -79,7 +79,7 @@ ac_add_options() {
+ ac_add_app_options() {
+   APP=$1
+   shift;
+-  if [ "$APP" == "$MOZ_BUILD_APP" ]; then
++  if [ "$APP" = "$MOZ_BUILD_APP" ]; then
+       ac_add_options "$*";
+   fi
+ }