# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1529738071 -7200
# Node ID 5ce9d1f6be4154f1f318fc21c4f14ad32c63a8ab
# Parent  936bf8851c57faa68cdf44c23ade67a7c9acc56e
new beta

diff -r 936bf8851c57 -r 5ce9d1f6be41 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Jun 12 22:12:00 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Jun 23 09:14:31 2018 +0200
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Sun Jun 10 15:13:01 UTC 2018 - wr@rosenauer.org
-
-- update to Firefox 61.0b12
+Sun Jun 17 06:51:24 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 61.0b14
 - requires NSS 3.37.3
 - removed obsolete patches
   mozilla-i586-DecoderDoctorLogger.patch
diff -r 936bf8851c57 -r 5ce9d1f6be41 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Jun 12 22:12:00 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Jun 23 09:14:31 2018 +0200
@@ -21,10 +21,10 @@
 %define major          60
 %define mainver        %major.99
 %define orig_version   61.0
-%define orig_suffix    b12
+%define orig_suffix    b14
 %define update_channel beta
 %define branding       1
-%define releasedate    20180607135512
+%define releasedate    20180614135649
 %define source_prefix  firefox-%{orig_version}
 
 # PIE, full relro (x86_64 for now)
diff -r 936bf8851c57 -r 5ce9d1f6be41 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Jun 12 22:12:00 2018 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat Jun 23 09:14:31 2018 +0200
@@ -7,9 +7,9 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_61_0b12_RELEASE"
+RELEASE_TAG="FIREFOX_61_0b14_RELEASE"
 VERSION="61.0"
-VERSION_SUFFIX="b12"
+VERSION_SUFFIX="b14"
 LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
 
 # check required tools
diff -r 936bf8851c57 -r 5ce9d1f6be41 MozillaFirefox/firefox.js
--- a/MozillaFirefox/firefox.js	Tue Jun 12 22:12:00 2018 +0200
+++ b/MozillaFirefox/firefox.js	Sat Jun 23 09:14:31 2018 +0200
@@ -1,4 +1,3 @@
 pref("intl.locale.requested", "");
 pref("browser.preferences.instantApply", true);
 pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-pref("extensions.unsignedScopes", 3);
diff -r 936bf8851c57 -r 5ce9d1f6be41 MozillaFirefox/source-stamp.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/source-stamp.txt	Sat Jun 23 09:14:31 2018 +0200
@@ -0,0 +1,2 @@
+REV=585281dde960
+REPO=http://hg.mozilla.org/releases/mozilla-beta
diff -r 936bf8851c57 -r 5ce9d1f6be41 mozilla-bmo1464766.patch
--- a/mozilla-bmo1464766.patch	Tue Jun 12 22:12:00 2018 +0200
+++ b/mozilla-bmo1464766.patch	Sat Jun 23 09:14:31 2018 +0200
@@ -3,7 +3,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1527491713 -32400
 # Node ID c28becad0c10b906454d7e424f9a9402799ea8dd
-# Parent  182b06bb5c20188d320db4d14767e0e39366617a
+# Parent  86eaa6799cf51660c0b598937121305b8f70c84d
 Bug 1464766 - Allow to relax the addon signature requirements. r?rhelmer
 
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -19,7 +19,7 @@
  pref("extensions.spellcheck.inline.max-misspellings", 500);
  
 +// Add-on manager scoped allowing unsigned addons. None by default.
-+pref("extensions.unsignedScopes", 0, locked);
++pref("extensions.unsignedScopes", 12, locked);
 +
  // Prefs used by libeditor. Prefs specific to seamonkey composer
  // belong in comm-central/editor/ui/composer.js
@@ -107,7 +107,7 @@
    isUsableAddon(aAddon) {
 -    if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
 +    let unsignedScopes = Services.prefs.getIntPref(PREF_EM_UNSIGNED_SCOPES, 0);
-+    if (!(aAddon.location.scope & unsignedScopes) &&
++    if (!(aAddon._installLocation.scope & unsignedScopes) &&
 +        this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
        logger.warn(`Add-on ${aAddon.id} is not correctly signed.`);
        if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) {