Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 http/firefox/HISTORY                                                |    3 
 http/firefox/patches/0031-bgo-944056-fix-wasm-on-llvm-profile.patch |   13 
 http/firefox/patches/0032-bmo-1932163-python-3.13-fix.patch         |   48 
+++
 http/firefox/patches/0033-bmo-1925198-python-3.13-fix2.patch        |   62 
++++
 http/firefox/patches/0034-bmo-1926140-python-3.13-fix3.patch        |  148 
++++++++++
 5 files changed, 274 insertions(+)

New commits:
commit f4fea31bf00e51d0d32a47405ebf9f895f23d5c5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    http/firefox: updated patches for 133.0.x

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index d1810d8..e41120b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2024-12-16 Pavel Vinogradov <public AT sourcemage.org>
+       * patches/*: updated
+
 2024-12-10 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 133.0.3
        * patches/*: updated
diff --git 
a/http/firefox/patches/0031-bgo-944056-fix-wasm-on-llvm-profile.patch 
b/http/firefox/patches/0031-bgo-944056-fix-wasm-on-llvm-profile.patch
new file mode 100644
index 0000000..e9b6bfa
--- /dev/null
+++ b/http/firefox/patches/0031-bgo-944056-fix-wasm-on-llvm-profile.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/944056
+
+--- a/gfx/graphite2/src/MozGrMalloc.h
++++ b/gfx/graphite2/src/MozGrMalloc.h
+@@ -12,7 +12,7 @@
+
+ #include "mozilla/mozalloc.h"
+
+-#if defined(XP_LINUX) && !defined(ANDROID)
++#if defined(XP_LINUX) && !defined(_LIBCPP_VERSION)
+
+ #define malloc moz_xmalloc
+ #define calloc moz_xcalloc
diff --git a/http/firefox/patches/0032-bmo-1932163-python-3.13-fix.patch 
b/http/firefox/patches/0032-bmo-1932163-python-3.13-fix.patch
new file mode 100644
index 0000000..5afa983
--- /dev/null
+++ b/http/firefox/patches/0032-bmo-1932163-python-3.13-fix.patch
@@ -0,0 +1,48 @@
+
+# HG changeset patch
+# User Andreas Farre <farre AT mozilla.com>
+# Date 1733143029 0
+# Node ID cb63007c6dd5f48f437e0f636e0a69617a3a590c
+# Parent  a7391db30046582a1f3e587793542c8378e4fe0b
+Bug 1932163 - Switch to use ssl module. r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D229505
+
+diff --git a/python/mozboot/mozboot/bootstrap.py 
b/python/mozboot/mozboot/bootstrap.py
+--- a/python/mozboot/mozboot/bootstrap.py
++++ b/python/mozboot/mozboot/bootstrap.py
+@@ -834,30 +834,30 @@ def update_git_tools(git: Optional[Path]
+         try:
+             subprocess.check_call([str(cinnabar_exe), "self-update"])
+         except subprocess.CalledProcessError as e:
+             print(e)
+ 
+     # git-cinnabar 0.6.0rc1 self-update had a bug that could leave an empty
+     # file. If that happens, install from scratch.
+     if not exists or cinnabar_exe.stat().st_size == 0:
++        import ssl
+         from urllib.request import urlopen
+ 
+         import certifi
+ 
+         if not cinnabar_dir.exists():
+             cinnabar_dir.mkdir()
+ 
+         cinnabar_url = "https://github.com/glandium/git-cinnabar/";
+         download_py = cinnabar_dir / "download.py"
+         with open(download_py, "wb") as fh:
++            context = ssl.create_default_context(cafile=certifi.where())
+             shutil.copyfileobj(
+-                urlopen(
+-                    f"{cinnabar_url}/raw/master/download.py", 
cafile=certifi.where()
+-                ),
++                urlopen(f"{cinnabar_url}/raw/master/download.py", 
context=context),
+                 fh,
+             )
+ 
+         try:
+             subprocess.check_call(
+                 [sys.executable, str(download_py)], cwd=str(cinnabar_dir)
+             )
+         except subprocess.CalledProcessError as e:
+
diff --git a/http/firefox/patches/0033-bmo-1925198-python-3.13-fix2.patch 
b/http/firefox/patches/0033-bmo-1925198-python-3.13-fix2.patch
new file mode 100644
index 0000000..b9ef8da
--- /dev/null
+++ b/http/firefox/patches/0033-bmo-1925198-python-3.13-fix2.patch
@@ -0,0 +1,62 @@
+
+# HG changeset patch
+# User Rob Wu <rob AT robwu.nl>
+# Date 1730828835 0
+# Node ID 50d41051085b8d1201443a09faeff9207f5152af
+# Parent  025c089998e3b05f0a71fd03c9c9c9ac4c4abf17
+Bug 1925198 - Move telnetlib import to BaseEmulator r=jmaher
+
+emulator.py currently has an unconditional telnetlib import, but the
+file can also be imported when the functionality is not needed.
+
+Because telnetlib was removed from Python 3.13, this unconditional
+import breaks use cases that do not even care about telnet. As a stopgap
+measure until a better fix is available, move the import to the function
+that relies on telnet.
+
+Differential Revision: https://phabricator.services.mozilla.com/D227995
+
+diff --git a/testing/mozbase/mozrunner/mozrunner/devices/emulator.py 
b/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
+--- a/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
++++ b/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
+@@ -3,17 +3,16 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ import datetime
+ import os
+ import shutil
+ import subprocess
+ import tempfile
+ import time
+-from telnetlib import Telnet
+ 
+ from mozdevice import ADBHost
+ from mozprocess import ProcessHandler
+ 
+ from ..errors import TimeoutException
+ from .base import Device
+ from .emulator_battery import EmulatorBattery
+ from .emulator_geo import EmulatorGeo
+@@ -184,16 +183,21 @@ class BaseEmulator(Device):
+             output.append(line.rstrip())
+             if line.startswith("OK"):
+                 return output
+             elif line.startswith("KO:"):
+                 raise Exception("bad telnet response: %s" % line)
+ 
+     def _run_telnet(self, command):
+         if not self.telnet:
++            # telnetlib is dropped in Python 3.13 (bug 1925198).
++            # Import here instead of the top level to avoid breaking users 
of
++            # this file that are independent of telnet.
++            from telnetlib import Telnet
++
+             self.telnet = Telnet("localhost", self.port)
+             self._get_telnet_response()
+         return self._get_telnet_response(command)
+ 
+     def __del__(self):
+         if self.telnet:
+             self.telnet.write("exit\n")
+             self.telnet.read_all()
+
diff --git a/http/firefox/patches/0034-bmo-1926140-python-3.13-fix3.patch 
b/http/firefox/patches/0034-bmo-1926140-python-3.13-fix3.patch
new file mode 100644
index 0000000..9ef94bf
--- /dev/null
+++ b/http/firefox/patches/0034-bmo-1926140-python-3.13-fix3.patch
@@ -0,0 +1,148 @@
+
+# HG changeset patch
+# User Rob Wu <rob AT robwu.nl>
+# Date 1730841860 0
+# Node ID d12754638c687fb1faccb217c2a44a5b66806c37
+# Parent  652dabf039d013dd7acd287b5ed0a6d3ee916297
+Bug 1926140 - Replace pipes imports r=jmaher
+
+pipes does not exist in Python 3.11 any more
+
+Differential Revision: https://phabricator.services.mozilla.com/D227964
+
+diff --git a/js/src/tests/lib/results.py b/js/src/tests/lib/results.py
+--- a/js/src/tests/lib/results.py
++++ b/js/src/tests/lib/results.py
+@@ -1,20 +1,20 @@
+ import json
+-import pipes
+ import re
++import shlex
+ 
+ from .progressbar import NullProgressBar, ProgressBar
+ from .structuredlog import TestLogger
+ 
+ # subprocess.list2cmdline does not properly escape for sh-like shells
+ 
+ 
+ def escape_cmdline(args):
+-    return " ".join([pipes.quote(a) for a in args])
++    return " ".join([shlex.quote(a) for a in args])
+ 
+ 
+ class TestOutput:
+     """Output from a test run."""
+ 
+     def __init__(self, test, cmd, out, err, rc, dt, timed_out, extra=None):
+         self.test = test  # Test
+         self.cmd = cmd  # str:   command line of test
+diff --git a/testing/mozbase/mozdevice/mozdevice/adb.py 
b/testing/mozbase/mozdevice/mozdevice/adb.py
+--- a/testing/mozbase/mozdevice/mozdevice/adb.py
++++ b/testing/mozbase/mozdevice/mozdevice/adb.py
+@@ -1,15 +1,14 @@
+ # 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 io
+ import os
+-import pipes
+ import posixpath
+ import re
+ import shlex
+ import shutil
+ import signal
+ import subprocess
+ import sys
+ import tempfile
+@@ -1288,18 +1287,16 @@ class ADBDevice(ADBCommand):
+         re_quotable_chars = re.compile(r"[ ()\"&'\];]")
+         return re_quotable_chars.search(arg)
+ 
+     @staticmethod
+     def _quote(arg):
+         """Utility function to return quoted version of command argument."""
+         if hasattr(shlex, "quote"):
+             quote = shlex.quote
+-        elif hasattr(pipes, "quote"):
+-            quote = pipes.quote
+         else:
+ 
+             def quote(arg):
+                 arg = arg or ""
+                 re_unsafe = re.compile(r"[^\w@%+=:,./-]")
+                 if re_unsafe.search(arg):
+                     arg = "'" + arg.replace("'", "'\"'\"'") + "'"
+                 return arg
+diff --git a/testing/web-platform/tests/tools/pytest.ini 
b/testing/web-platform/tests/tools/pytest.ini
+--- a/testing/web-platform/tests/tools/pytest.ini
++++ b/testing/web-platform/tests/tools/pytest.ini
+@@ -15,18 +15,16 @@ filterwarnings =
+     # ignore mozinfo deprecation warnings
+     ignore:distutils Version classes are deprecated\. Use 
packaging\.version instead\.:DeprecationWarning:mozinfo
+     # ingore mozinfo's dependency on distro
+     ignore:distro\.linux_distribution\(\) is deprecated\. It should only be 
used as a compatibility shim with Python\'s 
platform\.linux_distribution\(\)\. Please use distro\.id\(\), 
distro\.version\(\) and distro\.name\(\) instead\.:DeprecationWarning
+     # ignore mozversion deprecation warnings
+     ignore:This method will be removed in .*\.\s+Use 
'parser\.read_file\(\)' instead\.:DeprecationWarning:mozversion
+     # ignore mozversion not cleanly closing .ini files
+     ignore:unclosed file.*\.ini:ResourceWarning:mozversion
+-    # mozdevice uses pipes module
+-    ignore:'pipes' is deprecated and slated for removal in Python 
3:DeprecationWarning
+     # mozrunner uses telnetlib module
+     ignore:'telnetlib' is deprecated and slated for removal in Python 
3:DeprecationWarning
+     # https://github.com/web-platform-tests/wpt/issues/39366
+     always:The metaschema specified by \$schema was not found\. Using the 
latest draft to validate, but this will raise an error in the 
future\.:DeprecationWarning
+     # https://github.com/web-platform-tests/wpt/issues/39359
+     always:'cgi' is deprecated and slated for removal in Python 
3:DeprecationWarning
+     # https://github.com/web-platform-tests/wpt/issues/39373
+     always:the imp module is deprecated in favour of 
importlib:DeprecationWarning
+diff --git a/testing/xpcshell/runxpcshelltests.py 
b/testing/xpcshell/runxpcshelltests.py
+--- a/testing/xpcshell/runxpcshelltests.py
++++ b/testing/xpcshell/runxpcshelltests.py
+@@ -2,20 +2,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 copy
+ import json
+ import os
+-import pipes
+ import platform
+ import random
+ import re
++import shlex
+ import shutil
+ import signal
+ import subprocess
+ import sys
+ import tempfile
+ import time
+ import traceback
+ from argparse import Namespace
+@@ -367,21 +367,21 @@ class XPCShellTestThread(Thread):
+         self.log.info("%s | current directory: %r" % (name, testdir))
+         # Show only those environment variables that are changed from
+         # the ambient environment.
+         changedEnv = set("%s=%s" % i for i in six.iteritems(self.env)) - 
set(
+             "%s=%s" % i for i in six.iteritems(os.environ)
+         )
+         self.log.info("%s | environment: %s" % (name, list(changedEnv)))
+         shell_command_tokens = [
+-            pipes.quote(tok) for tok in list(changedEnv) + completeCmd
++            shlex.quote(tok) for tok in list(changedEnv) + completeCmd
+         ]
+         self.log.info(
+             "%s | as shell command: (cd %s; %s)"
+-            % (name, pipes.quote(testdir), " ".join(shell_command_tokens))
++            % (name, shlex.quote(testdir), " ".join(shell_command_tokens))
+         )
+ 
+     def killTimeout(self, proc):
+         if proc is not None and hasattr(proc, "pid"):
+             mozcrash.kill_and_get_minidump(
+                 proc.pid, self.tempDir, utility_path=self.utility_path
+             )
+         else:
+