From d27e5b8cae8be7b8157cc3a2ebcacacee8784832 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 9 Feb 2022 00:00:39 +0000
Subject: [PATCH] Update to firefox-91.6.0esr

---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 xsoft/graphweb/firefox.xml         | 19 +++----------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a86b305e4c..1b851a8872 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>February 8th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to firefox-91.6.0esr (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16060">#16060</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Reverted dvisvgm-2.13.1, the release tarball
           in the link is not what I tested and my altered commands will
diff --git a/packages.ent b/packages.ent
index 9e37f1535d..5486a4d446 100644
--- a/packages.ent
+++ b/packages.ent
@@ -940,7 +940,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY falkon-minor-version         "0">
 <!ENTITY falkon-version               "&falkon-major-version;.&falkon-minor-version;">
 <!-- for firefox-legacy-version use JS78-version: f-l archived at version 78.15.0 -->
-<!ENTITY firefox-version              "91.5.1">
+<!ENTITY firefox-version              "91.6.0">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">
 <!ENTITY seamonkey-version            "2.53.10.2">
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index f1d343b557..40eb47ce0b 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -6,15 +6,15 @@
 
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "6ff10e237eb9a991757ec62302df25fb">
-  <!ENTITY firefox-size          "371 MB">
+  <!ENTITY firefox-md5sum        "038c417db527350d4fdd039870af819b">
+  <!ENTITY firefox-size          "369 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
   <!ENTITY firefox-buildsize     "6.7 GB (194 MB installed) without tests">
   <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
    most practical way to get a timing on a machine with more cores, if taking
    cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "26 SBU (on a typical 4-core machine) without tests">
+  <!ENTITY firefox-time          "30 SBU (on a typical 4-core machine) without tests">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -76,12 +76,6 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/firefox-&firefox-version;esr-buildfix-1.patch"/>
-        </para>
-      </listitem>
       <listitem>
         <para>
           Recommended patch:
@@ -316,13 +310,6 @@ EOF</userinput></screen>
 
 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;esr-disable_rust_test-1.patch</userinput></screen>
 
-    <para>
-      Next, apply a patch that fixes compilation on systems with Wayland-1.20
-      installed:
-    </para>
-
- <screen><userinput remap="pre">patch -Np1 -i ../firefox-&firefox-version;esr-buildfix-1.patch</userinput></screen>
-
     <para>
       If the geolocation APIs are needed:
     </para>