Thu Jun 24 12:20:38 2010 UTC ()
Security update of firefox & xulrunner to 3.6.4 (1.9.1.2).

MFSA 2010-33 User tracking across sites using Math.random()
MFSA 2010-32 Content-Disposition: attachment ignored
               if Content-Type: multipart also present
MFSA 2010-31 focus() behavior can be used to inject or steal keystrokes
MFSA 2010-30 Integer Overflow in XSLT Node Sorting
MFSA 2010-29 Heap buffer overflow in nsGenericDOMDataNode::SetTextInternal
MFSA 2010-28 Freed object reuse across plugin instances
MFSA 2010-26 Crashes with evidence of memory corruption


(tnn)
diff -r1.21 -r1.22 pkgsrc/devel/xulrunner/PLIST
diff -r1.10 -r1.11 pkgsrc/devel/xulrunner/dist.mk
diff -r1.32 -r1.33 pkgsrc/devel/xulrunner/distinfo
diff -r1.14 -r1.15 pkgsrc/devel/xulrunner/mozilla-common.mk
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-aj
diff -r1.74 -r1.75 pkgsrc/www/firefox/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/devel/xulrunner/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/PLIST 2010/04/26 12:47:08 1.21
+++ pkgsrc/devel/xulrunner/Attic/PLIST 2010/06/24 12:20:38 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2010/04/26 12:47:08 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.22 2010/06/24 12:20:38 tnn Exp $
2bin/xulrunner 2bin/xulrunner
3${PLIST.jit}include/xulrunner/Allocator.h 3${PLIST.jit}include/xulrunner/Allocator.h
4${PLIST.jit}include/xulrunner/Assembler.h 4${PLIST.jit}include/xulrunner/Assembler.h
5${PLIST.jit}include/xulrunner/CodeAlloc.h 5${PLIST.jit}include/xulrunner/CodeAlloc.h
6${PLIST.jit}include/xulrunner/Containers.h 6${PLIST.jit}include/xulrunner/Containers.h
7${PLIST.jit}include/xulrunner/Fragmento.h 7${PLIST.jit}include/xulrunner/Fragmento.h
8include/xulrunner/ImageErrors.h 8include/xulrunner/ImageErrors.h
9include/xulrunner/ImageLogging.h 9include/xulrunner/ImageLogging.h
10${PLIST.jit}include/xulrunner/LIR.h 10${PLIST.jit}include/xulrunner/LIR.h
11include/xulrunner/NSReg.h 11include/xulrunner/NSReg.h
12${PLIST.jit}include/xulrunner/Native.h 12${PLIST.jit}include/xulrunner/Native.h
13${PLIST.jit}include/xulrunner/Native${NANOJIT_ARCH}.h 13${PLIST.jit}include/xulrunner/Native${NANOJIT_ARCH}.h
14${PLIST.jit}include/xulrunner/RegAlloc.h 14${PLIST.jit}include/xulrunner/RegAlloc.h
@@ -219,26 +219,28 @@ include/xulrunner/mozIStorageStatementCa @@ -219,26 +219,28 @@ include/xulrunner/mozIStorageStatementCa
219include/xulrunner/mozIStorageStatementWrapper.h 219include/xulrunner/mozIStorageStatementWrapper.h
220include/xulrunner/mozIStorageValueArray.h 220include/xulrunner/mozIStorageValueArray.h
221include/xulrunner/mozITXTToHTMLConv.h 221include/xulrunner/mozITXTToHTMLConv.h
222include/xulrunner/mozStorage.h 222include/xulrunner/mozStorage.h
223include/xulrunner/mozStorageCID.h 223include/xulrunner/mozStorageCID.h
224include/xulrunner/mozStorageHelper.h 224include/xulrunner/mozStorageHelper.h
225include/xulrunner/mozcontainer.h 225include/xulrunner/mozcontainer.h
226include/xulrunner/mozilla-config.h 226include/xulrunner/mozilla-config.h
227include/xulrunner/mozilla/BlockingResourceBase.h 227include/xulrunner/mozilla/BlockingResourceBase.h
228include/xulrunner/mozilla/CondVar.h 228include/xulrunner/mozilla/CondVar.h
229include/xulrunner/mozilla/DeadlockDetector.h 229include/xulrunner/mozilla/DeadlockDetector.h
230include/xulrunner/mozilla/Monitor.h 230include/xulrunner/mozilla/Monitor.h
231include/xulrunner/mozilla/Mutex.h 231include/xulrunner/mozilla/Mutex.h
 232include/xulrunner/mozilla/PluginLibrary.h
 233include/xulrunner/mozilla/PluginPRLibrary.h
