Sat Aug 29 18:39:34 2020 UTC ()
firefox68: Update to 68.12.0

Security Vulnerabilities fixed in Firefox ESR 68.12

    #CVE-2020-15663: Downgrade attack on the Mozilla Maintenance Service could
    have resulted in escalation of privilege

    #CVE-2020-15664: Attacker-induced prompt for extension installation

    #CVE-2020-15669: Use-After-Free when aborting an operation


(nia)
diff -r1.33 -r1.34 pkgsrc/www/firefox68/Makefile
diff -r1.22 -r1.23 pkgsrc/www/firefox68/distinfo
diff -r1.1 -r1.2 pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk
cvs diff -r1.33 -r1.34 pkgsrc/www/firefox68/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/firefox68/Attic/Makefile 2020/08/18 17:58:16 1.33
+++ pkgsrc/www/firefox68/Attic/Makefile 2020/08/29 18:39:34 1.34
@@ -1,104 +1,103 @@ @@ -1,104 +1,103 @@
1# $NetBSD: Makefile,v 1.33 2020/08/18 17:58:16 leot Exp $ 1# $NetBSD: Makefile,v 1.34 2020/08/29 18:39:34 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 68.11 4MOZ_BRANCH= 68.12
5MOZ_BRANCH_MINOR= .0esr 5MOZ_BRANCH_MINOR= .0esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
9PKGREVISION= 2 
10CATEGORIES= www 9CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
13 12
14MAINTAINER= ryoon@NetBSD.org 13MAINTAINER= ryoon@NetBSD.org
15HOMEPAGE= https://www.mozilla.com/en-US/firefox/ 14HOMEPAGE= https://www.mozilla.com/en-US/firefox/
16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) 15COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//})
17LICENSE= mpl-1.1 16LICENSE= mpl-1.1
18 17
19SUPERSEDES+= firefox60-[0-9]* 18SUPERSEDES+= firefox60-[0-9]*
20 19
21WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:S/esr//} 20WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:S/esr//}
22 21
23MOZILLA_DIR= # empty 22MOZILLA_DIR= # empty
24 23
25# Note: when updating remember to conditionalise about-background.png in PLIST 24# Note: when updating remember to conditionalise about-background.png in PLIST
26CONFIGURE_ARGS+= --enable-application=browser 25CONFIGURE_ARGS+= --enable-application=browser
27 26
28CFLAGS+= -I${PREFIX}/include/nspr 27CFLAGS+= -I${PREFIX}/include/nspr
29# for lang/gcc6 28# for lang/gcc6
30CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS 29CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
31CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 30CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
32 31
33LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} 32LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib 33LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
35LDFLAGS.DragonFly+= -lplc4 -lnspr4 34LDFLAGS.DragonFly+= -lplc4 -lnspr4
36LDFLAGS.FreeBSD+= -lplc4 -lnspr4 35LDFLAGS.FreeBSD+= -lplc4 -lnspr4
37LDFLAGS.Linux+= -lnspr4 36LDFLAGS.Linux+= -lnspr4
38LDFLAGS.SunOS+= -lm 37LDFLAGS.SunOS+= -lm
39 38
40NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/${MOZILLA} 39NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/${MOZILLA}
41NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/${MOZILLA}-bin 40NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/${MOZILLA}-bin
42NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container 41NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container
43 42
44ALL_ENV+= MOZ_APP_NAME=${MOZILLA} 43ALL_ENV+= MOZ_APP_NAME=${MOZILLA}
45 44
46# Avoid ld "invalid section index" errors. 45# Avoid ld "invalid section index" errors.
47BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 46BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
48BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 47BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
49BUILDLINK_TRANSFORM.SunOS+= rm:-pie 48BUILDLINK_TRANSFORM.SunOS+= rm:-pie
50 49
51SUBST_CLASSES+= dfly_malloc_h 50SUBST_CLASSES+= dfly_malloc_h
52SUBST_STAGE.dfly_malloc_h= pre-configure 51SUBST_STAGE.dfly_malloc_h= pre-configure
53SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd 52SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd
54SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' 53SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
55SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c 54SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
56 55
57.include "mozilla-common.mk" 56.include "mozilla-common.mk"
58.include "options.mk" 57.include "options.mk"
59 58
60CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py 59CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py
61CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py 60CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py
62CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py 61CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
63CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py 62CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
64 63
65CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html 64CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
66 65
67MOZILLA= ${PKGBASE} 66MOZILLA= ${PKGBASE}
68MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png 67MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png
69.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 68.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
70MOZILLA_NAME= Firefox 69MOZILLA_NAME= Firefox
71.else 70.else
72MOZILLA_NAME= Browser 71MOZILLA_NAME= Browser
73.endif 72.endif
74 73
75post-extract: 74post-extract:
76 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c 75 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
77 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 76 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
78 77
79pre-configure: 78pre-configure:
80 cd ${WRKSRC} && autoconf 79 cd ${WRKSRC} && autoconf
81 cd ${WRKSRC}/js/src && autoconf 80 cd ${WRKSRC}/js/src && autoconf
82 cd ${WRKSRC} && mkdir ${OBJDIR} 81 cd ${WRKSRC} && mkdir ${OBJDIR}
83 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 82 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
84 83
85post-build: 84post-build:
86 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 85 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
87 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 86 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
88 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 87 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
89 < ${FILESDIR}/desktop.in \ 88 < ${FILESDIR}/desktop.in \
90 > ${WRKDIR}/desktop 89 > ${WRKDIR}/desktop
91 90
92INSTALLATION_DIRS+= share/applications share/pixmaps 91INSTALLATION_DIRS+= share/applications share/pixmaps
93post-install: 92post-install:
94 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 93 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
95 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ 94 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \
96 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 95 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
97 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 96 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
98 ${INSTALL_DATA} ${WRKDIR}/desktop \ 97 ${INSTALL_DATA} ${WRKDIR}/desktop \
99 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 98 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
100 ${INSTALL_DATA} ${MOZILLA_ICON} \ 99 ${INSTALL_DATA} ${MOZILLA_ICON} \
101 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 100 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
102 101
103.include "../../sysutils/desktop-file-utils/desktopdb.mk" 102.include "../../sysutils/desktop-file-utils/desktopdb.mk"
104.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/www/firefox68/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/firefox68/Attic/distinfo 2020/08/07 09:09:48 1.22
+++ pkgsrc/www/firefox68/Attic/distinfo 2020/08/29 18:39:34 1.23
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: distinfo,v 1.22 2020/08/07 09:09:48 maya Exp $ 1$NetBSD: distinfo,v 1.23 2020/08/29 18:39:34 nia Exp $
2 2
3SHA1 (firefox-68.11.0esr.source.tar.xz) = 445acbf7b7b8f75374ee6347bb6f45748511bcf9 3SHA1 (firefox-68.12.0esr.source.tar.xz) = 976fae5c3cdee8b7929e4f17eca6cf44513d08b4
4RMD160 (firefox-68.11.0esr.source.tar.xz) = 82edab46fe312a47889047fe431784c511684ade 4RMD160 (firefox-68.12.0esr.source.tar.xz) = c7871e1d9f8eaff2c0eaff7c70f49c2488e616f8
5SHA512 (firefox-68.11.0esr.source.tar.xz) = 7dcfa4944945bce184b96643a7afbd0cc97c93e4f727695bd5ee1e1745cff89784e68baf109588ef56791211b4b8f5c7c056ae6ac77f54fd00a5af5d5606f23e 5SHA512 (firefox-68.12.0esr.source.tar.xz) = 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
6Size (firefox-68.11.0esr.source.tar.xz) = 321294384 bytes 6Size (firefox-68.12.0esr.source.tar.xz) = 313856956 bytes
7SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c 7SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
8SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8 8SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
9SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317 9SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
10SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89 10SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
11SHA1 (patch-config_makefiles_rust.mk) = 25502bfbe32877b35c244c2c19d6ee1dd63cb771 11SHA1 (patch-config_makefiles_rust.mk) = 564169b2a1ef7f378caa8ba8962b9cf3baf01735
12SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 12SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
13SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 13SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
14SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7 14SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7
15SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs) = 091ffab5bd6a15425acb2ab023cc26f6b23324c6 15SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs) = 091ffab5bd6a15425acb2ab023cc26f6b23324c6
16SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_fd.rs) = 57f5c3c879b07375234e5cb0cbe0469b15105a6a 16SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_fd.rs) = 57f5c3c879b07375234e5cb0cbe0469b15105a6a
17SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_mod.rs) = 7160fc9fe6d197b42104856b997337f823d2a791 17SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_mod.rs) = 7160fc9fe6d197b42104856b997337f823d2a791
18SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_monitor.rs) = 527722bd4fbf0aca07d710e0a8b73f95b2adad40 18SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_monitor.rs) = 527722bd4fbf0aca07d710e0a8b73f95b2adad40
19SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_transaction.rs) = aeafe7c1df614bb5e46cb7fb1cb351001f292caf 19SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_transaction.rs) = aeafe7c1df614bb5e46cb7fb1cb351001f292caf
20SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_uhid.rs) = c1d2157350803fb3eaef6f7a00e7c81dd9cf708b 20SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_uhid.rs) = c1d2157350803fb3eaef6f7a00e7c81dd9cf708b
21SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 21SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
22SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 22SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
23SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba 23SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
24SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 24SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
25SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = e4a25e4a96055b1c42ec018b02d1828257a571de 25SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = e4a25e4a96055b1c42ec018b02d1828257a571de
26SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 26SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
27SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 27SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
28SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29 28SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
29SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 29SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
30SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa 30SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
31SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 31SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
32SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a 32SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
33SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4 33SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
34SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e 34SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e
35SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a 35SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
36SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a 36SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a
37SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9 37SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9
38SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc 38SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
39SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512 39SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512
40SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf 40SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
41SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e 41SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e
42SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 42SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
43SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 43SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
44SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc 44SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
45SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69 45SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69
46SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec 46SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
47SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa 47SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox68/patches/Attic/patch-config_makefiles_rust.mk (switch to unified diff)

