Update to firefox-3.5.6. Security and bugfix release.

While here, switch NetBSD build from sunaudio to OSS emulation.
This greatly improves HTML5 video playback.
(Yes, we ought to fix the busted sunaudio support or PKG_OPTIONalize this.
 Perhaps another day.)

Advisories relating to this release:
MFSA 2009-71 GeckoActiveXObject exception messages can be used to
             enumerate installed COM objects
MFSA 2009-70 Privilege escalation via chrome window.opener
MFSA 2009-69 Location bar spoofing vulnerabilities
MFSA 2009-68 NTLM reflection vulnerability
MFSA 2009-67 Integer overflow, crash in libtheora video library
MFSA 2009-66 Memory safety fixes in liboggplay media library
MFSA 2009-65 Crashes with evidence of memory corruption (rv:1.9.1.6/ 1.9.0.16)

5 files changed, 26 insertions, 26 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 0ad268ad488..d6b64c813d7 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/11/27 16:59:18 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2009/12/16 08:18:32 tnn Exp $
 #
 
 .include "dist.mk"
 PKGNAME=	${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
-PKGREVISION=	2
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index bbc2a3c8e92..b5b155567e1 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,11 +1,11 @@
-# $NetBSD: dist.mk,v 1.2 2009/11/23 14:16:22 tnn Exp $
+# $NetBSD: dist.mk,v 1.3 2009/12/16 08:18:32 tnn Exp $
 #
 # used by devel/nspr/Makefile
 # used by devel/xulrunner/Makefile
 # used by www/firefox/Makefile
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
-FIREFOX_VER=	3.5.5
+FIREFOX_VER=	3.5.6
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 2c0cee1cfdc..d149ab6c097 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2009/12/11 14:01:22 tnn Exp $
+$NetBSD: distinfo,v 1.21 2009/12/16 08:18:32 tnn Exp $
 
-SHA1 (firefox-3.5.5.source.tar.bz2) = a2146fb6dc8e879a78fa13849f187c14d41442ca
-RMD160 (firefox-3.5.5.source.tar.bz2) = 3c2eb5542e2d34773dc52b07b46dcfcd656e5f0d
-Size (firefox-3.5.5.source.tar.bz2) = 46907137 bytes
+SHA1 (firefox-3.5.6.source.tar.bz2) = fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4
+RMD160 (firefox-3.5.6.source.tar.bz2) = 1002ff196eb8e281c06ef451154b64a903104664
+Size (firefox-3.5.6.source.tar.bz2) = 46914620 bytes
 SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
 SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
@@ -40,9 +40,9 @@ SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
 SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
-SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
+SHA1 (patch-mm) = 51d84cacbfa0430dad21f86f66979b6222299b31
 SHA1 (patch-mn) = 7d162a96959315a143c68b3ca2ca4dea6060f1f2
-SHA1 (patch-mp) = 948786b0b9f781e820dff768f0892897ec42372b
+SHA1 (patch-mp) = 5edb7dbdde20f7aaf5c1bfa035f471ec6d871f95
 SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7
 SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
 SHA1 (patch-pa) = d03ef72ea7efceef5e2f12a245950b9a587ace82
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index 46231e2b25f..ffa844a6c76 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,11 +1,11 @@
-$NetBSD: patch-mm,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-mm,v 1.2 2009/12/16 08:18:33 tnn Exp $
 
 Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
 part of PR pkg/39085
 
---- toolkit/library/Makefile.in.orig	2009-06-29 18:15:25.000000000 +0200
+--- toolkit/library/Makefile.in.orig	2009-12-02 05:28:58.000000000 +0100
 +++ toolkit/library/Makefile.in
-@@ -252,7 +252,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
+@@ -252,7 +252,14 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
  endif
  
  ifeq ($(OS_ARCH),SunOS)
@@ -14,6 +14,10 @@ part of PR pkg/39085
 +ifndef GNU_CC
 +EXTRA_DSO_LDOPTS += -lCstd
 +endif
++endif
++
++ifeq ($(OS_ARCH),NetBSD)
++EXTRA_DSO_LDOPTS += -lossaudio
  endif
  
  ifeq ($(OS_ARCH),WINNT)
diff --git a/devel/xulrunner/patches/patch-mp b/devel/xulrunner/patches/patch-mp
index 403afbee112..1d421c972cb 100644
--- a/devel/xulrunner/patches/patch-mp
+++ b/devel/xulrunner/patches/patch-mp
@@ -1,17 +1,8 @@
-$NetBSD: patch-mp,v 1.2 2009/09/20 15:30:54 sno Exp $
+$NetBSD: patch-mp,v 1.3 2009/12/16 08:18:33 tnn Exp $
 
-Use Sun audio on NetBSD and OSS on DragonFlyBSD and FreeBSD.
-
---- media/libsydneyaudio/src/Makefile.in.orig	2009-08-24 17:52:50.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in	2009-09-20 16:12:16.000000000 +0200
-@@ -71,12 +71,24 @@
- OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
- endif
- 
--ifeq ($(OS_ARCH),SunOS)
-+ifneq (,$(filter SunOS NetBSD,$(OS_ARCH)))
- CSRCS		= \
- 		sydney_audio_sunaudio.c \
+--- media/libsydneyaudio/src/Makefile.in.orig	2009-12-02 05:28:49.000000000 +0100
++++ media/libsydneyaudio/src/Makefile.in
+@@ -77,6 +77,24 @@ CSRCS		= \
  		$(NULL)
  endif
  
@@ -27,6 +18,12 @@ Use Sun audio on NetBSD and OSS on DragonFlyBSD and FreeBSD.
 +		$(NULL)
 +endif
 +
++ifeq ($(OS_ARCH),NetBSD)
++CSRCS		= \
++		sydney_audio_oss.c \
++		$(NULL)
++endif
++		
  ifeq ($(OS_ARCH),WINNT)
  OS_LIBS += winmm.lib
  endif