From 02b3ecbbbc9d1026c24cfc953f0df38d52bec20b Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Tue, 17 Oct 2023 17:12:26 +0200
Subject: [PATCH] Update to 115.4.0 build1

Resolves: RHEL-14546
---
 .gitignore   |  2 ++
 firefox.spec | 27 ++++++++++++++++-----------
 sources      |  4 ++--
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 997537d..86c007f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -316,3 +316,5 @@
 /firefox-115.3.0esr.processed-source.tar.xz
 /firefox-langpacks-115.3.1esr-20230929.tar.xz
 /firefox-115.3.1esr.processed-source.tar.xz
+/firefox-langpacks-115.4.0esr-20231017.tar.xz
+/firefox-115.4.0esr.processed-source.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 882b312..6fd54ac 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -132,7 +132,7 @@ end}
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        115.3.1
+Version:        115.4.0
 Release:        1%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -158,7 +158,7 @@ ExcludeArch:    aarch64 s390 ppc
 # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20230929.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20231017.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -977,15 +977,15 @@ to run Firefox explicitly on X11.
 %prep
 echo "Build environment"
 echo "--------------------------------------------"
-echo "dist                  %{?dist}"
-echo "RHEL 8 minor version: %{?rhel_minor_version}"
-echo "bundle_nss            %{?bundle_nss}"
-echo "system_nss            %{?system_nss}"
-echo "use_rust_ts           %{?use_rust_ts}"
-echo "use_dts               %{?use_dts}"
-echo "use_nodejs_scl        %{?use_nodejs_scl}"
-echo "use_llvm_ts           %{?use_llvm_ts}"
-echo "use_python3_scl       %{?use_python3_scl}"
+echo "dist                %{?dist}"
+echo "RHEL minor version: %{?rhel_minor_version}"
+echo "bundle_nss          %{?bundle_nss}"
+echo "system_nss          %{?system_nss}"
+echo "use_rust_ts         %{?use_rust_ts}"
+echo "use_dts             %{?use_dts}"
+echo "use_nodejs_scl      %{?use_nodejs_scl}"
+echo "use_llvm_ts         %{?use_llvm_ts}"
+echo "use_python3_scl     %{?use_python3_scl}"
 echo "--------------------------------------------"
 %setup -q -n %{name}-%{version}
 
@@ -1727,6 +1727,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Oct 17 2023 Eike Rathke <erack@redhat.com> - 115.4.0-1
+- Update to 115.4.0 build1
+- Add fix for CVE-2023-44488
+- Set homepage from os-release HOME_URL
+
 * Fri Sep 29 2023 Eike Rathke <erack@redhat.com> - 115.3.1-1
 - Update to 115.3.1
 
diff --git a/sources b/sources
index b6ea7ee..6269c7e 100644
--- a/sources
+++ b/sources
@@ -3,5 +3,5 @@ SHA512 (cbindgen-vendor.tar.xz) = 161811f4adfc74e5d92871c78139704d32e1e1ad6b615c
 SHA512 (nss-3.90.0-3.el8_1.src.rpm) = 81df24bd4eda4935888170e994834f4510c20fa51079631527b195b723d8f536ec4144d4a2e5d45768aeec7c426d50d70d0a294577d18233acc07c49c8af5130
 SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
 SHA512 (nss-3.90.0-3.el9_0.src.rpm) = f321b9c1bda0b09eee564e2903023435851a4ff2e55bdd5b03012ca51be7999b18d85061f874065d0b25913721eb574f49746a3111f8f1cdd5b21268dddd8367
-SHA512 (firefox-langpacks-115.3.1esr-20230929.tar.xz) = e56aea815b75fdee6f0af615e2f8ac41dacc79e675df8314ca5c5c432ec6f8d288cadadb4b689d33511c6b482da9b2067ff010de9cee6ec53e3995fe0d416304
-SHA512 (firefox-115.3.1esr.processed-source.tar.xz) = b71f096cacca568a8c150843a093b2fc7eaf9137b3b91d8b8e4c346de2c2719333e7df8510a72c1d2ebe50064e8f24ad80b02c1631511a76901ad5d9e73a96a2
+SHA512 (firefox-langpacks-115.4.0esr-20231017.tar.xz) = 252b094d87298575769f86f614a05a55112818fedc91f0f53e1d43ec2686231da3107aa138ce62240b26e7c3b3a2b80c63f4eed2187fb0e070bf00ff7f0f2793
+SHA512 (firefox-115.4.0esr.processed-source.tar.xz) = 2354b50dd4034f6b2d9165321426d482f335fae27d9ebcacfd906b40e3bc621f6049d460635f6f057f5702a984e77f581369ad6703a2c79af3f62b5c5c1da31f