CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 10 07:02:47 UTC 2018

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-xpcom_build_BinaryPath.h

Log Message:
Update to 58.0.2

* Fix segfault on netbsd-7

Changelog:
Fix
    Avoid a signature validation issue during update on macOS

    Blocklisted graphics drivers related to off main thread painting crashes

    Tab crash during printing

    Fix clicking links and scrolling emails on Microsoft Hotmail and Outlook
      (OWA) webmail


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.307 -r1.308 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.104 -r1.105 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.320 pkgsrc/www/firefox/Makefile:1.321
--- pkgsrc/www/firefox/Makefile:1.320   Wed Jan 31 14:02:17 2018
+++ pkgsrc/www/firefox/Makefile Sat Feb 10 07:02:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.320 2018/01/31 14:02:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.321 2018/02/10 07:02:47 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            58.0
-MOZ_BRANCH_MINOR=      .1
+MOZ_BRANCH_MINOR=      .2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.307 pkgsrc/www/firefox/distinfo:1.308
--- pkgsrc/www/firefox/distinfo:1.307   Wed Jan 31 14:02:17 2018
+++ pkgsrc/www/firefox/distinfo Sat Feb 10 07:02:47 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.307 2018/01/31 14:02:17 ryoon Exp $
+$NetBSD: distinfo,v 1.308 2018/02/10 07:02:47 ryoon Exp $
 
-SHA1 (firefox-58.0.1.source.tar.xz) = 33dde117cef998eadb8fe53e2d045ae8dd27c8bf
-RMD160 (firefox-58.0.1.source.tar.xz) = d5ace7da909ae48110ea96781ab3a93da8994702
-SHA512 (firefox-58.0.1.source.tar.xz) = 65a6a68f95dac93fc68c4e240742b172a6417e7fafca2671ab13f398329ba0ef3195bbaaecea2d9f8b2992217cfaa7912af6c0351a1efe4cf2d2bba838ecd711
-Size (firefox-58.0.1.source.tar.xz) = 248933088 bytes
+SHA1 (firefox-58.0.2.source.tar.xz) = 7a35b39e0b80f308ad22beb2037ceb5f855219f4
+RMD160 (firefox-58.0.2.source.tar.xz) = bccf05f8124303a185193fd1427c0cf7c67e042f
+SHA512 (firefox-58.0.2.source.tar.xz) = ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f
+Size (firefox-58.0.2.source.tar.xz) = 247576952 bytes
 SHA1 (patch-aa) = b4a6359c2c22617fed31636250b3ff12a03aafa8
 SHA1 (patch-build_gyp.mozbuild) = bb3a2f8c1cad0e9cfdaefa721c5992cba2e2bf50
 SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db
@@ -83,7 +83,7 @@ SHA1 (patch-toolkit_mozapps_installer_pa
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
-SHA1 (patch-xpcom_build_BinaryPath.h) = 02989461bb7d2a17cf9f1c2b21652f3cf64fb386
+SHA1 (patch-xpcom_build_BinaryPath.h) = 88a815a142356bf76024e5a4326b677122c844c1
 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 528f7254966d883c18e33744e28780a93055d560
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.104 pkgsrc/www/firefox/mozilla-common.mk:1.105
--- pkgsrc/www/firefox/mozilla-common.mk:1.104  Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Feb 10 07:02:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.104 2018/01/24 16:52:08 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.105 2018/02/10 07:02:47 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -84,6 +84,12 @@ SUBST_MESSAGE.fix-paths=     Fixing absolute
 SUBST_FILES.fix-paths+=                ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
 SUBST_SED.fix-paths+=          -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
 
+SUBST_CLASSES+=                        prefix
+SUBST_STAGE.prefix=            pre-configure
+SUBST_MESSAGE.prefix=          Setting PREFIX
+SUBST_FILES.prefix+=           ${MOZILLA_DIR}xpcom/build/BinaryPath.h
+SUBST_VARS.prefix+=            PREFIX
+
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}js/src/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess

Index: pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h
diff -u pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h:1.3 pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h:1.4
--- pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h:1.3       Wed Jan 31 14:02:18 2018
+++ pkgsrc/www/firefox/patches/patch-xpcom_build_BinaryPath.h   Sat Feb 10 07:02:47 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.3 2018/01/31 14:02:18 ryoon Exp $
+$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.4 2018/02/10 07:02:47 ryoon Exp $
 
 * Fix build under netbsd-7, PR pkg/52956
 
@@ -24,13 +24,17 @@ $NetBSD: patch-xpcom_build_BinaryPath.h,
    static nsresult Get(char aResult[MAXPATHLEN])
    {
      int mib[4];
-@@ -195,7 +197,8 @@ private:
-     return NS_OK;
+@@ -257,6 +259,13 @@ private:
+     return NS_ERROR_FAILURE;
    }
  
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || \
-+      (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-   static nsresult Get(char aResult[MAXPATHLEN])
-   {
-     int mib[4];
++#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
++  static nsresult Get(char aResult[MAXPATHLEN])
++  {
++    char path[] = "@PREFIX@/lib/firefox/firefox";
++    sprintf(aResult, "%s", path);
++    return NS_OK;
++  }
+ #else
+ #error Oops, you need platform-specific code here
+ #endif