--- pkgsrc/www/firefox68/patches/Attic/patch-config_makefiles_rust.mk 2020/08/07 09:09:48 1.1
+++ pkgsrc/www/firefox68/patches/Attic/patch-config_makefiles_rust.mk 2020/08/29 18:39:34 1.2
@@ -1,30 +1,18 @@ @@ -1,30 +1,18 @@
1$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/07 09:09:48 maya Exp $ 1$NetBSD: patch-config_makefiles_rust.mk,v 1.2 2020/08/29 18:39:34 nia Exp $
2 2
3NetBSD<10 doesn't get along with parallel rust builds (it causes issues 3NetBSD<10 doesn't get along with parallel rust builds (it causes issues
4with ld.so) which are the default. Force -j1. 4with ld.so) which are the default. Force -j1.
5 5
6Set -Cembed-bitcode=yes when using LTO to fix build with rust >= 1.45. 6--- config/makefiles/rust.mk.orig 2020-08-17 18:26:21.000000000 +0000
7Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 
8 
9--- config/makefiles/rust.mk.orig 2020-07-20 21:02:39.000000000 +0000 
10+++ config/makefiles/rust.mk 7+++ config/makefiles/rust.mk
11@@ -49,11 +49,19 @@ ifndef MOZ_DEBUG_RUST 8@@ -60,6 +60,10 @@ ifdef CARGO_INCREMENTAL
12 # Enable link-time optimization for release builds. 
13 cargo_rustc_flags += -C lto 
14 endif 
15+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when 
16+# using -Clto. 
17+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION))) 
18+RUSTFLAGS += -Cembed-bitcode=yes 
19+endif 
20 endif 
21  
22 ifdef CARGO_INCREMENTAL 
23 export CARGO_INCREMENTAL 9 export CARGO_INCREMENTAL
24 endif 10 endif
 11
25+ifeq ($(OS_ARCH),NetBSD) 12+ifeq ($(OS_ARCH),NetBSD)
26+cargo_build_flags += -j1 13+cargo_build_flags += -j1
27+endif 14+endif
28  15+
29 rustflags_neon = 16 rustflags_neon =
30 ifeq (neon,$(MOZ_FPU)) 17 ifeq (neon,$(MOZ_FPU))
 18 # Enable neon and disable restriction to 16 FPU registers