Updated to 61.0.1 | vendor.js updates | synced PKGBUILD with upstream

2 files changed, 31 insertions, 61 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4b55ded..729604d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-pkgver=61.0
+pkgver=61.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -26,21 +26,19 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
 sha256sums=('SKIP'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            '158815b51b6a20adb943e5747e0d915018bfb421970f0b582f56498c97b11efa'
+            '5c481e4fd2d51264d92e04d777d69975f4d1cc2b456d477537bba6c0c7ed88c0'
             '28e5db73f04ce8794f68822deda5512c64f832e542ad58fb7e40cad9e4785664')
 
 prepare() {
-  mkdir path
-  ln -s /usr/bin/python2 path/python
 
   cat >$srcdir/mozilla-unified/.mozconfig <<END
 ac_add_options --enable-application=browser
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-linker=gold
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
 
 # Branding
@@ -73,7 +71,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j2"
 
 END
 
@@ -88,7 +86,6 @@ END
   sed -i '/onboarding/d' $srcdir/mozilla-unified/browser/extensions/moz.build
   sed -i '/screenshots/d' $srcdir/mozilla-unified/browser/extensions/moz.build
   sed -i '/webcompat/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  #sed -i '/@RESPATH@\/browser\/features\/*/d' $srcdir/mmozilla-unified/browser/installer/package-manifest.in
 
 
 }
@@ -100,17 +97,9 @@ build() {
   mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin
   mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin/browser
   mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
-#  touch $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin/browser/features/blank
 
-  # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
-
-  export PATH="$srcdir/path:$PATH"
   export MOZ_SOURCE_REPO="$_repo"
 
-  # Do PGO
-  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
-  #  MOZ_PGO=1 ./mach build
   ./mach build
   ./mach buildsymbols
 }
diff --git a/vendor.js b/vendor.js
index 23fde6d..e33a68c 100644
--- a/vendor.js
+++ b/vendor.js
@@ -5,7 +5,9 @@ pref("accessibility.force_disabled", 1);
 
 pref("alerts.showFavicons", false); //Breaks favicons
 
-pref("app.normandy.api_url", false);
+//pref("app.feedback.baseURL",		"https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
+pref("app.feedback.baseURL",		"");  //Conflict
+pref("app.normandy.api_url",		"");
 pref("app.normandy.enabled", false);
 pref("app.releaseNotesURL",				"https://www.mozilla.org/en-US/firefox/notes/");
 pref("app.shield.optoutstudies.enabled", false);
@@ -78,12 +80,7 @@ pref("browser.newtab.preload",				false);  //Conflict
 pref("browser.newtab.url", "about:blank"); //FIXME  //TabMix can unset this at times
 pref("browser.newtabpage.activity-stream.aboutHome.enabled",				false);
 pref("browser.newtabpage.activity-stream.feeds.section.topstories",				false);
-pref("browser.newtabpage.directory.ping",		"data:text/plain,");
-pref("browser.newtabpage.directory.source",		"data:text/plain,");
-//pref("browser.newtabpage.enabled",				true);
-pref("browser.newtabpage.enabled",				false);  //Conflict
-pref("browser.newtabpage.enhanced",				false);
-pref("browser.newtabpage.introShown", true);
+pref("browser.newtabpage.enabled", false);
 pref("browser.newtabpage.preload", false);
 pref("browser.newtabpage.remote",				false);
 pref("browser.offline-apps.notify", true);
@@ -92,9 +89,6 @@ pref("browser.pagethumbnails.capturing_disabled",		true); //Breaks page thumbnai
 pref("browser.ping-centre.telemetry",		false);
 pref("browser.ping-centre.production.endpoint",		"https://127.0.0.1");  //Conflict
 pref("browser.ping-centre.staging.endpoint",		"https://127.0.0.1");  //Conflict
-pref("browser.pocket.api",		"");
-pref("browser.pocket.enabled",		false);
-pref("browser.pocket.site",		"");
 //pref("browser.privatebrowsing.autostart",			true);
 pref("browser.privatebrowsing.autostart",			false);  //Conflict
 pref("browser.reader.detectedFirstArticle", true);
@@ -144,8 +138,6 @@ pref("browser.search.order.extra.2",		"YouTube");
 pref("browser.search.region",				"US");
 pref("browser.search.suggest.enabled",			false);
 pref("browser.search.update",				false);
-pref("browser.selfsupport.enabled",			false);
-pref("browser.selfsupport.url", "");
 pref("browser.send_pings",					false);
 //pref("browser.send_pings.require_same_host", false);
 pref("browser.send_pings.require_same_host", true);  //Conflict
@@ -159,6 +151,7 @@ pref("browser.slowStartup.maxSamples", 0);
 pref("browser.slowStartup.notificationDisabled", true);
 pref("browser.slowStartup.samples", 0);
 pref("browser.ssl_override_behavior",			2);
+pref("browser.startup.homepage",		"about:blank");
 pref("browser.startup.homepage_override.buildID", "20100101");
 //pref("browser.startup.homepage_override.mstone", "");
 pref("browser.startup.homepage_override.mstone", "ignore");  //Conflict
@@ -168,7 +161,6 @@ pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmar
 pref("browser.tabs.crashReporting.sendReport", 				false);  //Conflict
 pref("browser.tabs.insertRelatedAfterCurrent", 				true);
 pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", false);
-pref("browser.tabs.remote.autostart", 				true);
 pref("browser.tabs.selectOwnerOnClose", 				true);
 pref("browser.taskbar.lists.enabled", false);
 pref("browser.taskbar.lists.frequent.enabled", false);
@@ -215,10 +207,7 @@ pref("captivedetect.canonicalURL", "");  //Conflict
 //pref("clipboard.autocopy", true);
 pref("clipboard.autocopy", false);  //Conflict
 
-pref("datareporting.healthreport.about.reportUrl", "data:text/plain,");
-pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,");
 pref("datareporting.healthreport.uploadEnabled",		false);
-pref("datareporting.healthreport.service.enabled",		false);
 pref("datareporting.policy.dataSubmissionEnabled",		false);
 pref("datareporting.policy.firstRunURL", "");
 
@@ -234,7 +223,6 @@ pref("devtools.debugger.remote-enabled",			false);
 //pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/?utm_source=firefox-dev-tools&utm_medium=firefox-browser&utm_content=betadoorhanger");
 pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/");  //Conflict
 pref("devtools.webide.autoinstallADBHelper",		false);
-pref("devtools.webide.autoinstallFxdtAdapters",		false);
 pref("devtools.webide.enabled",				false);
 
 pref("dom.allow_cut_copy", false);  //Hidden
@@ -243,7 +231,6 @@ pref("dom.caches.enabled", false);  //Conflict
 pref("dom.disable_window_showModalDialog", true);
 pref("dom.enable_performance", false);
 pref("dom.enable_resource_timing", false);
-pref("dom.enable_user_timing", false);
 //pref("dom.event.clipboardevents.enabled", true);
 pref("dom.event.clipboardevents.enabled", false);  //Conflict
 pref("dom.event.highrestimestamp.enabled", true);
@@ -263,7 +250,6 @@ pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled",	false);  //Confli
 //pref("dom.ipc.plugins.reportCrashURL", true);
 pref("dom.ipc.plugins.reportCrashURL", false);  //Conflict
 pref("dom.mozTCPSocket.enabled",				false);
-pref("dom.network.enabled",				false);
 pref("dom.performance.enable_user_timing_logging", false);
 pref("dom.popup_allowed_events", "change click dblclick mouseup notificationclick reset submit touchend");
 //pref("dom.popup_maximum", 20);
@@ -295,14 +281,6 @@ pref("dom.webnotifications.requireinteraction.enabled", false);
 pref("dom.w3c_touch_events.enabled", 				0);
 //pref("dom.webnotifications.serviceworker.enabled", true);
 pref("dom.webnotifications.serviceworker.enabled", false);  //Conflict
-pref("dom.workers.enabled", false);
-
-pref("experiments.activeExperiment", false);
-pref("experiments.enabled",				false);
-//pref("experiments.manifest.uri", "https://telemetry-experiment.cdn.mozilla.net/manifest/v1/firefox/%VERSION%/%CHANNEL%");
-pref("experiments.manifest.uri", "");  //Conflict
-//pref("experiments.supported", true);
-pref("experiments.supported", false);  //Conflict
 
 //pref("extensions.autoDisableScopes", 0); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
 pref("extensions.autoDisableScopes", 15); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
@@ -317,6 +295,7 @@ pref("extensions.formautofill.addresses.enabled", false);
 pref("extensions.formautofill.available", "off");
 pref("extensions.formautofill.creditCards.enabled", false);
 pref("extensions.formautofill.heuristics.enabled", false);
+pref("extensions.geckoProfiler.symbols.url", "");
 pref("extensions.getAddons.cache.enabled",			false);
 //pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
 pref("extensions.getAddons.get.url", "");  //Conflict
@@ -347,23 +326,17 @@ pref("extensions.webcompat-reporter.newIssueEndpoint", "");
 pref("extensions.webextensions.keepStorageOnUninstall", false);
 pref("extensions.webextensions.keepUuidOnUninstall", false);
 pref("extensions.webextensions.restrictedDomains", "");
-pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
+//pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
+pref("extensions.webservice.discoverURL", "");  //Conflict
 
 pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka");
 
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
 
-pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "5.0 (Windows)");
-pref("general.buildID.override", "20100101");
-pref("general.oscpu.override", "Windows NT 6.1");
-pref("general.platform.override", "Win32");
-pref("general.productSub.override", "20100101");
 pref("general.useragent.compatMode.firefox", false);
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0");
-pref("general.useragent.vendor", "");
-pref("general.useragent.vendorSub", "");
+//pref("general.useragent.vendor", "");
+//pref("general.useragent.vendorSub", "");
 //pref("general.warnOnAboutConfig", true);
 pref("general.warnOnAboutConfig", false);  //Conflict
 
@@ -382,6 +355,8 @@ pref("gfx.font_rendering.opentype_svg.enabled",		false);
 pref("gfx.layerscope.enabled", false);
 pref("gfx.offscreencanvas.enabled", false);
 
+//pref("identity.fxaccounts.auth.uri",				"https://api.accounts.firefox.com/v1");
+pref("identity.fxaccounts.auth.uri",				"");  //Conflict
 pref("identity.fxaccounts.enabled", false);
 pref("identity.fxaccounts.remote.email.uri",				"");
 //pref("identity.fxaccounts.remote.force_auth.uri",				"https://accounts.firefox.com/force_auth?service=sync&context=fx_desktop_v3");
@@ -390,6 +365,12 @@ pref("identity.fxaccounts.remote.force_auth.uri",				"");  //Conflict
 pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/");  //Conflict
 //pref("identity.mobilepromo.ios",				"https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
 pref("identity.mobilepromo.ios",				"");  //Conflict
+//pref("identity.fxaccounts.remote.oauth.uri",				"https://oauth.accounts.firefox.com/v1");
+pref("identity.fxaccounts.remote.oauth.uri",				"");  //Conflict
+//pref("identity.fxaccounts.remote.profile.uri",				"https://profile.accounts.firefox.com/v1");
+pref("identity.fxaccounts.remote.profile.uri",				"");  //Conflict
+//pref("identity.sync.tokenserver.uri",				"https://token.services.mozilla.com/1.0/sync/1.5");
+pref("identity.sync.tokenserver.uri",				"");  //Conflict
 
 pref("intl.accept_languages",				"en-US, en");
 pref("intl.charset.default", "windows-1252");
@@ -430,15 +411,12 @@ pref("media.block-autoplay-until-in-foreground", true);  //Conflict
 //pref("media.cache_size", 0);
 pref("media.cache_size", 512000);  //Conflict
 pref("media.decoder-doctor.new-issue-endpoint", "");
-pref("media.eme.apiVisible",				false);
 pref("media.eme.enabled",				false);
 pref("media.getusermedia.audiocapture.enabled",	false);
 pref("media.getusermedia.browser.enabled", false);
 pref("media.getusermedia.noise_enabled",		false);
 //pref("media.getusermedia.screensharing.enabled", true);
 pref("media.getusermedia.screensharing.enabled", false);  //Conflict
-pref("media.gmp-eme-adobe.visible", false);
-pref("media.gmp-eme-adobe.enabled", false);
 pref("media.gmp-gmpopenh264.autoupdate", false);
 pref("media.gmp-gmpopenh264.enabled",			false);  //Hidden
 pref("media.gmp-manager.updateEnabled", false);
@@ -489,6 +467,7 @@ pref("network.dnsCacheExpirationGracePeriod",			0);  //Conflict
 pref("network.dns.blockDotOnion",				true);
 pref("network.dns.disablePrefetch",			true);
 pref("network.dns.disablePrefetchFromHTTPS",		true);  //Hidden
+pref("network.file.disable_unc_paths",		true);
 pref("network.ftp.enabled",		false);
 pref("network.gio.supported-protocols", "");
 pref("network.http.altsvc.enabled", false);
@@ -518,16 +497,12 @@ pref("network.http.spdy.enabled", false);
 //pref("network.http.spdy.enabled.deps", true);
 pref("network.http.spdy.enabled.deps", false);  //Conflict
 pref("network.http.spdy.enabled.http2", false);
-pref("network.http.spdy.enabled.http2draft", false);
 pref("network.http.spdy.enabled.v2", false);
 pref("network.http.spdy.enabled.v3", false);
-pref("network.http.spdy.enabled.v3-1", false);
 //pref("network.http.speculative-parallel-limit",		6);
 pref("network.http.speculative-parallel-limit",		0);  //Conflict
 //pref("network.IDN_show_punycode",				false);
 pref("network.IDN_show_punycode",				true);   //Conflict
-pref("network.jar.block-remote-files", true);
-pref("network.jar.open-unsafe-types",			false);
 pref("network.manage-offline-status",		false);
 pref("network.predictor.enabled",				false);
 pref("network.predictor.enable-prefetch", false);
@@ -690,6 +665,8 @@ pref("security.ssl.enable_ocsp_must_staple",		true);
 pref("security.ssl.enable_ocsp_stapling",			true);
 pref("security.ssl.errorReporting.automatic",		false);
 pref("security.ssl.errorReporting.enabled", false);
+//pref("security.ssl.errorReporting.url", "https://incoming.telemetry.mozilla.org/submit/sslreports/");
+pref("security.ssl.errorReporting.url", "");  //Conflict
 //pref("security.ssl.require_safe_negotiation",		false);
 pref("security.ssl.require_safe_negotiation",		true);  //Conflict
 //pref("security.ssl.treat_unsafe_negotiation_as_broken",	false);
@@ -714,11 +691,15 @@ pref("security.tls.version.max",				4);  //Conflict
 
 pref("services.blocklist.signing.enforced", true);
 pref("services.blocklist.update_enabled", false);
+//pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
+pref("services.settings.server", "");  //Conflict
 pref("services.sync.engine.addons", false);
 pref("services.sync.engine.prefs", false);
 pref("services.sync.engine.tabs", false);
 pref("services.sync.ui.hidden", true);
 
+pref("shield.savant.enabled", false);
+
 pref("signon.autofillForms",				false);
 pref("signon.autofillForms.http",				false);
 //pref("signon.formlessCapture.enabled",			true);