Accepting request 923417 from mozilla:Factory

- Mozilla Firefox 93.0 * supports the new AVIF image format * PDF viewer now supports filling more forms (XFA-based forms) * now blocks downloads that rely on insecure connections, protecting against potentially malicious or unsafe downloads * Improved web compatibility for privacy protections with SmartBlock 3.0 * Introducing a new referrer tracking protection in Strict Tracking Protection and Private Browsing * TLS ciphersuites that use 3DES have been disabled. Such ciphersuites can only be enabled when deprecated versions of TLS are also enabled * The download panel now follows the Firefox visual styles MFSA 2021-43 (bsc#1191332) * CVE-2021-38496 (bmo#1725335) Use-after-free in MessageTask * CVE-2021-38497 (bmo#1726621) Validation message could have been overlaid on another origin * CVE-2021-38498 (bmo#1729642) Use-after-free of nsLanguageAtomService object * CVE-2021-32810 (bmo#1729813) https://github.com/crossbeam-rs/crossbeam/security/advisories/GHSA-pqqp-xmhj-wgcw) Data race in crossbeam-deque * CVE-2021-38500 (bmo#1725854, bmo#1728321) Memory safety bugs fixed in Firefox 93, Firefox ESR 78.15, and Firefox ESR 91.2 * CVE-2021-38501 (bmo#1685354, bmo#1715755, bmo#1723176) Memory safety bugs fixed in Firefox 93 and Firefox ESR 91.2 * CVE-2021-38499 (bmo#1667102, bmo#1723170, bmo#1725356, bmo#1727364) Memory safety bugs fixed in Firefox 93 - removed obsolete mozilla-bmo1708709.patch OBS-URL: https://build.opensuse.org/request/show/923417 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=346
2021-10-12 19:48:11 +00:00 · 2021-10-12 19:48:11 +00:00 · da443c7a7f
commit da443c7a7f
parent c0180c6ed8 317e7b9c84
19 changed files with 1819 additions and 498 deletions
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Oct  1 18:33:33 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Firefox 93.0
+  * supports the new AVIF image format
+  * PDF viewer now supports filling more forms (XFA-based forms)
+  * now blocks downloads that rely on insecure connections,
+    protecting against potentially malicious or unsafe downloads
+  * Improved web compatibility for privacy protections with SmartBlock 3.0
+  * Introducing a new referrer tracking protection in Strict Tracking
+    Protection and Private Browsing
+  * TLS ciphersuites that use 3DES have been disabled. Such
+    ciphersuites can only be enabled when deprecated versions of
+    TLS are also enabled
+  * The download panel now follows the Firefox visual styles
+  MFSA 2021-43 (bsc#1191332)
+  * CVE-2021-38496 (bmo#1725335)
+    Use-after-free in MessageTask
+  * CVE-2021-38497 (bmo#1726621)
+    Validation message could have been overlaid on another origin
+  * CVE-2021-38498 (bmo#1729642)
+    Use-after-free of nsLanguageAtomService object
+  * CVE-2021-32810 (bmo#1729813)
+    https://github.com/crossbeam-rs/crossbeam/security/advisories/GHSA-pqqp-xmhj-wgcw)
+    Data race in crossbeam-deque
+  * CVE-2021-38500 (bmo#1725854, bmo#1728321)
+    Memory safety bugs fixed in Firefox 93, Firefox ESR 78.15,
+    and Firefox ESR 91.2
+  * CVE-2021-38501 (bmo#1685354, bmo#1715755, bmo#1723176)
+    Memory safety bugs fixed in Firefox 93 and Firefox ESR 91.2
+  * CVE-2021-38499 (bmo#1667102, bmo#1723170, bmo#1725356, bmo#1727364)
+    Memory safety bugs fixed in Firefox 93
+- removed obsolete mozilla-bmo1708709.patch
+- require NSS >= 3.70
+- allow to override wayland detection by defining MOZ_ENABLE_WAYLAND
+  explicitely as 0 or 1
+- fix aarch64 build by updating constraints
+- add mozilla-bmo1725828.patch to fix widevine (bsc#1190842)
+- add mozilla-bmo531915.patch to fix build for i586
+
 -------------------------------------------------------------------
 Sat Sep 25 10:10:56 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>

--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@ -28,9 +28,9 @@
 # orig_suffix b3
 # major 69
 # mainver %major.99
-%define major          92
-%define mainver        %major.0.1
-%define orig_version   92.0.1
+%define major          93
+%define mainver        %major.0
+%define orig_version   93.0
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
@ -118,7 +118,7 @@ BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.32
-BuildRequires:  mozilla-nss-devel >= 3.69.1
+BuildRequires:  mozilla-nss-devel >= 3.70
 BuildRequires:  nasm >= 2.14
 BuildRequires:  nodejs >= 10.22.1
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
@ -224,8 +224,9 @@ Patch25:        mozilla-bmo998749.patch
 Patch26:        mozilla-bmo1626236.patch
 Patch27:        mozilla-s390x-skia-gradient.patch
 Patch28:        mozilla-libavcodec58_91.patch
-Patch29:        mozilla-bmo1708709.patch
-Patch30:        mozilla-silence-no-return-type.patch
+Patch29:        mozilla-silence-no-return-type.patch
+Patch30:        mozilla-bmo1725828.patch
+Patch31:        mozilla-bmo531915.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@ -355,6 +356,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
--- a/4
+++ b/4
@ -35,13 +35,13 @@
    <hardware>
      <processors>4</processors>
      <disk>
-        <size unit="G">30</size>
+        <size unit="G">36</size>
      </disk>
      <memoryperjob>
        <size unit="M">1000</size>
      </memoryperjob>
      <physicalmemory>
-        <size unit="G">9</size>
+        <size unit="G">12</size>
      </physicalmemory>
    </hardware>
  </overwrite>
--- a/firefox-92.0.1.source.tar.xz
+++ b/firefox-92.0.1.source.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9096b22e162cd299080d5eef8f3627a71a594ceba2b89e3000f2c3e8ea603eb1
-size 383567460
--- a/firefox-92.0.1.source.tar.xz.asc
+++ b/firefox-92.0.1.source.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmFLiE0ACgkQ6+QekPbx
-L20NQQ//S3+DiyaWhwKF/AD/JqKtX60xH8aUkgBUf++C93be5Nn45Z5bWkD6w7Vn
-8uHGvfxfdX/i3jF9ZkY6vv4UUkuvJwotAffdxxKMVRRS2l9O/YcTv3lmncl3v2CD
-Z7IvTm8c6QKZ7xa2xaevCigzuDjOixXSzk8sPfIAngmR+faHweIfQiXnc5UD6ZiE
-r8QkRj/KYcUeOCZoQlDNgdQFpmTNj3PHQRYMyHcb4ngJOe6FquEf6GPF+MA49gYs
-fg8JQYBm6JafAP/SKwVYPtR56oPX9f69jX3ONz9DXAnZpWuxNO2bToKae++rw5M3
-arKi8ViCTRLI5E5g2+Jda6mKIgPyTWQqoSDdj2XQV2QJcVuiWo4WY5jaHQFh8gif
-acACsq4loV1ABMNY8P9Ro/FHIuaMuYczF+XuSxSLbWCp88VkqAET5HbonBl295Wt
-RaduF32+6kvsn2GsNZgMOZTJH4uJgbP/GyNbWJuDJ7DcBP3opxs4l1FYYaqK66Pm
-g5cDB8ht0FQ7t7ENHA0NUOerrdopxp5bJLMjHXl0sfORS/J7rw1pvlrAaMrTSGV6
-pmLiJm2glxquZ2poGSv6IYRnCebC+TwNlMB3G64u48Z6i8Zh14WMu0JaNgbnpa+P
-vIq4fkk0Xde7JBVytYVuCcl2ZQv2Wo6Yx4YhMKJjMS9MmNkVtvw=
-=HcTO
-----END PGP SIGNATURE-----
--- a/firefox-93.0.source.tar.xz
+++ b/firefox-93.0.source.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102
+size 382181136
--- a/firefox-93.0.source.tar.xz.asc
+++ b/firefox-93.0.source.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmFSUkoACgkQ6+QekPbx
+L21kLg/+M7Bkacd7Tteq58iHOZQPbKbQqWAfDUjUh3wS66oxqZJbyxkzk9CN6o5e
+f91WnoFLXN7RkxlXl8kAKYFgvjPfhJmeGHYDgZ50Yuyey42y5w2k+Aoefl0svTOY
+gQrCU1txt67VnsC51oqrfMxIJiePGzGGMr76QqVmEsS5nkqzzs3YzPL1A63ifrUU
+h+AnHdkxqZNtTN5CsYVuwVAWXfTF4oZrC3jNkQhOtHokKTWwmwUXCsE88mnEn9b1
+wohuOuaIscKj4M/RQfYWm+9IJKEj/Ov+53XV5wHg2hF+9qaaaYd7WI12PPXtFEl9
+h/dbu/8nw6OooQlH54ImkVA51mIlx1WFo8gOv6NtXFIQo9ggowX0u42yflogYSzS
+kiDelRGZ+wv9GbTHB1/iBlV+JcRba67Mu2r0dxkjXDTHI3VRfkio2fuhgMxXqqfg
+5/Wh8laLAseLQjjlJcWi0RNAL25QxVQk3dwTuQN8Hch8IZk6F+prt8GEDbovxrIz
+vaD28L2cLf3E40HyKMOEZUEaBEp3V5yMWf3arBLg3XbYIQg0AG45x212OUDtxVw8
+8rMGUsDtIsLX/skN0kPgVoyZHVX7XUqwa0HIDu7mBoQti36xjZ//F+HY0KxCkpj0
+cVJRP2cXIhcOQhRL0XS3FZ9ZLBYvT2j69Oa5YRTsgNN1HG9zERc=
+=m1VV
+-----END PGP SIGNATURE-----
--- a/firefox-branded-icons.patch
+++ b/firefox-branded-icons.patch
@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  fe8ed2b997914bef9446d854a4c189fb69394bac
+# Parent  30e1a232528000620a3874de06ea515e5ef8e77f

 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
 --- a/browser/branding/branding-common.mozbuild
@ -24,13 +24,13 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -252,20 +252,23 @@
+@@ -236,20 +236,23 @@
+ @RESPATH@/browser/chrome/browser@JAREXT@
+ @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
- @RESPATH@/chrome/recording.manifest
- @RESPATH@/chrome/recording/*
 #ifdef MOZ_GTK
 @RESPATH@/browser/chrome/icons/default/default16.png
 +@RESPATH@/browser/chrome/icons/default/default22.png
--- a/l10n-92.0.1.tar.xz
+++ b/l10n-92.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db2ccc9f76675d7f7e70a9996cd1464884bf7092f1aa6a7580c23e03f0d90c04
-size 51163396
--- a/l10n-93.0.tar.xz
+++ b/l10n-93.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa1dbeca12f76eadde185a655b80a7644ec183041ff9af28f9f5e1700f606127
+size 48263880
--- a/mozilla-bmo1708709.patch
+++ b/mozilla-bmo1708709.patch
@ -1,201 +0,0 @@
-Index: firefox-91.0.2/dom/xul/XULPopupElement.cpp
-===================================================================
--- firefox-91.0.2.orig/dom/xul/XULPopupElement.cpp
-+++ firefox-91.0.2/dom/xul/XULPopupElement.cpp
-@@ -271,8 +271,7 @@ already_AddRefed<DOMRect> XULPopupElemen
-     // For native menus we can't query the true size. Use the anchor rect
-     // instead, which at least has the position at which we were intending to
-     // open the menu.
-    screenRect = Some(CSSRect(
-        CSSIntRect::FromUnknownRect(menuPopupFrame->GetScreenAnchorRect())));
-+    screenRect = Some(CSSRect(menuPopupFrame->GetScreenAnchorRect()));
-   } else {
-     // For non-native menus, query the bounds from the widget.
-     if (nsView* view = menuPopupFrame->GetView()) {
-Index: firefox-91.0.2/layout/xul/nsMenuPopupFrame.h
-===================================================================
--- firefox-91.0.2.orig/layout/xul/nsMenuPopupFrame.h
-+++ firefox-91.0.2/layout/xul/nsMenuPopupFrame.h
-@@ -321,7 +321,7 @@ class nsMenuPopupFrame final : public ns
-   // If aUpdateAttrs is true, and the popup already has left or top attributes,
-   // then those attributes are updated to the new location.
-   // The frame may be destroyed by this method.
-  void MoveTo(const mozilla::CSSIntPoint& aPos, bool aUpdateAttrs);
-+  void MoveTo(const mozilla::CSSPoint& aPos, bool aUpdateAttrs);
- 
-   void MoveToAnchor(nsIContent* aAnchorContent, const nsAString& aPosition,
-                     int32_t aXPos, int32_t aYPos, bool aAttributesOverride);
-@@ -370,7 +370,9 @@ class nsMenuPopupFrame final : public ns
- 
-   // Return the screen coordinates in CSS pixels of the popup,
-   // or (-1, -1, 0, 0) if anchored.
-  nsIntRect GetScreenAnchorRect() const { return mScreenRect; }
-+  mozilla::CSSIntRect GetScreenAnchorRect() const {
-+    return mozilla::CSSRect::FromAppUnitsRounded(mScreenRect);
-+  }
- 
-   mozilla::LayoutDeviceIntPoint GetLastClientOffset() const {
-     return mLastClientOffset;
-@@ -557,7 +559,7 @@ class nsMenuPopupFrame final : public ns
-   // override mXPos and mYPos.
-   int32_t mXPos;
-   int32_t mYPos;
-  nsIntRect mScreenRect;
-+  nsRect mScreenRect;
-   // Used for store rectangle which the popup is going to be anchored to,
-   // we need that for Wayland
- #ifdef MOZ_WAYLAND
-Index: firefox-91.0.2/layout/xul/nsMenuPopupFrame.cpp
-===================================================================
--- firefox-91.0.2.orig/layout/xul/nsMenuPopupFrame.cpp
-+++ firefox-91.0.2/layout/xul/nsMenuPopupFrame.cpp
-@@ -868,8 +868,9 @@ void nsMenuPopupFrame::InitializePopup(n
-       InitPositionFromAnchorAlign(anchor, align);
-     }
-   }
-
-  mScreenRect = nsIntRect(-1, -1, 0, 0);
-+  // When converted back to CSSIntRect it is (-1, -1, 0, 0) - as expected in
-+  // nsXULPopupManager::Rollup
-+  mScreenRect = nsRect(-AppUnitsPerCSSPixel(), -AppUnitsPerCSSPixel(), 0, 0);
- 
-   if (aAttributesOverride) {
-     // Use |left| and |top| dimension attributes to position the popup if
-@@ -881,11 +882,13 @@ void nsMenuPopupFrame::InitializePopup(n
-     nsresult err;
-     if (!left.IsEmpty()) {
-       int32_t x = left.ToInteger(&err);
-      if (NS_SUCCEEDED(err)) mScreenRect.x = x;
-+      if (NS_SUCCEEDED(err))
-+        mScreenRect.x = nsPresContext::CSSPixelsToAppUnits(x);
-     }
-     if (!top.IsEmpty()) {
-       int32_t y = top.ToInteger(&err);
-      if (NS_SUCCEEDED(err)) mScreenRect.y = y;
-+      if (NS_SUCCEEDED(err))
-+        mScreenRect.y = nsPresContext::CSSPixelsToAppUnits(y);
-     }
-   }
- }
-@@ -900,7 +903,8 @@ void nsMenuPopupFrame::InitializePopupAt
-   mPopupState = ePopupShowing;
-   mAnchorContent = nullptr;
-   mTriggerContent = aTriggerContent;
-  mScreenRect = nsIntRect(aXPos, aYPos, 0, 0);
-+  mScreenRect = nsRect(nsPresContext::CSSPixelsToAppUnits(aXPos),
-+                       nsPresContext::CSSPixelsToAppUnits(aYPos), 0, 0);
-   mXPos = 0;
-   mYPos = 0;
-   mFlip = FlipType_Default;
-@@ -920,7 +924,8 @@ void nsMenuPopupFrame::InitializePopupAs
-   mTriggerContent = aTriggerContent;
-   mPopupState = ePopupShowing;
-   mAnchorContent = nullptr;
-  mScreenRect = nsIntRect(aXPos, aYPos, 0, 0);
-+  mScreenRect = nsRect(nsPresContext::CSSPixelsToAppUnits(aXPos),
-+                       nsPresContext::CSSPixelsToAppUnits(aYPos), 0, 0);
-   mXPos = 0;
-   mYPos = 0;
-   mFlip = FlipType_Default;
-@@ -941,7 +946,7 @@ void nsMenuPopupFrame::InitializePopupAt
-                                              bool aAttributesOverride) {
-   InitializePopup(nullptr, aTriggerContent, aPosition, 0, 0,
-                   MenuPopupAnchorType_Rect, aAttributesOverride);
-  mScreenRect = aRect;
-+  mScreenRect = ToAppUnits(aRect, AppUnitsPerCSSPixel());
- }
- 
- void nsMenuPopupFrame::ShowPopup(bool aIsContextMenu) {
-@@ -1430,7 +1435,7 @@ nsresult nsMenuPopupFrame::SetPopupPosit
-     // If anchored to a rectangle, use that rectangle. Otherwise, determine the
-     // rectangle from the anchor.
-     if (mAnchorType == MenuPopupAnchorType_Rect) {
-      anchorRect = ToAppUnits(mScreenRect, AppUnitsPerCSSPixel());
-+      anchorRect = mScreenRect;
-     } else {
-       // if the frame is not specified, use the anchor node passed to OpenPopup.
-       // If that wasn't specified either, use the root frame. Note that
-@@ -1539,10 +1544,8 @@ nsresult nsMenuPopupFrame::SetPopupPosit
-       // Account for the margin that will end up being added to the screen
-       // coordinate the next time SetPopupPosition is called.
-       mAnchorType = MenuPopupAnchorType_Point;
-      mScreenRect.x =
-          nsPresContext::AppUnitsToIntCSSPixels(screenPoint.x - margin.left);
-      mScreenRect.y =
-          nsPresContext::AppUnitsToIntCSSPixels(screenPoint.y - margin.top);
-+      mScreenRect.x = screenPoint.x - margin.left;
-+      mScreenRect.y = screenPoint.y - margin.top;
-     }
-   } else {
-     // The popup is positioned at a screen coordinate.
-@@ -1571,10 +1574,8 @@ nsresult nsMenuPopupFrame::SetPopupPosit
-     }
- 
-     // next, convert into app units accounting for the zoom
-    screenPoint.x = presContext->DevPixelsToAppUnits(
-        nsPresContext::CSSPixelsToAppUnits(mScreenRect.x) / factor);
-    screenPoint.y = presContext->DevPixelsToAppUnits(
-        nsPresContext::CSSPixelsToAppUnits(mScreenRect.y) / factor);
-+    screenPoint.x = presContext->DevPixelsToAppUnits(mScreenRect.x / factor);
-+    screenPoint.y = presContext->DevPixelsToAppUnits(mScreenRect.y / factor);
-     anchorRect = nsRect(screenPoint, nsSize(0, 0));
- 
-     // add the margins on the popup
-@@ -2377,9 +2378,10 @@ void nsMenuPopupFrame::DestroyFrom(nsIFr
-   nsBoxFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
- }
- 
-void nsMenuPopupFrame::MoveTo(const CSSIntPoint& aPos, bool aUpdateAttrs) {
-+void nsMenuPopupFrame::MoveTo(const CSSPoint& aPos, bool aUpdateAttrs) {
-   nsIWidget* widget = GetWidget();
-  if ((mScreenRect.x == aPos.x && mScreenRect.y == aPos.y) &&
-+  nsPoint appUnitsPos = mozilla::CSSPixel::ToAppUnits(aPos);
-+  if ((mScreenRect.x == appUnitsPos.x && mScreenRect.y == appUnitsPos.y) &&
-       (!widget || widget->GetClientOffset() == mLastClientOffset)) {
-     return;
-   }
-@@ -2400,8 +2402,8 @@ void nsMenuPopupFrame::MoveTo(const CSSI
-   }
- 
-   mAnchorType = MenuPopupAnchorType_Point;
-  mScreenRect.x = aPos.x - nsPresContext::AppUnitsToIntCSSPixels(margin.left);
-  mScreenRect.y = aPos.y - nsPresContext::AppUnitsToIntCSSPixels(margin.top);
-+  mScreenRect.x = appUnitsPos.x - margin.left;
-+  mScreenRect.y = appUnitsPos.y - margin.top;
- 
-   SetPopupPosition(nullptr, true, false);
- 
-@@ -2409,8 +2411,8 @@ void nsMenuPopupFrame::MoveTo(const CSSI
-   if (aUpdateAttrs && (popup->HasAttr(kNameSpaceID_None, nsGkAtoms::left) ||
-                        popup->HasAttr(kNameSpaceID_None, nsGkAtoms::top))) {
-     nsAutoString left, top;
-    left.AppendInt(aPos.x);
-    top.AppendInt(aPos.y);
-+    left.AppendInt(RoundedToInt(aPos).x);
-+    top.AppendInt(RoundedToInt(aPos).y);
-     popup->SetAttr(kNameSpaceID_None, nsGkAtoms::left, left, false);
-     popup->SetAttr(kNameSpaceID_None, nsGkAtoms::top, top, false);
-   }
-Index: firefox-91.0.2/layout/xul/nsXULPopupManager.cpp
-===================================================================
--- firefox-91.0.2.orig/layout/xul/nsXULPopupManager.cpp
-+++ firefox-91.0.2/layout/xul/nsXULPopupManager.cpp
-@@ -269,8 +269,7 @@ bool nsXULPopupManager::Rollup(uint32_t
-       if (popupFrame->IsAnchored()) {
-         // Check if the popup has a screen anchor rectangle. If not, get the
-         // rectangle from the anchor element.
-        anchorRect =
-            CSSIntRect::FromUnknownRect(popupFrame->GetScreenAnchorRect());
-+        anchorRect = popupFrame->GetScreenAnchorRect();
-         if (anchorRect.x == -1 || anchorRect.y == -1) {
-           nsCOMPtr<nsIContent> anchor = popupFrame->GetAnchor();
- 
-@@ -507,7 +506,7 @@ void nsXULPopupManager::PopupMoved(nsIFr
-   } else {
-     CSSPoint cssPos = LayoutDeviceIntPoint::FromUnknownPoint(aPnt) /
-                       menuPopupFrame->PresContext()->CSSToDevPixelScale();
-    menuPopupFrame->MoveTo(RoundedToInt(cssPos), false);
-+    menuPopupFrame->MoveTo(cssPos, false);
-   }
- }
- 
--- a/mozilla-bmo1725828.patch
+++ b/mozilla-bmo1725828.patch
@ -0,0 +1,553 @@
+# HG changeset patch
+# Parent  fbca0d2a522cd1ab78001476293d3d79bfabb4cf
+
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>Tree - rpms/firefox - src.fedoraproject.org</title>
+        <link rel="shortcut icon" type="image/vnd.microsoft.icon"
+        href="/theme/static/favicon.ico?version=5.13.2"/>
+    <link href="/theme/static/fedora-bootstrap-1.3.0/fedora-bootstrap.min.css?version=5.13.2"
+        type="text/css" rel="stylesheet" />
+    <link href="/theme/static/fonts/fonts.css?version=5.13.2"
+        rel="stylesheet" type="text/css" />
+    <link href="/theme/static/fonts/hack_fonts/css/hack-extended.min.css?version=5.13.2"
+        type="text/css" rel="stylesheet" />
+    <link href="/theme/static/theme.css?version=5.13.2"
+        type="text/css" rel="stylesheet" />
+
+    <link type="text/css" rel="stylesheet" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" href="/static/vendor/font-awesome/font-awesome.css?version=5.13.2"/>
+    <link type="text/css" rel="stylesheet" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" href="/static/pagure.css?version=5.13.2"/>
+<link nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" rel="stylesheet" href="/static/vendor/highlight.js/styles/github.css?version=5.13.2"/>
+<link nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" rel="stylesheet" href="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.css?version=5.13.2"/>
+<style nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ">
+  .hljs {
+    background: #fff;
+  }
+</style>
+  </head>
+  <body id="home">
+
+    <!-- start masthead -->
+    <nav class="navbar navbar-light masthead p-0 navbar-expand">
+      <div class="container">
+        <a href="/" class="navbar-brand">
+        <img height=40px src="/theme/static/pagure-logo.png?version=5.13.2"
+             alt="pagure Logo" id="pagureLogo"/>
+        </a>
+        <ul class="navbar-nav ml-auto">
+
+
+
+          <li class="nav-item">
+            <a class="btn btn-primary" href="/login/?next=https://src.fedoraproject.org/rpms/firefox/blob/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch">Log In</a>
+          </li>
+        </ul>
+      </div>
+    </nav>
+    <!-- close masthead-->
+
+    <div class="bodycontent">
+
+
+<div class="bg-light border border-bottom pt-3">
+  <div class="container">
+    <div class="row mb-3">
+      <div class="col-6">
+        <div class="row">
+        <div class="col-auto pr-0">
+            <h3>
+<i class="fa fa-archive text-muted"></i></h3>
+        </div>
+        <div class="col-auto pl-2">
+            <h3 class="mb-0">
+<a href="/projects/rpms/%2A">rpms</a>&nbsp;/&nbsp;<a href="/rpms/firefox"><strong>firefox</strong></a>
+            </h3>
+        </div>
+        </div>
+      </div>
+      <div class="col-6 text-right">
+        <div class="btn-group">
+        <div class="btn-group">
+        <a href="#"
+            class="btn btn-sm dropdown-toggle btn-outline-primary"
+            data-toggle="dropdown" id="watch-button">
+          <i class="fa fa-clone fa-fw"></i>
+          <span>Clone</span>
+        </a>
+        <div class="dropdown-menu dropdown-menu-right">
+          <div class="m-3" id="source-dropdown" class="pointer">
+            <div>
+              <h5><strong>Source Code</strong></h5>
+
+              <div class="form-group">
+                <div class="input-group input-group-sm">
+                  <div class="input-group-prepend"><span class="input-group-text">GIT</span></div>
+                  <input class="form-control bg-white select-on-focus" type="text" value="https://src.fedoraproject.org/rpms/firefox.git" readonly>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>
+
+<ul class="nav nav-tabs nav-small border-bottom-0">
+  <li class="nav-item mr-2 text-dark">
+    <a class="nav-link active" href="/rpms/firefox">
+        <i class="fa fa-code fa-fw text-muted"></i>
+        <span class="d-none d-md-inline">Source</span>
+    </a>
+  </li>
+
+    <li class="nav-item mr-2 text-dark">
+        <a class="nav-link" href="https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&classification=Fedora&product=Fedora&product=Fedora EPEL&component=firefox">
+          <i class="fa fa-fw text-muted fa-exclamation-circle"></i>
+          <span class="d-none d-md-inline">Issues&nbsp;</span>
+          <span class="fa fa-external-link"></span>
+        </a>
+    </li>
+
+    <li class="nav-item mr-2 text-dark">
+      <a class="nav-link" href="/rpms/firefox/pull-requests">
+          <i class="fa fa-fw text-muted fa-arrow-circle-down"></i>
+          <span class="d-none d-md-inline">Pull Requests&nbsp;</span>
+          <span class="badge badge-secondary py-0 d-none d-md-inline">
+            0
+          </span>
+      </a>
+    </li>
+
+
+    <li class="nav-item mr-2 text-dark">
+      <a class="nav-link" href="/rpms/firefox/stats">
+          <i class="fa fa-line-chart fa-fw text-muted"></i>
+          <span class="d-none d-md-inline">Stats</span>
+      </a>
+    </li>
+
+
+</ul>
+  </div>
+</div>
+
+<div class="container pt-5 repo-body-container">
+  <div class="row">
+    <div class="col-2">
+<nav class="nav nav-tabs nav-sidetabs flex-column">
+  <a class=
+      "nav-link nowrap
+"
+      href="/rpms/firefox">
+      <i class="fa fa-home text-muted fa-fw"></i>&nbsp;<span class="d-none d-md-inline">Overview</span>
+  </a>
+  <a class=
+    "nav-link nowrap
+ active"
+    href="/rpms/firefox/tree/fc69159c16b8035abdc07e69134357970f6b516f">
+    <i class="fa fa-file-code-o text-muted fa-fw"></i>&nbsp;Files
+  </a>
+  <a class=
+    "nav-link nowrap
+"
+    href="/rpms/firefox/commits/fc69159c16b8035abdc07e69134357970f6b516f">
+    <i class="fa fa-list-alt text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits
+  </a>
+  <a class=
+    "nav-link nowrap
+"
+    href="/rpms/firefox/branches?branchname=fc69159c16b8035abdc07e69134357970f6b516f">
+    <i class="fa fa-random text-muted fa-fw"></i>&nbsp;Branches
+  </a>
+  <a class=
+    "nav-link nowrap
+"
+    href="/rpms/firefox/forks">
+    <i class="fa fa-code-fork text-muted fa-fw"></i>&nbsp;Forks
+  </a>
+  <a class=
+    "nav-link nowrap
+"
+    href="/rpms/firefox/releases">
+    <i class="fa fa-tags text-muted fa-fw"></i>&nbsp;Releases
+  </a>
+
+  <div class="col-xs-2 line-height-1"></div>
+  <h6>Monitoring status:</h6>
+  <div class="btn-group">
+    <button title="Monitoring status" class="btn btn-sm btn-outline-primary disabled"
+        id="monitoring-button">
+      <i id="monitoring-icon" class="fa fa-fw fa-eye"></i>
+      <span id="monitoring-label" class="fa fa-circle-o-notch fa-spin fa-1x fa-fw"></span>
+    </button>
+  </div>
+
+  <div class="col-xs-2 line-height-1"></div>
+  <div id="orphan-section" class="pt-3">
+      <div class="col-xs-2 line-height-1"></div>
+
+  </div>
+
+  <div class="pt-3">
+    <div class="col-xs-2 line-height-1">
+    <h6>Bugzilla Assignee:</h6>
+      <dl>
+        <dt>Fedora: </dt>
+        <dd id="fedora_assignee_txt">
+        gecko-maint
+        </dd>
+        <dt>EPEL: </dt>
+        <dd id="epel_assignee_txt">
+        gecko-maint
+        </dd>
+      </dl>
+    </div>
+  </div>
+
+  <div class="modal fade" id="modal_assignee" tabindex="-1"
+          role="dialog" aria-labelledby="Bugzilla assignee" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Bugzilla Assignee</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+            <span class="sr-only">Close</span>
+          </button>
+        </div>
+        <form id="change_assignees">
+          <div class="modal-body">
+            <label for="fedora_assignee">Fedora</label>
+            <input title="Default assignee for Fedora in bugzilla - Empty input resets to default"
+              class="form-control" name="fedora_assignee" id="fedora_assignee" value="gecko-maint"/>
+            <label for="epel_assignee">EPEL</label>
+            <input title="Default assignee for EPEL in bugzilla (if applicable) - Empty input resets to default"
+              class="form-control" name="epel_assignee" id="epel_assignee" value="gecko-maint" />
+            <p class="pt-2">
+              These two fields allow to specify a different default assignee for ticket opened against
+              this package in bugzilla. Note: The EPEL field is
+              always displayed for packages in the 'rpms' namespace regardless of whether it
+              is used in bugzilla or not.            </p>
+          </div>
+          <div class="modal-footer">
+            <button class="btn btn-secondary" type="button" title="Update bugzilla overrides" id="reset_assignees">
+               Reset to defaults
+            </button>
+            <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
+               Update
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="modal_orphan" tabindex="-1"
+          role="dialog" aria-labelledby="Orphan this package" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Orphan package</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+            <span class="sr-only">Close</span>
+          </button>
+        </div>
+          <div class="modal-body">
+            <div class="form-group">
+              <label for="reason_menu">Reason</label>
+              <select id="reason_menu" class="form-control">
+
+                <option id="lack_of_time_option_button">Lack of time</option>
+
+                <option id="do_not_use_it_option_button">Do not use it anymore</option>
+
+                <option id="unmaintained_option_button">Unmaintained upstream</option>
+
+                <option id="fails_to_build_option_button">Fails to build from source</option>
+
+                <option id="not_fixed_option_button">Important bug not fixed</option>
+
+                <option id="other_option_button">Other</option>
+              </select>
+            </div>
+          <label for="orphan_reason_info">Additional info</label>
+          <input title="Additional info for orphaning reason"
+                  class="form-control" name="orphan_reason_info" id="orphan_reason_info" value=""/>
+          </div>
+          <div class="modal-footer">
+            <button class="btn btn-primary" type="submit" title="Orphan this package" id="orphan_button">
+               Update
+            </button>
+          </div>
+      </div>
+    </div>
+  </div>
+
+  <script type="text/javascript" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ">
+    window.addEventListener('load', function() {
+      set_up_monitoring = function(status){
+        var _label = "Disabled"
+        if (status === "monitoring") {
+          _label = "Monitoring";
+          $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
+        } else if (status === "monitoring-with-scratch") {
+          _label = "Scratch builds"
+          $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
+        } else {
+          $("#monitoring-icon").attr("class", "fa fa-fw fa-eye-slash")
+        }
+
+        $("#monitoring-label").text(_label);
+        $("#monitoring-label").removeClass("fa fa-circle-o-notch fa-spin fa-1x fa-fw");
+      }
+
+      $.ajax({
+        url: "/_dg/anitya/rpms/firefox",
+        type: 'GET',
+        dataType: 'json',
+        success: function(res) {
+          console.log(res);
+          set_up_monitoring(res.monitoring)
+        }
+      });
+
+
+      $("#reset_assignees").on('click', function(){
+        $('#fedora_assignee').val('');
+        $('#epel_assignee').val('');
+        $("#change_assignees").submit();
+        return false;
+      });
+
+      $("#change_assignees").on('submit',  function(){
+        $('html').css('cursor', 'progress');
+        $('#reset_assignees').attr('disabled', true);
+        $('#update_assignees').attr('disabled', true);
+        $('#update_assignees').text('Updating...');
+        $.ajax({
+          url: "/_dg/bzoverrides/rpms/firefox",
+          type: 'POST',
+          dataType: 'json',
+          data: {
+             'epel_assignee': $('#epel_assignee').val(),
+             'fedora_assignee': $('#fedora_assignee').val()
+          },
+          success: function(res) {
+            $("#fedora_assignee_txt").text(res.fedora_assignee);
+            $("#epel_assignee_txt").text(res.epel_assignee);
+            $('#modal_assignee').modal('hide');
+            $('#reset_assignees').attr('disabled', false);
+            $('#update_assignees').attr('disabled', false);
+            $('#update_assignees').text('Update');
+            $('html').css('cursor', 'default');
+            console.log("Successfully changed the bugzilla assignees");
+            return false;
+          },
+          error: function(res) {
+            var msg = '';
+            if(res.responseJSON.errors){
+              msg = ': ' + res.responseJSON.errors.join(', ');
+            }
+            alert("Unable to update the bugzilla assignee(s)" + msg);
+            $('html').css('cursor', 'default');
+            $('#reset_assignees').attr('disabled', false);
+            $('#update_assignees').attr('disabled', false);
+            $('#update_assignees').text('Update');
+            return false;
+          }
+        })
+        return false;
+      });
+
+
+      $.ajax({
+        url: "/_dg/actived/rpms/firefox",
+        type: 'GET',
+        dataType: 'json',
+        success: function(res) {
+          var _btn = $("#take_orphan_button");
+          if (!res.active){
+            _btn.off("click");
+            _btn.click(function(){
+                window.open(
+                    "https://pagure.io/releng/new_issue?title="
+                    + "Unretire rpms/firefox"
+                    + "&amp;template=package_unretiremet");
+            });
+            _btn.prop( "title", "Package retired - Open a releng ticket to adopt it" );
+            _btn.html("Retired");
+          }
+          _btn.removeClass('disabled');
+        }
+      });
+
+      $("#orphan_button").click(function(){
+        $("#orphan_button").attr("disabled", true);
+        $.ajax({
+          url: "/_dg/orphan/rpms/firefox",
+          type: 'POST',
+          dataType: 'json',
+          data: {
+            'orphan_reason': $('#reason_menu').val(),
+            'orphan_reason_info': $('#orphan_reason_info').val()
+          },
+          success: function(res) {
+            $("#point_of_contact_div").html("Package is currently unmaintained");
+            $("#orphan_button").attr("disabled", false);
+            $('#modal_orphan').modal('hide');
+            $('#orphan-section').html('');
+          },
+          error: function(res) {
+            if (res.responseJSON.errors) {
+              alert('Unable to orphan the package: ' + res.responseJSON.errors);
+            } else {
+              alert('Unable to orphan the package: ' + res.responseJSON.error);
+            }
+            $("#orphan_button").attr("disabled", false);
+          }
+        });
+      });
+    });
+  </script>
+
+</nav>    </div>
+    <div class="col-10">
+  <div class="row mb-1">
+    <div class="col-sm-6">
+    <h3>
+      Files
+    </h3>
+    </div>
+
+    <div class="col-sm-6">
+      <div class="float-right">
+        <a href="#" class="btn btn-outline-light border-secondary text-dark btn-sm"
+        aria-haspopup="true" aria-expanded="false">
+        Commit: <span class="font-weight-bold">fc69159c16b8035abdc07e69134357970f6b516f</span>
+        </a>
+    </div>
+  </div>
+  </div>
+    <div class="card mb-3">
+      <div class="card-header">
+        <ol class="breadcrumb p-0 bg-transparent mb-0">
+          <li class="breadcrumb-item">
+            <a href="/rpms/firefox/tree/fc69159c16b8035abdc07e69134357970f6b516f">
+              <span class="fa fa-random">
+              </span>&nbsp; fc69159c16b8035abdc07e69134357970f6b516f
+            </a>
+          </li>
+          <li class="active breadcrumb-item">
+            <span class="fa fa-file" data-glyph="">
+            </span>&nbsp; mozilla-1725828.patch
+          </li>
+        </ol>
+      </div>
+
+  <div class="card-body p-0">
+            <div class="bg-light border text-right pr-2">
+                <form class="btn btn-sm" method="POST" name="fork_project"
+                    action="/fork_edit/rpms/firefox/edit/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch">
+                    <button class="btn btn-sm btn-secondary fork_project_btn">
+                            Fork and Edit
+                    </button>
+
+                </form>
+
+                <a class="btn btn-secondary btn-sm" href="/rpms/firefox/blob/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch" title="View as blob">Blob</a>
+
+                <a class="btn btn-secondary btn-sm" href="/rpms/firefox/blame/mozilla-1725828.patch?identifier=fc69159c16b8035abdc07e69134357970f6b516f" title="View git blame">Blame</a>
+
+                <a class="btn btn-secondary btn-sm" href="/rpms/firefox/history/mozilla-1725828.patch?identifier=fc69159c16b8035abdc07e69134357970f6b516f" title="View git log for this file">History</a>
+
+                <a class="btn btn-secondary btn-sm" href="/rpms/firefox/raw/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch" title="View as raw">Raw</a>
+            </div>
+
+        <pre class="syntaxhighlightblock"><code class="lang-diff">diff -up firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 firefox-92.0/dom/media/gmp/GMPChild.cpp
+
+diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
+--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
+@@ -227,18 +227,24 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
+               .EqualsASCII(lib.Data(), lib.Length())) {
+         LoadLibraryW(char16ptr_t(whiteListedLib));
+         break;
+       }
+     }
+   }
+ #elif defined(XP_LINUX)
+   constexpr static const char* whitelist[] = {
+      // NSS libraries used by clearkey.
+       "libfreeblpriv3.so",
+       "libsoftokn3.so",
+      // glibc libraries merged into libc.so.6; see bug 1725828 and
+      // the corresponding code in GMPParent.cpp.
+      "libdl.so.2",
+      "libpthread.so.0",
+      "librt.so.1",
+   };
+ 
+   nsTArray<nsCString> libs;
+   SplitAt(", ", aLibs, libs);
+   for (const nsCString& lib : libs) {
+     for (const char* whiteListedLib : whitelist) {
+       if (lib.EqualsASCII(whiteListedLib)) {
+         auto libHandle = dlopen(whiteListedLib, RTLD_NOW | RTLD_GLOBAL);
+@@ -251,17 +257,17 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
+           if (error) {
+             // We should always have an error, but gracefully handle just in
+             // case.
+             nsAutoCString nsError{error};
+             CrashReporter::AppendAppNotesToCrashReport(nsError);
+           }
+           // End bug 1698718 logging.
+ 
+-          MOZ_CRASH("Couldn't load lib needed by NSS");
+          MOZ_CRASH("Couldn't load lib needed by media plugin");
+         }
+       }
+     }
+   }
+ #endif
+   return IPC_OK();
+ }
+ 
+diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
+--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
+@@ -871,16 +871,30 @@ RefPtr<GenericPromise> GMPParent::ParseC
+     mLibs = "dxva2.dll"_ns;
+ #endif
+   } else {
+     GMP_PARENT_LOG_DEBUG("%s: Unrecognized key system: %s, failing.",
+                          __FUNCTION__, mDisplayName.get());
+     return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
+   }
+ 
+#ifdef XP_LINUX
+  // These glibc libraries were merged into libc.so.6 as of glibc
+  // 2.34; they now exist only as stub libraries for compatibility and
+  // newly linked code won&#39;t depend on them, so we need to ensure
+  // they&#39;re loaded for plugins that may have been linked against a
+  // different version of glibc.  (See also bug 1725828.)
+  if (!mDisplayName.EqualsASCII("clearkey")) {
+    if (!mLibs.IsEmpty()) {
+      mLibs.AppendLiteral(", ");
+    }
+    mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1");
+  }
+#endif
+
+   nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
+   nsTArray<nsCString> codecs;
+   SplitAt(",", codecsString, codecs);
+ 
+   // Parse the codec strings in the manifest and map them to strings used
+   // internally by Gecko for capability recognition.
+   //
+   // Google's code to parse manifests can be used as a reference for strings
--- a/mozilla-bmo531915.patch
+++ b/mozilla-bmo531915.patch
@ -0,0 +1,29 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent  7332dfc4c47d73f1b88850b7727d33096d68e329
+
+diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
+--- a/modules/fdlibm/src/math_private.h
+++ b/modules/fdlibm/src/math_private.h
+@@ -25,17 +25,21 @@
+ 
+ #include "mozilla/EndianUtils.h"
+ 
+ /*
+  * Emulate FreeBSD internal double types.
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
+#ifdef __i386__
+typedef long double __double_t;
+#else
+ typedef double      __double_t;
+#endif
+ typedef __double_t  double_t;
+ 
+ /*
+  * The original fdlibm code used statements like:
+  *	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
+  *	ix0 = *(n0+(int*)&x);			* high word of x *
+  *	ix1 = *((1-n0)+(int*)&x);		* low word of x *
+  * to dig two 32 bit words out of the 64 bit IEEE floating point
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@ -3,7 +3,7 @@
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  c8bc6be5267f16016d506973a2d6a7c58a1cd441
+# Parent  0dd1b6436342922d434e7c818875b2a02a73b5ed
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@ -31,22 +31,12 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 #ifdef MOZ_MEMORY
 #  include "mozmemory.h"
 #endif
-@@ -4635,25 +4636,37 @@ nsresult Preferences::InitInitialObjects
-   // application pref files for backwards compatibility.
-   static const char* specialFiles[] = {
- #if defined(XP_MACOSX)
-     "macprefs.js"
- #elif defined(XP_WIN)
-     "winpref.js"
- #elif defined(XP_UNIX)
+@@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects
     "unix.js"
-+    , "" // placeholder for KDE  (empty is otherwise harmless)
 #  if defined(_AIX)
     ,
     "aix.js"
 #  endif
- #elif defined(XP_BEOS)
-     "beos.js"
 #endif
   };
 
@ -69,7 +59,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 
   // Load jar:$app/omni.jar!/defaults/preferences/*.js
   // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4718,17 +4731,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects
       }
 
       nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@ -91,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -117,16 +117,20 @@ EXPORTS.mozilla += [
+@@ -118,16 +118,20 @@ EXPORTS.mozilla += [
 ]
 EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
 
@ -356,7 +346,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -93,17 +93,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
+@@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
         "../components/printingui",
     ]
 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
@ -1214,7 +1204,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-@@ -1024,17 +1024,17 @@ nsresult nsOSHelperAppService::GetHandle
+@@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle
 
 nsresult nsOSHelperAppService::OSProtocolHandlerExists(
     const char* aProtocolScheme, bool* aHandlerExists) {
@ -1233,7 +1223,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
     nsCOMPtr<nsIHandlerService> handlerSvc =
         do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
     if (NS_SUCCEEDED(rv) && handlerSvc) {
-@@ -1044,17 +1044,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco
   }
 
   return rv;
@ -1252,7 +1242,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 
 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol(
     const nsACString& aScheme, bool* _retval) {
-@@ -1147,17 +1147,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1148,17 +1148,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
   nsresult rv =
       LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
                                minorType, mime_types_description, true);
@ -1271,7 +1261,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 
     rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
                                   minorType, mime_types_description, false);
-@@ -1258,17 +1258,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1261,17 +1261,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
 
   // Now look up our extensions
   nsAutoString extensions, mime_types_description;
@ -1293,7 +1283,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul"
+@@ -137,16 +137,17 @@ FINAL_LIBRARY = "xul"
 
 LOCAL_INCLUDES += [
     "/layout/base",
@ -1855,7 +1845,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 #  include "prmem.h"
 #  include "plbase64.h"
 
-@@ -2021,62 +2022,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -2023,62 +2024,77 @@ nsLocalFile::SetPersistentDescriptor(con
 
 NS_IMETHODIMP
 nsLocalFile::Reveal() {
--- a/mozilla-s390-context.patch
+++ b/mozilla-s390-context.patch
@ -3,54 +3,51 @@
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  cb0089687ab899846b8229c3741261d50101340e
+# Parent  60715122a04aad06b33ad7259f1bde19803230da
 [mq]: mozilla-s390-context.patch

 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
 --- a/js/src/wasm/WasmSignalHandlers.cpp
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -150,16 +150,20 @@ using mozilla::DebugOnly;
- #    define FP_sig(p) ((p)->uc_mcontext.mc_fp)
- #    define SP_sig(p) ((p)->uc_mcontext.mc_i7)
- #  endif
- #  if defined(__linux__) && (defined(__ppc64__) || defined(__PPC64__) || \
-                              defined(__ppc64le__) || defined(__PPC64LE__))
- #    define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
- #    define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
- #  endif
+@@ -151,16 +151,20 @@ using mozilla::DebugOnly;
+ #      define FP_sig(p) ((p)->uc_mcontext.mc_fp)
+ #      define SP_sig(p) ((p)->uc_mcontext.mc_i7)
+ #    endif
+ #    if defined(__linux__) && (defined(__ppc64__) || defined(__PPC64__) || \
+                                defined(__ppc64le__) || defined(__PPC64LE__))
+ #      define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
+ #      define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
+ #    endif
 +#  if defined(__linux__) && defined(__s390x__)
 +#    define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
 +#    define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
 +#  endif
- #elif defined(__NetBSD__)
- #  define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
- #  define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
- #  define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
- #  define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
- #  define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
- #  define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
- #  define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
-@@ -381,18 +385,23 @@ struct macos_arm_context {
- #  define FP_sig(p) RFP_sig(p)
- #  define SP_sig(p) RSP_sig(p)
- #  define LR_sig(p) R31_sig(p)
- #elif defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
-     defined(__PPC64LE__)
- #  define PC_sig(p) R32_sig(p)
- #  define SP_sig(p) R01_sig(p)
- #  define FP_sig(p) R01_sig(p)
-+#elif defined(__s390x__)
-+# define PC_sig(p) PSWa_sig(p)
-+# define SP_sig(p) GR_sig(p, 15)
-+# define FP_sig(p) GR_sig(p, 11)
- #endif
+ #  elif defined(__NetBSD__)
+ #    define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
+ #    define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
+ #    define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
+ #    define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
+ #    define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
+ #    define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
+ #    define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
+@@ -371,16 +375,20 @@ struct macos_aarch64_context {
+ #    define FP_sig(p) RFP_sig(p)
+ #    define SP_sig(p) RSP_sig(p)
+ #    define LR_sig(p) R31_sig(p)
+ #  elif defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
+       defined(__PPC64LE__)
+ #    define PC_sig(p) R32_sig(p)
+ #    define SP_sig(p) R01_sig(p)
+ #    define FP_sig(p) R01_sig(p)
+#  elif defined(__s390x__)
+#    define PC_sig(p) PSWa_sig(p)
+#    define SP_sig(p) GR_sig(p, 15)
+#    define FP_sig(p) GR_sig(p, 11)
+ #  endif
 
-+
 static void SetContextPC(CONTEXT* context, uint8_t* pc) {
- #ifdef PC_sig
+ #  ifdef PC_sig
   *reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
- #else
+ #  else
   MOZ_CRASH();
- #endif
- }
- 
+ #  endif
--- a/mozilla-sandbox-fips.patch
+++ b/mozilla-sandbox-fips.patch
@ -7,7 +7,7 @@ bsc#1174284 - Firefox tab just crashed in FIPS mode
 diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp
 --- a/security/sandbox/linux/Sandbox.cpp
 +++ b/security/sandbox/linux/Sandbox.cpp
-@@ -647,16 +647,17 @@ void SetMediaPluginSandbox(const char* a
+@@ -650,16 +650,17 @@ void SetMediaPluginSandbox(const char* a
     SANDBOX_LOG_ERROR("failed to open plugin file %s: %s", aFilePath,
                       strerror(errno));
     MOZ_CRASH("failed while trying to open the plugin file ");
@ -15,8 +15,8 @@ diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox
 
   auto files = new SandboxOpenedFiles();
   files->Add(std::move(plugin));
-   files->Add("/dev/urandom", true);
-+  files->Add("/dev/random", true);
+   files->Add("/dev/urandom", SandboxOpenedFile::Dup::YES);
+  files->Add("/dev/random", SandboxOpenedFile::Dup::YES);
   files->Add("/etc/ld.so.cache");  // Needed for NSS in clearkey.
   files->Add("/sys/devices/system/cpu/cpu0/tsc_freq_khz");
   files->Add("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq");
@ -28,7 +28,7 @@ diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox
 diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 --- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 +++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -308,16 +308,18 @@ void SandboxBrokerPolicyFactory::InitCon
+@@ -315,16 +315,18 @@ void SandboxBrokerPolicyFactory::InitCon
     policy->AddDir(rdwr, "/dev/dri");
   }
 
--- a/mozilla-silence-no-return-type.patch
+++ b/mozilla-silence-no-return-type.patch
--- a/mozilla.sh.in
+++ b/mozilla.sh.in
@ -88,7 +88,7 @@ export GNOME_DISABLE_CRASH_DIALOG=1
 WAYLAND_SUPPORTED=%WAYLAND_SUPPORTED

 # $XDG_SESSION_TYPE should contain either x11 or wayland
-if [ $WAYLAND_SUPPORTED -eq 1 ] && [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+if [ $WAYLAND_SUPPORTED -eq 1 ] && [ "$XDG_SESSION_TYPE" = "wayland" ] && [ -z "$MOZ_ENABLE_WAYLAND" ]; then
  export MOZ_ENABLE_WAYLAND=1
 fi

--- a/8
+++ b/8
@ -1,10 +1,10 @@
 PRODUCT="firefox"
 CHANNEL="release"
-VERSION="92.0.1"
+VERSION="93.0"
 VERSION_SUFFIX=""
-PREV_VERSION="92.0"
+PREV_VERSION="92.0.1"
 PREV_VERSION_SUFFIX=""
 #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
 RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
-RELEASE_TAG="d7bbc5812f7f36a9378165fffd7a058ddb0118ec"
-RELEASE_TIMESTAMP="20210922161155"
+RELEASE_TAG="08b69dc588fbdd88334ebcb6fa303eec95176cd6"
+RELEASE_TIMESTAMP="20210927210923"