Sat Mar 5 11:57:17 2011 UTC ()
Stability & security update of firefox to 3.6.15.

MFSA 2011-10 CSRF risk with plugins and 307 redirects
MFSA 2011-09 Crash caused by corrupted JPEG image
MFSA 2011-08 ParanoidFragmentSink allows javascript: URLs in chrome documents
MFSA 2011-07 Memory corruption during text run construction (Windows)
MFSA 2011-06 Use-after-free error using Web Workers
MFSA 2011-05 Buffer overflow in JavaScript atom map
MFSA 2011-04 Buffer overflow in JavaScript upvarMap
MFSA 2011-03 Use-after-free error in JSON.stringify
MFSA 2011-02 Recursive eval call causes confirm dialogs to evaluate to true
MFSA 2011-01 Miscellaneous memory safety hazards (rv:1.9.2.14/ 1.9.1.17)


(tnn)
diff -r1.47 -r1.48 pkgsrc/devel/xulrunner/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/xulrunner/dist.mk
diff -r1.39 -r1.40 pkgsrc/devel/xulrunner/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/xulrunner/patches/patch-mm
diff -r1.82 -r1.83 pkgsrc/www/firefox/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/devel/xulrunner/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/Makefile 2011/01/23 11:18:27 1.47
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2011/03/05 11:57:16 1.48
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.47 2011/01/23 11:18:27 markd Exp $ 1# $NetBSD: Makefile,v 1.48 2011/03/05 11:57:16 tnn Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
5PKGREVISION= 1 
6CATEGORIES= devel www 5CATEGORIES= devel www
7 6
8MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
10COMMENT= XML User Interface Language runtime environment 9COMMENT= XML User Interface Language runtime environment
11LICENSE= mpl-1.1 10LICENSE= mpl-1.1
12 11
13MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
14 13
15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in 14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
16PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in 15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in
17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 16PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in 17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in
cvs diff -r1.17 -r1.18 pkgsrc/devel/xulrunner/Attic/dist.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/dist.mk 2010/12/11 14:46:29 1.17
+++ pkgsrc/devel/xulrunner/Attic/dist.mk 2011/03/05 11:57:16 1.18
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: dist.mk,v 1.17 2010/12/11 14:46:29 tnn Exp $ 1# $NetBSD: dist.mk,v 1.18 2011/03/05 11:57:16 tnn Exp $
2# 2#
3# used by devel/nspr/Makefile 3# used by devel/nspr/Makefile
4# used by devel/nss/Makefile 4# used by devel/nss/Makefile
5# used by devel/xulrunner/Makefile 5# used by devel/xulrunner/Makefile
6# used by www/firefox/Makefile 6# used by www/firefox/Makefile
7 7
8DISTNAME= firefox-${FIREFOX_VER}.source 8DISTNAME= firefox-${FIREFOX_VER}.source
9FIREFOX_VER= 3.6${MOZ_BRANCH_MINOR} 9FIREFOX_VER= 3.6${MOZ_BRANCH_MINOR}
10MOZ_BRANCH= 1.9.2 10MOZ_BRANCH= 1.9.2
11MOZ_BRANCH_MINOR= .13 11MOZ_BRANCH_MINOR= .15
12MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
16PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches 16PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
17 17
18WRKSRC= ${WRKDIR}/mozilla-${MOZ_BRANCH} 18WRKSRC= ${WRKDIR}/mozilla-${MOZ_BRANCH}
cvs diff -r1.39 -r1.40 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2010/12/11 14:46:29 1.39
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2011/03/05 11:57:16 1.40
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.39 2010/12/11 14:46:29 tnn Exp $ 1$NetBSD: distinfo,v 1.40 2011/03/05 11:57:16 tnn Exp $
2 2
3SHA1 (firefox-3.6.13.source.tar.bz2) = 1d1bc70d651bce4006687f5762638563c0494267 3SHA1 (firefox-3.6.15.source.tar.bz2) = bfb69ae49b2def7482543d4d982fa58993a458e9
4RMD160 (firefox-3.6.13.source.tar.bz2) = 658409db60a8f412ac74ff15a8c1d8c4ed85b71e 4RMD160 (firefox-3.6.15.source.tar.bz2) = faa15978cc8e492833130910c243a585ff78ee3f
5Size (firefox-3.6.13.source.tar.bz2) = 51478675 bytes 5Size (firefox-3.6.15.source.tar.bz2) = 51552828 bytes
6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a 6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
7SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462 7SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d 8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = 890b3d559c55fae75ca91fe742bc104bb8c452db 12SHA1 (patch-ag) = 890b3d559c55fae75ca91fe742bc104bb8c452db
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
15SHA1 (patch-aj) = 423e8915f6e6a166bf3bcbc00c22d590821d6e97 15SHA1 (patch-aj) = 423e8915f6e6a166bf3bcbc00c22d590821d6e97
16SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c 16SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c
17SHA1 (patch-al) = 7f369b954c413bd52f89236c5dfcc237d72150a5 17SHA1 (patch-al) = 7f369b954c413bd52f89236c5dfcc237d72150a5
18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
@@ -35,27 +35,27 @@ SHA1 (patch-be) = 30d3285a10f62c7302b2c2 @@ -35,27 +35,27 @@ SHA1 (patch-be) = 30d3285a10f62c7302b2c2
35SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac 35SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac
36SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90 36SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90
37SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 37SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
38SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905 38SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
39SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 39SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
40SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd 40SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
41SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff 41SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
42SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 42SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
43SHA1 (patch-mh) = a514caf6f6324aa82c4497713547c5e9088d16b9 43SHA1 (patch-mh) = a514caf6f6324aa82c4497713547c5e9088d16b9
44SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b 44SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
45SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f 45SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
46SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 46SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
47SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00 47SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
48SHA1 (patch-mm) = 8e70a87f8c609f504f6d2fa9bfbc91dfbcd289a8 48SHA1 (patch-mm) = 8db6fbb1197147978bce1de5c9b8017ed940efd1
49SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b 49SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b
50SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f 50SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f
51SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865 51SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
52SHA1 (patch-pa) = 7dffaba78ee254a545c3f7669a3eb2a92196becc 52SHA1 (patch-pa) = 7dffaba78ee254a545c3f7669a3eb2a92196becc
53SHA1 (patch-pb) = 9450fe31653c225d529a6ec4d551d0cda464965d 53SHA1 (patch-pb) = 9450fe31653c225d529a6ec4d551d0cda464965d
54SHA1 (patch-pc) = 45a680a5a9f0794f9dd0f6f4dcd7ce704780e939 54SHA1 (patch-pc) = 45a680a5a9f0794f9dd0f6f4dcd7ce704780e939
55SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0 55SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
56SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea 56SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
57SHA1 (patch-ra) = 7dc1ead2756ac8eb9e900dab60f785468df013be 57SHA1 (patch-ra) = 7dc1ead2756ac8eb9e900dab60f785468df013be
58SHA1 (patch-rc) = 9f2e63689123ecbc1767e58e6f5608046dceab1a 58SHA1 (patch-rc) = 9f2e63689123ecbc1767e58e6f5608046dceab1a
59SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72 59SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
60SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201 60SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
61SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965 61SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
cvs diff -r1.3 -r1.4 pkgsrc/devel/xulrunner/patches/Attic/patch-mm (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-mm 2010/09/09 09:41:22 1.3
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mm 2011/03/05 11:57:16 1.4
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1$NetBSD: patch-mm,v 1.3 2010/09/09 09:41:22 tnn Exp $ 1$NetBSD: patch-mm,v 1.4 2011/03/05 11:57:16 tnn Exp $
2 2
3Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman. 3Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
4part of PR pkg/39085 4part of PR pkg/39085
5 5
6--- toolkit/library/Makefile.in.orig 2010-08-24 21:32:11.000000000 +0000 6--- toolkit/library/Makefile.in.orig 2011-02-18 18:33:39.000000000 +0000
7+++ toolkit/library/Makefile.in 7+++ toolkit/library/Makefile.in
8@@ -253,7 +253,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker 8@@ -253,13 +253,20 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
9 endif 9 endif
10  10
11 ifeq ($(OS_ARCH),SunOS) 11 ifeq ($(OS_ARCH),SunOS)
12-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd 12-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
13+EXTRA_DSO_LDOPTS += -lelf -ldemangle 13+EXTRA_DSO_LDOPTS += -lelf -ldemangle
14+ifndef GNU_CC 14+ifndef GNU_CC
15+EXTRA_DSO_LDOPTS += -lCstd 15+EXTRA_DSO_LDOPTS += -lCstd
16+endif 16+endif
17 endif 17 endif
18  18
19 ifeq ($(OS_ARCH),AIX) 19 ifeq ($(OS_ARCH),AIX)
20@@ -262,6 +265,10 @@ EXTRA_DSO_LDOPTS += -bbigtoc  20 EXTRA_DSO_LDOPTS += -bbigtoc
21 endif 
22 endif 21 endif
23  22
24+ifeq ($(OS_ARCH),NetBSD) 23+ifeq ($(OS_ARCH),NetBSD)
25+EXTRA_DSO_LDOPTS += -lossaudio 24+EXTRA_DSO_LDOPTS += -lossaudio
26+endif 25+endif
27+ 26+
28 ifeq ($(OS_ARCH),WINNT) 27 ifeq ($(OS_ARCH),WINNT)
29 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32) 28 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32)
30 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) 29 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
cvs diff -r1.82 -r1.83 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2011/01/13 13:39:37 1.82
+++ pkgsrc/www/firefox/Makefile 2011/03/05 11:57:16 1.83
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.82 2011/01/13 13:39:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.83 2011/03/05 11:57:16 tnn Exp $
2 2
3.include "../../devel/xulrunner/dist.mk" 3.include "../../devel/xulrunner/dist.mk"
4PKGNAME= firefox-${FIREFOX_VER} 4PKGNAME= firefox-${FIREFOX_VER}
5PKGREVISION= 1 
6CATEGORIES= www 5CATEGORIES= www
7 6
8MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 8HOMEPAGE= http://www.mozilla.com/en-US/firefox/
10COMMENT= Web browser with support for extensions 9COMMENT= Web browser with support for extensions
11LICENSE= mpl-1.1 10LICENSE= mpl-1.1
12 11
13MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
14 13
15CONFIGURE_ARGS+= --enable-application=browser 14CONFIGURE_ARGS+= --enable-application=browser
16CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk 15CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
17CONFIGURE_ARGS+= --with-system-libxul 16CONFIGURE_ARGS+= --with-system-libxul
18 17