- add mozilla-python313.patch to fix build with python 3.13+

--- MozillaFirefox.changes	(revision 73662aa7836c9b53a9764e947bcc10a5)
+++ MozillaFirefox.changes	(working copy)
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 23 17:52:32 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- add mozilla-python313.patch to fix build with python 3.13+
+
 -------------------------------------------------------------------
 Fri Nov 15 13:37:19 UTC 2024 - Wolfgang Rosenauer <wr@rosenauer.org>
 
@@ -5203,7 +5208,7 @@
     CSRF attacks through 307 redirects and NPAPI plugins
   * CVE-2018-12365 (bmo#1459206)
     Compromised IPC child process can list local filenames
-  * CVE-2018-12371 (bmo#1465686) 
+  * CVE-2018-12371 (bmo#1465686)
     Integer overflow in Skia library during edge builder allocation
   * CVE-2018-12366 (bmo#1464039)
     Invalid data handling during QCMS transformations
@@ -9235,8 +9240,8 @@
 Sun Jun 27 20:24:31 CEST 2010 - wr@rosenauer.org
 
 - update to 3.6.6 release
-  * modifies the crash protection feature to increase the amount 
-    of time that plugins are allowed to be non-responsive before 
+  * modifies the crash protection feature to increase the amount
+    of time that plugins are allowed to be non-responsive before
     being terminated.
 
 -------------------------------------------------------------------
@@ -9394,7 +9399,7 @@
   * MFSA 2009-64/CVE-2009-3380/CVE-2009-3381/CVE-2009-3383
     Crashes with evidence of memory corruption
 - removed upstreamed patch
-  * firefox-bug506901.patch 
+  * firefox-bug506901.patch
 
 -------------------------------------------------------------------
 Wed Oct  7 20:11:24 CEST 2009 - llunak@novell.com
@@ -9404,7 +9409,7 @@
 -------------------------------------------------------------------
 Fri Oct  2 20:26:49 CEST 2009 - wr@rosenauer.org
 
-- improve UI colors to be usable with dark themes at all 
+- improve UI colors to be usable with dark themes at all
   (firefox-browser-css.patch) (bnc#503351)
 - extend list of supported architectures as ABI identifier
   (mozilla-abi.patch) (bnc#543460)
@@ -9412,9 +9417,9 @@
 -------------------------------------------------------------------
 Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org
 
-- added KDE integration patch from llunak@novell.com  
-  (firefox-kde.patch)  
-  * support for knotify, making -kde4-addon obsolete  
+- added KDE integration patch from llunak@novell.com
+  (firefox-kde.patch)
+  * support for knotify, making -kde4-addon obsolete
   * KDE-specific support functional (bnc#170055)
 - do not build libnkgnomevfs (bmo#512671) (firefox-no-gnomevfs)
 
@@ -9437,8 +9442,8 @@
 
 - renamed patch firefox-contextmenu-gnome to firefox-cross-desktop
   as it contains more tweaks to handle non-Gnome environments and
-  especially KDE integration: 
-  * added the ability to set the KDE default browser 
+  especially KDE integration:
+  * added the ability to set the KDE default browser
     (still part of bnc#170055)
 
 -------------------------------------------------------------------
@@ -9604,16 +9609,16 @@
 - security update to 3.0.6 (bnc#470074)
   * MFSA 2009-06/CVE-2009-0358: Directives to not cache pages ignored
     (bmo#441751)
-  * MFSA 2009-05/CVE-2009-0357: XMLHttpRequest allows reading 
+  * MFSA 2009-05/CVE-2009-0357: XMLHttpRequest allows reading
     HTTPOnly cookies (bmo#380418)
-  * MFSA 2009-04/CVE-2009-0356: Chrome privilege escalation via 
+  * MFSA 2009-04/CVE-2009-0356: Chrome privilege escalation via
     local .desktop files (bmo#460425)
   * MFSA 2009-03/CVE-2009-0355: Local file stealing with SessionStore
     (bmo#466937)
-  * MFSA 2009-02/CVE-2009-0354: XSS using a chrome XBL method 
+  * MFSA 2009-02/CVE-2009-0354: XSS using a chrome XBL method
     and window.eval (bmo#468581)
-  * MFSA 2009-01/CVE-2009-0352 - CVE-2009-0353: Crashes with 
-    evidence of memory corruption (rv:1.9.0.6) (bmo#452913, 
+  * MFSA 2009-01/CVE-2009-0352 - CVE-2009-0353: Crashes with
+    evidence of memory corruption (rv:1.9.0.6) (bmo#452913,
     bmo#449006, bmo#331088, bmo#401042, bmo#416461, bmo#422283,
     bmo#422301, bmo#431705, bmo#437142, bmo#421839, bmo#420697,
     bmo#461027)
@@ -9658,7 +9663,7 @@
   * Bookmark editing it now properly locked down. bnc#439335
   * Bookmars are properly hidden.
   * History is properly locked down. bnc#439343
-  * Make sure the search bar is not put back when resetting the 
+  * Make sure the search bar is not put back when resetting the
     toolbar. bnc#439358
 
 -------------------------------------------------------------------
@@ -9779,13 +9784,13 @@
 -------------------------------------------------------------------
 Mon Jul 28 20:54:22 CEST 2008 - mauro@suse.de
 
-- Update to stability/security release 3.0.1 (bnc#407573) 
+- Update to stability/security release 3.0.1 (bnc#407573)
   (thanks, Wolfgang)
   + MFSA 2008-36  Crash with malformed GIF file on Mac OS X
-  + MFSA 2008-35 Command-line URLs launch multiple tabs when 
+  + MFSA 2008-35 Command-line URLs launch multiple tabs when
     Firefox not running
   + MFSA 2008-34 Remote code execution by overflowing CSS reference counter
-- Set browser.shell.checkDefaultBrowser to true (bnc#404119) 
+- Set browser.shell.checkDefaultBrowser to true (bnc#404119)
 
 -------------------------------------------------------------------
 Tue Jun 17 18:49:33 CEST 2008 - maw@suse.de
@@ -9996,7 +10001,7 @@
 -------------------------------------------------------------------
 Wed Sep 12 15:21:06 CEST 2007 - dmueller@suse.de
 
-- fix hardlinks accross partitions 
+- fix hardlinks accross partitions
 
 -------------------------------------------------------------------
 Thu Sep  6 16:07:12 CEST 2007 - maw@suse.de
@@ -10007,12 +10012,12 @@
 -------------------------------------------------------------------
 Mon Sep  3 22:33:09 CEST 2007 - ro@suse.de
 
-- move last change a bit further in specfile 
+- move last change a bit further in specfile
 
 -------------------------------------------------------------------
 Fri Aug 31 18:36:16 CEST 2007 - maw@suse.de
 
-- Mark a .png file as nonexecutable. 
+- Mark a .png file as nonexecutable.
 
 -------------------------------------------------------------------
 Tue Aug 28 16:44:08 CEST 2007 - maw@suse.de
@@ -10030,7 +10035,7 @@
   + Add x11-session.patch, supporting X11 session management
     (#227047)
   + Update to version 2.0.0.6
-    * MFSA 2007-26  Privilege escalation through chrome-loaded 
+    * MFSA 2007-26  Privilege escalation through chrome-loaded
                     about:blank windows
     * MFSA 2007-27  Unescaped URIs passed to external programs
                     (only relevant on Windows)
@@ -10043,7 +10048,7 @@
   page.
 
 -------------------------------------------------------------------
-Thu Aug 16 14:57:27 CEST 2007 - mauro@suse.de 
+Thu Aug 16 14:57:27 CEST 2007 - mauro@suse.de
 
 - Revert previous change.
 
@@ -10052,7 +10057,7 @@
 
 - Added support for ymp in the mimetypes.rdf
 - Added OneClickInstallUrlHandler for handing the actual call from firefox.
-- Fixes bnc #295677 
+- Fixes bnc #295677
 
 -------------------------------------------------------------------
 Mon Jul 23 18:57:07 CEST 2007 - maw@suse.de
@@ -10108,7 +10113,7 @@
 -------------------------------------------------------------------
 Mon Apr 30 16:49:55 CEST 2007 - ro@suse.de
 
-- added unzip to BuildRequires 
+- added unzip to BuildRequires
 
 -------------------------------------------------------------------
 Wed Apr 18 14:16:44 CEST 2007 - mfabian@suse.de
@@ -10232,7 +10237,7 @@
 -------------------------------------------------------------------
 Thu Nov  9 19:09:46 CET 2006 - jhargadon@suse.de
 
-- updated tango theme 
+- updated tango theme
 
 -------------------------------------------------------------------
 Sun Oct 29 12:05:46 CET 2006 - aj@suse.de
@@ -10269,10 +10274,10 @@
 - update to version 2.0rc3:
   * New features: Visual Refresh, Built-in phishing protection,
     Enhanced search capabilities, Improved tabbed browsing,
-    Resuming your browsing session, Previewing and subscribing 
+    Resuming your browsing session, Previewing and subscribing
     to Web feeds, Inline spell checking, Live Titles,
-    Improved Add-ons manager, JavaScript 1.7, Extended search 
-    plugin format, Updates to the extension system, 
+    Improved Add-ons manager, JavaScript 1.7, Extended search
+    plugin format, Updates to the extension system,
     Client-side session and persistent storage, SVG text
 
 -------------------------------------------------------------------
@@ -10294,7 +10299,7 @@
 -------------------------------------------------------------------
 Fri Aug 11 20:51:48 CEST 2006 - stark@suse.de
 
-- fixed crash in dbus component (patch by thoenig #197928) 
+- fixed crash in dbus component (patch by thoenig #197928)
 - use external adresses for PAC configuration (#196506)
 
 -------------------------------------------------------------------
@@ -10321,7 +10326,7 @@
 
 - fixed printing crash if the last used printer is not available
   anymore (#187013)
-  
+
 -------------------------------------------------------------------
 Fri Jun 16 22:11:22 CEST 2006 - stark@suse.de
 
@@ -10398,7 +10403,7 @@
 - get available paper sizes from CUPS (#65482)
 - replaced/removed complicated gconfd reload in %post (#167989)
 - fixed memory leak in clipboard caching (bmo #289897)
-  
+
 -------------------------------------------------------------------
 Tue Apr 11 08:35:53 CEST 2006 - stark@suse.de
 
@@ -10447,7 +10452,7 @@
 Tue Feb 14 06:45:24 CET 2006 - stark@suse.de
 
 - modified lockdown patches (#67281, #67282)
-- applied set of security patches (#148876) 
+- applied set of security patches (#148876)
   bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947
 
 -------------------------------------------------------------------
@@ -10489,7 +10494,7 @@
 -------------------------------------------------------------------
 Sun Jan 22 17:06:57 CET 2006 - stark@suse.de
 
-- disable Pango if MOZ_ENABLE_PANGO is not set 
+- disable Pango if MOZ_ENABLE_PANGO is not set
   and no typical language which needs Pango is used (#143428)
 
 -------------------------------------------------------------------
@@ -10553,7 +10558,7 @@
 -------------------------------------------------------------------
 Fri Nov 18 07:41:41 CET 2005 - stark@suse.de
 
-- update to 1.5rc3 (20051117) 
+- update to 1.5rc3 (20051117)
 
 -------------------------------------------------------------------
 Mon Oct 31 08:58:14 CET 2005 - stark@suse.de
@@ -10601,7 +10606,7 @@
 - security update to 1.0.7 (#117619)
   * MFSA 2005-57: IDN heap overrun using soft-hyphens (bmo #307259)
     (enabled IDN pref again)
-  * MFSA 2005-58: 
+  * MFSA 2005-58:
       CAN-2005-2701 Heap overrun in XBM image processing
       CAN-2005-2702 Crash on "zero-width non-joiner" sequence
       CAN-2005-2703 XMLHttpRequest header spoofing
@@ -10646,7 +10651,7 @@
 - install gconf schema for lockdown also on non-NLD
 - added backports (firefox-backports.patch)
   * gtk_im_context_set_cursor_location() is not used (bmo #281339)
-  * fixed crash in imgCacheValidator::OnStartRequest() 
+  * fixed crash in imgCacheValidator::OnStartRequest()
     (bmo #293307)
 - workaround for linking with pangoxft and pangox
   (broken by gtk 2.8 update) (#105764)
@@ -10809,7 +10814,7 @@
 -------------------------------------------------------------------
 Fri Apr 22 02:06:06 CEST 2005 - ro@suse.de
 
-- use mozilla-gcc4.patch 
+- use mozilla-gcc4.patch
 
 -------------------------------------------------------------------
 Thu Apr 21 12:51:19 CEST 2005 - stark@suse.de
@@ -10824,14 +10829,14 @@
 -------------------------------------------------------------------
 Fri Apr 15 00:10:54 CEST 2005 - ro@suse.de
 
-- fix problem in postinstall script 
+- fix problem in postinstall script
 
 -------------------------------------------------------------------
 Wed Apr 14 09:20:02 CEST 2005 - stark@suse.de
 
 - included fixed lockdown patch for NLD
 - linked proxies within Firefox with gnome settings (NLD)
-- added gconfd restart procedure to install script 
+- added gconfd restart procedure to install script
   (only needed if gconf changes are done) (#76852)
 
 -------------------------------------------------------------------
@@ -10854,7 +10859,7 @@
 - added default-plugin-less-annoying from mozilla
 - use GTK2 for Flash
 - use system NSPR on SUSE releases after 9.3
-- made startscript PIS aware 
+- made startscript PIS aware
 - set g-application-name correctly (bmo #281979)
 - added man-page
 - use GTK system colors
@@ -10876,7 +10881,7 @@
 -------------------------------------------------------------------
 Thu Mar 17 21:01:11 CET 2005 - stark@suse.de
 
-- updates from upcoming 1.0.2 
+- updates from upcoming 1.0.2
 - added again logic to use Adobe Reader 7 (#70861)
 - fixed crash in ICO decoding (#67142, bmo #245631)
 - preinstall beagle extension (#72920)
@@ -10900,7 +10905,7 @@
 Mon Mar  7 20:47:00 CET 2005 - stark@suse.de
 
 - disable inclusion of acrobat plugin again (#70861)
-- don't use gconfd in registration phase (#66381) 
+- don't use gconfd in registration phase (#66381)
 
 -------------------------------------------------------------------
 Mon Mar  7 16:13:29 CET 2005 - adrian@suse.de
@@ -10954,10 +10959,10 @@
 Thu Feb 10 06:57:33 CET 2005 - stark@suse.de
 
 - additional fireflashing fix (#50635, bmo #280664)
-- some more security related fixes 
+- some more security related fixes
   (bmo #268483, #273498, #277322)
 - fire up GTK2 filepicker if GNOME is running
-  
+
 -------------------------------------------------------------------
 Tue Feb  8 07:51:13 CET 2005 - stark@suse.de
 
@@ -11031,7 +11036,7 @@
 -------------------------------------------------------------------
 Thu Nov 11 09:01:58 CET 2004 - stark@suse.de
 
-- made initial window height smaller again 
+- made initial window height smaller again
 
 -------------------------------------------------------------------
 Tue Nov  9 09:09:06 CET 2004 - stark@suse.de
@@ -11041,7 +11046,7 @@
 -------------------------------------------------------------------
 Thu Nov  4 08:22:36 CET 2004 - stark@suse.de
 
-- update to 1.0rc2 
+- update to 1.0rc2
 
 -------------------------------------------------------------------
 Sat Oct 30 21:27:29 CEST 2004 - stark@suse.de
@@ -11073,7 +11078,7 @@
 
 -------------------------------------------------------------------
 Wed Oct  6 23:11:01 CEST 2004 - joeshaw@suse.de
- 
+
  - disable gconf settings as default (Ximian #67718)
 
 -------------------------------------------------------------------
@@ -11084,7 +11089,7 @@
 -------------------------------------------------------------------
 Tue Oct  5 10:09:04 CEST 2004 - stark@suse.de
 
-- small important fix in firefox-download.patch (Ximian #65472) 
+- small important fix in firefox-download.patch (Ximian #65472)
 
 -------------------------------------------------------------------
 Sun Oct  3 00:02:09 CEST 2004 - stark@suse.de
@@ -11107,7 +11112,7 @@
 -------------------------------------------------------------------
 Wed Sep 29 15:54:46 CEST 2004 - stark@suse.de
 
-- fix inclusion of RealPlayer plugin (Ximian #65711) 
+- fix inclusion of RealPlayer plugin (Ximian #65711)
 
 -------------------------------------------------------------------
 Mon Sep 27 17:51:24 CEST 2004 - joeshaw@suse.de
@@ -11141,7 +11146,7 @@
 - synced NLD package with 9.2 version
 - GTK2 filepicker does now ask for confirmation when overwriting
   files (Ximian #65068) by sagarwala@novell.com
-- no direct update function (Ximian #65615) by rganesan@novell.com 
+- no direct update function (Ximian #65615) by rganesan@novell.com
 - throbber linked to Novell (Ximian #66283) by rganesan@novell.com
 - make industrial the default theme for NLD
   (Ximian #65542) by joeshaw@suse.de
@@ -11163,13 +11168,13 @@
 -------------------------------------------------------------------
 Sun Sep 19 15:42:30 CEST 2004 - stark@suse.de
 
-- use GNOME system prefs only for NLD by default 
+- use GNOME system prefs only for NLD by default
   (fixes bug #45575)
 
 -------------------------------------------------------------------
 Fri Sep 17 08:59:32 CEST 2004 - stark@suse.de
 
-- joeshaw@suse.de: Update GConf patch so that proxy settings work 
+- joeshaw@suse.de: Update GConf patch so that proxy settings work
   correctly (Ximian #64461)
 - don't search Java on every path (Ximian #65383)
 - added some missing fixes for official release
@@ -11180,7 +11185,7 @@
 
 - update to official 1.0PR (0.10)
 - adopted gnome-filepicker patch
-- removed obsolete CUPS hack from start-script 
+- removed obsolete CUPS hack from start-script
   (Ximian #65635, #65560)
 
 -------------------------------------------------------------------
@@ -11196,7 +11201,7 @@
 -------------------------------------------------------------------
 Mon Sep  6 13:48:03 CEST 2004 - stark@suse.de
 
-- update to 1.0PR (aka 0.10) 
+- update to 1.0PR (aka 0.10)
 
 -------------------------------------------------------------------
 Fri Sep  3 21:35:47 CEST 2004 - stark@suse.de
@@ -11206,12 +11211,12 @@
 -------------------------------------------------------------------
 Thu Sep  2 03:08:59 CEST 2004 - dave@suse.de
 
-- Fixed up the .desktop installation on nld 
+- Fixed up the .desktop installation on nld
 
 -------------------------------------------------------------------
 Wed Sep  1 15:05:48 CEST 2004 - shprasad@suse.de
 
-- Doesn't ask to set Firefox as default web-browser. 
+- Doesn't ask to set Firefox as default web-browser.
 
 -------------------------------------------------------------------
 Tue Aug 31 14:01:18 CEST 2004 - stark@suse.de
@@ -11229,7 +11234,7 @@
 -------------------------------------------------------------------
 Fri Aug 20 17:12:48 CEST 2004 - stark@suse.de
 
-- update to snapshot (20040820) 
+- update to snapshot (20040820)
 
 -------------------------------------------------------------------
 Thu Aug 19 08:46:42 CEST 2004 - stark@suse.de
@@ -11253,7 +11258,7 @@
 -------------------------------------------------------------------
 Thu Aug  5 06:27:41 CEST 2004 - stark@suse.de
 
-- security update to 0.9.3 
+- security update to 0.9.3
   (including #43312 and others)
 - handle RealPlayer 9 plugin
 
@@ -11265,13 +11270,13 @@
 -------------------------------------------------------------------
 Wed Jul 28 08:46:31 CEST 2004 - stark@suse.de
 
-- added fix against certificate spoofing (#43312) 
+- added fix against certificate spoofing (#43312)
 
 -------------------------------------------------------------------
 Fri Jul 23 06:31:41 CEST 2004 - stark@suse.de
 
 - update to 0.9.2
-- added workaround for extension registry 
+- added workaround for extension registry
 - removed old (incompatible) mozex extension
 
 -------------------------------------------------------------------
@@ -11283,7 +11288,7 @@
 -------------------------------------------------------------------
 Tue Jun 15 12:42:28 CEST 2004 - stark@suse.de
 
-- update to 0.9 
+- update to 0.9
 - added patch for newer freetype
 
 -------------------------------------------------------------------
@@ -11299,7 +11304,7 @@
   milestone builds
 - changed profile-dir to .firefox
 - added some needed files
-- enabled gnomevfs extension 
+- enabled gnomevfs extension
 
 -------------------------------------------------------------------
 Fri Mar 26 18:09:34 CET 2004 - uli@suse.de
@@ -11309,13 +11314,13 @@
 -------------------------------------------------------------------
 Wed Mar  3 06:52:00 CET 2004 - stark@suse.de
 
-- removed unused patches for GTK2 build 
+- removed unused patches for GTK2 build
 - more fixes for (#35179)
 
 -------------------------------------------------------------------
 Mon Mar  1 07:32:52 CET 2004 - stark@suse.de
 
-- improved start-script to interact with thunderbird (#35179) 
+- improved start-script to interact with thunderbird (#35179)
 
 -------------------------------------------------------------------
 Thu Feb 26 06:57:05 CET 2004 - stark@suse.de
@@ -11328,15 +11333,15 @@
 -------------------------------------------------------------------
 Tue Feb 24 16:43:17 CET 2004 - stark@suse.de
 
-- fixed optimization for non-x86 archs 
+- fixed optimization for non-x86 archs
 
 -------------------------------------------------------------------
 Tue Feb 24 07:43:35 CET 2004 - stark@suse.de
 
-- adopted file-list and build options to original distribution 
+- adopted file-list and build options to original distribution
 - added prdtoa fix (#32963)
 - added hook for static firefox build to rebuild-databases.sh
-- added compiler flags for security/ (nss-opt.patch) 
+- added compiler flags for security/ (nss-opt.patch)
 - included mozex (mozex.mozdev.org)
 - added -Os as optimization flag
 
@@ -11344,14 +11349,14 @@
 Mon Feb  9 21:59:37 CET 2004 - stark@suse.de
 
 - renamed to MozillaFirefox
-- update to final version 0.8 
+- update to final version 0.8
 
 -------------------------------------------------------------------
 Fri Feb  6 08:39:15 CET 2004 - stark@suse.de
 
 - update to Firebird 0.8 (20040205)
 - added mips build fix
-- set PS printer list in MozillaFirebird.sh 
+- set PS printer list in MozillaFirebird.sh
 - use lib64 again for biarch platforms
 
 -------------------------------------------------------------------
@@ -11391,20 +11396,20 @@
 -------------------------------------------------------------------
 Fri Jun 20 06:53:08 CEST 2003 - stark@suse.de
 
-- update to snapshot 20030622 (0.7pre) 
+- update to snapshot 20030622 (0.7pre)
 
 -------------------------------------------------------------------
 Mon May 19 08:54:46 CEST 2003 - stark@suse.de
 
-- update to snapshot 20030518 (0.6) 
+- update to snapshot 20030518 (0.6)
 
 -------------------------------------------------------------------
 Sun May  7 10:11:16 CEST 2003 - stark@suse.de
 
-- update to snapshot 20030507 
+- update to snapshot 20030507
 
 -------------------------------------------------------------------
 Wed Apr 30 13:26:43 CEST 2003 - stark@suse.de
 
-- initial SuSE package 
-
+- initial SuSE package
+

Index: MozillaFirefox.spec
===================================================================

--- MozillaFirefox.spec	(revision 73662aa7836c9b53a9764e947bcc10a5)
+++ MozillaFirefox.spec	(working copy)
@@ -222,6 +222,7 @@
 Patch20:        one_swizzle_to_rule_them_all.patch
 Patch21:        svg-rendering.patch
 Patch24:        mozilla-bmo1746799.patch
+Patch25:        mozilla-python313.patch
 # Firefox/browser
 Patch102:       firefox-branded-icons.patch
 %endif

Index: mozilla-python313.patch
===================================================================
--- mozilla-python313.patch	(revision 0)
+++ mozilla-python313.patch	(revision 0)
@@ -0,0 +1,45 @@
+Taken from https://hg.mozilla.org/mozilla-central/rev/7a8dbd4de3c70d6a6ac98469a9b92e4877019e0c
+
+--- a/python/mozbuild/mozbuild/action/node.py
++++ b/python/mozbuild/mozbuild/action/node.py
+@@ -1,19 +1,20 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-import pipes
+ import subprocess
+ import sys
+ 
+ import buildconfig
+ import six
+ 
++from mozbuild.shellutil import quote as shell_quote
++
+ SCRIPT_ALLOWLIST = [buildconfig.topsrcdir + "/devtools/client/shared/build/build.js"]
+ 
+ ALLOWLIST_ERROR = """
+ %s is not
+ in SCRIPT_ALLOWLIST in python/mozbuild/mozbuild/action/node.py.
+ Using NodeJS from moz.build is currently in beta, and node
+ scripts to be executed need to be added to the allowlist and
+ reviewed by a build peer so that we can get a better sense of
+@@ -42,18 +43,17 @@ def execute_node_cmd(node_cmd_list):
+ 
+     The node script is expected to output lines for all of the dependencies
+     to stdout, each prefixed by the string "dep:".  These lines will make up
+     the returned set of dependencies.  Any line not so-prefixed will simply be
+     printed to stderr instead.
+     """
+ 
+     try:
+-        printable_cmd = " ".join(pipes.quote(arg) for arg in node_cmd_list)
+-        print('Executing "{}"'.format(printable_cmd), file=sys.stderr)
++        print('Executing "{}"'.format(shell_quote(*node_cmd_list)), file=sys.stderr)
+         sys.stderr.flush()
+ 
+         # We need to redirect stderr to a pipe because
+         # https://github.com/nodejs/node/issues/14752 causes issues with make.
+         proc = subprocess.Popen(
+             node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+         )

• Files Changed
• Browse Source