232include/xulrunner/mozilla/TimeStamp.h 234include/xulrunner/mozilla/TimeStamp.h
233include/xulrunner/mozilla/XPCOM.h 235include/xulrunner/mozilla/XPCOM.h
234include/xulrunner/mozilla/storage.h 236include/xulrunner/mozilla/storage.h
235include/xulrunner/mozilla/storage/Variant.h 237include/xulrunner/mozilla/storage/Variant.h
236include/xulrunner/mozilla/storage/Variant_inl.h 238include/xulrunner/mozilla/storage/Variant_inl.h
237include/xulrunner/mozpngconf.h 239include/xulrunner/mozpngconf.h
238${PLIST.jit}include/xulrunner/nanojit.h 240${PLIST.jit}include/xulrunner/nanojit.h
239include/xulrunner/necko-config.h 241include/xulrunner/necko-config.h
240include/xulrunner/netCore.h 242include/xulrunner/netCore.h
241include/xulrunner/npapi.h 243include/xulrunner/npapi.h
242include/xulrunner/npfunctions.h 244include/xulrunner/npfunctions.h
243include/xulrunner/npruntime.h 245include/xulrunner/npruntime.h
244include/xulrunner/nptypes.h 246include/xulrunner/nptypes.h
@@ -2235,26 +2237,27 @@ ${PLIST.gnome}lib/xulrunner/components/l @@ -2235,26 +2237,27 @@ ${PLIST.gnome}lib/xulrunner/components/l
2235${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so 2237${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
2236lib/xulrunner/components/nsAddonRepository.js 2238lib/xulrunner/components/nsAddonRepository.js
2237lib/xulrunner/components/nsBadCertHandler.js 2239lib/xulrunner/components/nsBadCertHandler.js
2238lib/xulrunner/components/nsBlocklistService.js 2240lib/xulrunner/components/nsBlocklistService.js
2239lib/xulrunner/components/nsContentDispatchChooser.js 2241lib/xulrunner/components/nsContentDispatchChooser.js
2240lib/xulrunner/components/nsContentPrefService.js 2242lib/xulrunner/components/nsContentPrefService.js
2241lib/xulrunner/components/nsDefaultCLH.js 2243lib/xulrunner/components/nsDefaultCLH.js
2242lib/xulrunner/components/nsDownloadManagerUI.js 2244lib/xulrunner/components/nsDownloadManagerUI.js
2243lib/xulrunner/components/nsExtensionManager.js 2245lib/xulrunner/components/nsExtensionManager.js
2244lib/xulrunner/components/nsFilePicker.js 2246lib/xulrunner/components/nsFilePicker.js
2245lib/xulrunner/components/nsFormAutoComplete.js 2247lib/xulrunner/components/nsFormAutoComplete.js
2246lib/xulrunner/components/nsHandlerService.js 2248lib/xulrunner/components/nsHandlerService.js
2247lib/xulrunner/components/nsHelperAppDlg.js 2249lib/xulrunner/components/nsHelperAppDlg.js
 2250lib/xulrunner/components/nsINIProcessor.js
2248lib/xulrunner/components/nsLivemarkService.js 2251lib/xulrunner/components/nsLivemarkService.js
2249lib/xulrunner/components/nsLoginInfo.js 2252lib/xulrunner/components/nsLoginInfo.js
2250lib/xulrunner/components/nsLoginManager.js 2253lib/xulrunner/components/nsLoginManager.js
2251lib/xulrunner/components/nsLoginManagerPrompter.js 2254lib/xulrunner/components/nsLoginManagerPrompter.js
2252lib/xulrunner/components/nsPlacesAutoComplete.js 2255lib/xulrunner/components/nsPlacesAutoComplete.js
2253lib/xulrunner/components/nsPlacesDBFlush.js 2256lib/xulrunner/components/nsPlacesDBFlush.js
2254lib/xulrunner/components/nsProgressDialog.js 2257lib/xulrunner/components/nsProgressDialog.js
2255lib/xulrunner/components/nsProxyAutoConfig.js 2258lib/xulrunner/components/nsProxyAutoConfig.js
2256lib/xulrunner/components/nsSearchService.js 2259lib/xulrunner/components/nsSearchService.js
2257lib/xulrunner/components/nsSearchSuggestions.js 2260lib/xulrunner/components/nsSearchSuggestions.js
2258lib/xulrunner/components/nsTaggingService.js 2261lib/xulrunner/components/nsTaggingService.js
2259lib/xulrunner/components/nsTryToClose.js 2262lib/xulrunner/components/nsTryToClose.js
2260lib/xulrunner/components/nsURLFormatter.js 2263lib/xulrunner/components/nsURLFormatter.js
cvs diff -r1.10 -r1.11 pkgsrc/devel/xulrunner/Attic/dist.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/dist.mk 2010/04/02 20:28:24 1.10
+++ pkgsrc/devel/xulrunner/Attic/dist.mk 2010/06/24 12:20:38 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: dist.mk,v 1.10 2010/04/02 20:28:24 tnn Exp $ 1# $NetBSD: dist.mk,v 1.11 2010/06/24 12:20:38 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= .3 11MOZ_BRANCH_MINOR= .4
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.32 -r1.33 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2010/04/26 13:41:06 1.32
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2010/06/24 12:20:38 1.33
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.32 2010/04/26 13:41:06 tnn Exp $ 1$NetBSD: distinfo,v 1.33 2010/06/24 12:20:38 tnn Exp $
2 2
3SHA1 (firefox-3.6.3.source.tar.bz2) = f3bcd808356d16bdb26bfcf1a64a251488c4fd02 3SHA1 (firefox-3.6.4.source.tar.bz2) = c73e4cf4a8e55b5a192fe59d38bef1d06f43e842
4RMD160 (firefox-3.6.3.source.tar.bz2) = de556e8606bbc61cb7d20fe6f308f0c5e8b9dd77 4RMD160 (firefox-3.6.4.source.tar.bz2) = b36d31d35f2fc0d6f793b4d4e3f3069e55d9e1ad
5Size (firefox-3.6.3.source.tar.bz2) = 48633061 bytes 5Size (firefox-3.6.4.source.tar.bz2) = 51082341 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) = 62e55040130d5e6cfb10b839fce6abd40a902f08 12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0 15SHA1 (patch-aj) = 423e8915f6e6a166bf3bcbc00c22d590821d6e97
16SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c 16SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c
17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57 17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57
18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
20SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 20SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
21SHA1 (patch-ap) = dbcf27b23fec35ea838d281a97c7aed94739c8b5 21SHA1 (patch-ap) = dbcf27b23fec35ea838d281a97c7aed94739c8b5
22SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55 22SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55
23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b 23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41 24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536 25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76 26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657 28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657
cvs diff -r1.14 -r1.15 pkgsrc/devel/xulrunner/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2010/04/28 09:37:28 1.14
+++ pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2010/06/24 12:20:38 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.14 2010/04/28 09:37:28 tnn Exp $ 1# $NetBSD: mozilla-common.mk,v 1.15 2010/06/24 12:20:38 tnn Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 1.9.1. 3# common Makefile fragment for mozilla packages based on gecko 1.9.1.
4#  4#
5# used by devel/xulrunner/Makefile 5# used by devel/xulrunner/Makefile
6# used by mail/thunderbird/Makefile 6# used by mail/thunderbird/Makefile
7# used by www/firefox/Makefile 7# used by www/firefox/Makefile
8# used by www/seamonkey/Makefile 8# used by www/seamonkey/Makefile
9 9
10GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
11USE_TOOLS+= pkg-config perl gmake autoconf213 11USE_TOOLS+= pkg-config perl gmake autoconf213
12USE_LANGUAGES+= c99 c++ 12USE_LANGUAGES+= c99 c++
13UNLIMIT_RESOURCES+= datasize 13UNLIMIT_RESOURCES+= datasize
14 14
@@ -23,26 +23,27 @@ CONFIGURE_ARGS+= --disable-tests --disab @@ -23,26 +23,27 @@ CONFIGURE_ARGS+= --disable-tests --disab
23CONFIGURE_ARGS+= --enable-crypto 23CONFIGURE_ARGS+= --enable-crypto
24CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads 24CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads
25CONFIGURE_ARGS+= --disable-javaxpcom 25CONFIGURE_ARGS+= --disable-javaxpcom
26CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 26CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
27CONFIGURE_ARGS+= --enable-svg --enable-mathml 27CONFIGURE_ARGS+= --enable-svg --enable-mathml
28CONFIGURE_ARGS+= --enable-system-cairo 28CONFIGURE_ARGS+= --enable-system-cairo
29CONFIGURE_ARGS+= --with-system-jpeg 29CONFIGURE_ARGS+= --with-system-jpeg
30CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2 30CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
31CONFIGURE_ARGS+= --enable-system-sqlite 31CONFIGURE_ARGS+= --enable-system-sqlite
32CONFIGURE_ARGS+= --disable-crashreporter 32CONFIGURE_ARGS+= --disable-crashreporter
33CONFIGURE_ARGS+= --disable-installer 33CONFIGURE_ARGS+= --disable-installer
34CONFIGURE_ARGS+= --disable-libnotify 34CONFIGURE_ARGS+= --disable-libnotify
35CONFIGURE_ARGS+= --disable-necko-wifi 35CONFIGURE_ARGS+= --disable-necko-wifi
 36CONFIGURE_ARGS+= --disable-ipc # no chromium platform support on BSD
36 37
37SUBST_CLASSES+= fix-paths 38SUBST_CLASSES+= fix-paths
38SUBST_STAGE.fix-paths= pre-configure 39SUBST_STAGE.fix-paths= pre-configure
39SUBST_MESSAGE.fix-paths= Fixing absolute paths. 40SUBST_MESSAGE.fix-paths= Fixing absolute paths.
40SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h 41SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h
41SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xulrunner/app/nsRegisterGREUnix.cpp 42SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xulrunner/app/nsRegisterGREUnix.cpp
42SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xulrunner/installer/Makefile.in 43SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xulrunner/installer/Makefile.in
43SUBST_FILES.fix-paths+= ${MOZILLA_DIR}extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java 44SUBST_FILES.fix-paths+= ${MOZILLA_DIR}extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
44SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 45SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
45SUBST_SED.fix-paths= -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner/gre.d,g' 46SUBST_SED.fix-paths= -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner/gre.d,g'
46SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 47SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
47 48
48CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 49CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-aj 2009/08/05 02:59:48 1.1.1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-aj 2010/06/24 12:20:38 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-aj,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ 1$NetBSD: patch-aj,v 1.2 2010/06/24 12:20:38 tnn Exp $
2 2
3--- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2009-06-29 18:15:11.000000000 +0200 3--- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2010-04-13 22:22:54.000000000 +0000
4+++ profile/dirserviceprovider/src/nsProfileLock.cpp 4+++ profile/dirserviceprovider/src/nsProfileLock.cpp
5@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink( 5@@ -396,6 +396,7 @@ nsresult nsProfileLock::LockWithSymlink(
6 act.sa_flags = 0; 6 act.sa_flags = SA_SIGINFO;
7 sigfillset(&act.sa_mask); 7 sigfillset(&act.sa_mask);
8  8
9+#ifndef DEBUG 9+#ifndef DEBUG
10 #define CATCH_SIGNAL(signame) \ 10 #define CATCH_SIGNAL(signame) \
11 PR_BEGIN_MACRO \ 11 PR_BEGIN_MACRO \
12 if (sigaction(signame, NULL, &oldact) == 0 && \ 12 if (sigaction(signame, NULL, &oldact) == 0 && \
13@@ -409,6 +410,7 @@ PR_BEGIN_MACRO  13@@ -414,6 +415,7 @@ PR_BEGIN_MACRO
14 CATCH_SIGNAL(SIGTERM); 14 CATCH_SIGNAL(SIGTERM);
15  15
16 #undef CATCH_SIGNAL 16 #undef CATCH_SIGNAL
17+#endif 17+#endif
18 } 18 }
19 } 19 }
20 } 20 }
cvs diff -r1.74 -r1.75 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2010/06/13 22:45:33 1.74
+++ pkgsrc/www/firefox/Makefile 2010/06/24 12:20:38 1.75
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.74 2010/06/13 22:45:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.75 2010/06/24 12:20:38 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