Unverified Commit e1a870db authored by Martin Weinelt's avatar Martin Weinelt
Browse files

firefox-unwrapped: 135.0.1 -> 136.0 

https://www.mozilla.org/en-US/firefox/136.0/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2025-14

Fixes: CVE-2025-1930, CVE-2025-1931, CVE-2025-1933, CVE-2025-1934,
       CVE-2025-1942, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
       CVE-2025-1938, CVE-2025-1943
parent a429051f

pkgs/applications/networking/browsers/firefox/common.nix

+5 −6
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ in 
, gnum4

, gtk3

, icu73

, icu74

, libGL

, libGLU

, libevent
@@ -254,7 +253,8 @@ buildStdenv.mkDerivation { 
  patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]

  ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]

  ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]

  ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]

  ++ lib.optionals (lib.versionAtLeast version "121" && lib.versionOlder version "136") [ ./no-buildconfig-ffx121.patch ]

  ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]

  ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [

    (fetchpatch {

      # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
@@ -448,7 +448,8 @@ buildStdenv.mkDerivation { 
    # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255

    "--enable-system-pixman"

    "--with-system-ffi"

    "--with-system-icu"

    # Firefox 136 fails to link with our icu76.1

    (lib.optionalString (lib.versionOlder version "136") "--with-system-icu")

    "--with-system-jpeg"

    "--with-system-libevent"

    "--with-system-libvpx"
@@ -532,9 +533,7 @@ buildStdenv.mkDerivation { 
    ++ lib.optional  sndioSupport sndio

    ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]

  ))

  # icu74 fails to build on 127 and older

  # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601

  ++ [ (if (lib.versionAtLeast version "134") then icu74 else icu73) ]

  ++ lib.optionals (lib.versionOlder version "136") [ icu73 ]

  ++ lib.optional  gssSupport libkrb5

  ++ lib.optional  jemallocSupport jemalloc

  ++ extraBuildInputs;

pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp

index 16888323d7..b96450a247 100644

--- a/docshell/base/nsAboutRedirector.cpp

+++ b/docshell/base/nsAboutRedirector.cpp

@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {

     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",

      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

 #endif

-    {"buildconfig", "chrome://global/content/buildconfig.html",

-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

-         nsIAboutModule::IS_SECURE_CHROME_UI},

     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",

      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::ALLOW_SCRIPT},

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

index eb6c179b60..57568668b1 100644

--- a/toolkit/content/jar.mn

+++ b/toolkit/content/jar.mn

@@ -40,7 +40,6 @@ toolkit.jar:

    content/global/aboutUrlClassifier.js

    content/global/aboutUrlClassifier.xhtml

    content/global/aboutUrlClassifier.css

-*   content/global/buildconfig.html

    content/global/buildconfig.css

    content/global/contentAreaUtils.js

    content/global/datepicker.xhtml

pkgs/applications/networking/browsers/firefox/packages/firefox.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


buildMozillaMach rec {

  pname = "firefox";

  version = "135.0.1";

  version = "136.0";

  src = fetchurl {

    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "9ff7c2ab6bc1660e339cdcd7745f8bdac5be25d3a79b9f0393385935270d7ef488599856bc38c22ae0b067389fa71a6999703b74804a6e0ea8265eb99788cea9";

    sha512 = "a2b7e74e8404138b294f7b3c5f1eaeaeb8ce84c9aad25379e8ec785a9686f42def9f8c119d4bc276dd371d13d7bebbe4b1b092af41500aa8c2b2c827971445b4";

  };



  meta = {