pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/thunderbird
Module Name: pkgsrc
Committed By: ryoon
Date: Sat Oct 12 09:07:02 UTC 2024
Modified Files:
pkgsrc/mail/thunderbird: Makefile distinfo
Added Files:
pkgsrc/mail/thunderbird/patches: patch-js_src_tests_lib_results.py
patch-python_mozbuild_mozbuild_action_node.py
patch-python_mozbuild_mozbuild_backend_recursivemake.py
patch-testing_mozbase_mozdevice_mozdevice_adb.py
patch-testing_xpcshell_runxpcshelltests.py
patch-third__party_libwebrtc_build_android_apk__operations.py
patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py
patch-third__party_libwebrtc_build_chromeos_test__runner.py
patch-third__party_libwebrtc_build_env__dump.py
patch-third__party_libwebrtc_build_print__python__deps.py
patch-third__party_libwebrtc_build_vs__toolchain.py
patch-third__party_python_dlmanager_check.py
Log Message:
mail/thunderbird: Update to 128.3.1
* Fix build with Python 3.13. Patches from www/firefox.
Changelog:
Security fixes:
Mozilla Foundation Security Advisory 2024-52
#CVE-2024-9680: Use-after-free in Animation timeline
To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.273 -r1.274 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/mail/thunderbird/patches/patch-js_src_tests_lib_results.py \
pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_action_node.py \
pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_recursivemake.py \
pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_mozdevice_mozdevice_adb.py \
pkgsrc/mail/thunderbird/patches/patch-testing_xpcshell_runxpcshelltests.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_apk__operations.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_chromeos_test__runner.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_env__dump.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_print__python__deps.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_vs__toolchain.py \
pkgsrc/mail/thunderbird/patches/patch-third__party_python_dlmanager_check.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.323 pkgsrc/mail/thunderbird/Makefile:1.324
--- pkgsrc/mail/thunderbird/Makefile:1.323 Tue Oct 8 05:48:25 2024
+++ pkgsrc/mail/thunderbird/Makefile Sat Oct 12 09:07:01 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.323 2024/10/08 05:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.324 2024/10/12 09:07:01 ryoon Exp $
DISTNAME= thunderbird-${TB_VER}.source
PKGNAME= thunderbird-${TB_VER:S/esr//}
-TB_VER= 128.3.0esr
+TB_VER= 128.3.1esr
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.273 pkgsrc/mail/thunderbird/distinfo:1.274
--- pkgsrc/mail/thunderbird/distinfo:1.273 Tue Oct 8 05:48:25 2024
+++ pkgsrc/mail/thunderbird/distinfo Sat Oct 12 09:07:01 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.273 2024/10/08 05:48:25 ryoon Exp $
+$NetBSD: distinfo,v 1.274 2024/10/12 09:07:01 ryoon Exp $
-BLAKE2s (thunderbird-128.3.0esr.source.tar.xz) = d8003c5740da936026ca57fd826b995d5a379c0cc498fca172b1e50e264030b2
-SHA512 (thunderbird-128.3.0esr.source.tar.xz) = 10d5efecca85f8fb394bd01bbe92b949365a0f643fa25d42e5d701deafaca7694687941bc5ae5ee836bc6543c6db81f4e9998f006c134513e6cbd22e94594ae0
-Size (thunderbird-128.3.0esr.source.tar.xz) = 672592576 bytes
+BLAKE2s (thunderbird-128.3.1esr.source.tar.xz) = 341b8af7bb8fdfbddd1b90fd227c332e3169a501380bd30094bb27371802981f
+SHA512 (thunderbird-128.3.1esr.source.tar.xz) = 9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a
+Size (thunderbird-128.3.1esr.source.tar.xz) = 678730388 bytes
SHA1 (patch-browser_app_profile_firefox.js) = bc719edef37d18655ba79b030270438ee166fdaf
SHA1 (patch-build_moz.configure_init.configure) = 65deb3c233df0aab81eb1fca05d708e5a4ed169a
SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
@@ -22,6 +22,7 @@ SHA1 (patch-js-src-jit-arm64-vixl-MozCpu
SHA1 (patch-js_public_Utility.h) = 7e97b7feca65de88972286364aaa003ca690f4ad
SHA1 (patch-js_src_jit_FlushICache.cpp) = d1e611eaf7d7be22abfac6b39fbcd99df3570e47
SHA1 (patch-js_src_old-configure.in) = b4a1548e01d727af8119353a19e031bdacae38d0
+SHA1 (patch-js_src_tests_lib_results.py) = 5634207e249cab7270b47f4515657740e803d616
SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
SHA1 (patch-media_libpng_pngpriv.h) = 8320a1f7534ed5c4914b597bb3d6117d0060318f
@@ -29,14 +30,25 @@ SHA1 (patch-media_libtheora_lib_info.c)
SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 8e1d9a0746b637f5f4259e448e72172cfb08b23f
SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
+SHA1 (patch-python_mozbuild_mozbuild_action_node.py) = eece38efe4ee1eb51de6cca89fa1c479ef02d60c
+SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = 5be4183d9075f5a3a3c6b3e0338473af185fb50e
SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-testing_mozbase_mozdevice_mozdevice_adb.py) = 14d5107ce2c945d8b8d60a8edc968443a9970291
+SHA1 (patch-testing_xpcshell_runxpcshelltests.py) = 1c42e8794da0bdd6248bd53d1450b982616aa536
SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
+SHA1 (patch-third__party_libwebrtc_build_android_apk__operations.py) = a74d8c87746420f29d1be49af6a5c5e191897e3f
+SHA1 (patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py) = aaf39184e25aa3f97c02dd29c4877e0f9b172063
+SHA1 (patch-third__party_libwebrtc_build_chromeos_test__runner.py) = 36f902daff9d98bcbd12c725ee49373e583f6cd5
+SHA1 (patch-third__party_libwebrtc_build_env__dump.py) = a8cdb9fc5baf15454019f9011fafa1d5967f9eda
+SHA1 (patch-third__party_libwebrtc_build_print__python__deps.py) = cbb5917cc9d82f3a0d16684dff1ecee3e83e0f56
+SHA1 (patch-third__party_libwebrtc_build_vs__toolchain.py) = 265412d8da2497c1e8893edfaf5d78abf96620df
SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_desktop__capture__gn_moz.build) = d0454784eb72be49162f619579e060a0de3c480f
SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 4cb0e1c88dc83370024ed1aac7f75445b9f98df8
SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd
SHA1 (patch-third__party_libwebrtc_rtc__base_physical__socket__server.cc) = 6909c4da9e7b3785252e5bce9be0ff47ebb87e01
SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
+SHA1 (patch-third__party_python_dlmanager_check.py) = 69054522d8ced8cb47e65e5a8b1a87ed5ce6708e
SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b
Added files:
Index: pkgsrc/mail/thunderbird/patches/patch-js_src_tests_lib_results.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-js_src_tests_lib_results.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-js_src_tests_lib_results.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-js_src_tests_lib_results.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- js/src/tests/lib/results.py.orig 2024-10-11 13:42:54.292672525 +0000
++++ js/src/tests/lib/results.py
+@@ -1,5 +1,5 @@
+ import json
+-import pipes
++import shlex
+ import re
+
+ from .progressbar import NullProgressBar, ProgressBar
+@@ -9,7 +9,7 @@ from .structuredlog import TestLogger
+
+
+ def escape_cmdline(args):
+- return " ".join([pipes.quote(a) for a in args])
++ return " ".join([shlex.quote(a) for a in args])
+
+
+ class TestOutput:
Index: pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_action_node.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_action_node.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_action_node.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_mozbuild_mozbuild_action_node.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- python/mozbuild/mozbuild/action/node.py.orig 2024-10-11 13:41:58.827020901 +0000
++++ python/mozbuild/mozbuild/action/node.py
+@@ -2,7 +2,7 @@
+ # 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 shlex
+ import subprocess
+ import sys
+
+@@ -47,7 +47,7 @@ def execute_node_cmd(node_cmd_list):
+ """
+
+ try:
+- printable_cmd = " ".join(pipes.quote(arg) for arg in node_cmd_list)
++ printable_cmd = " ".join(shlex.quote(arg) for arg in node_cmd_list)
+ print('Executing "{}"'.format(printable_cmd), file=sys.stderr)
+ sys.stderr.flush()
+
Index: pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_recursivemake.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_recursivemake.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_recursivemake.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,27 @@
+$NetBSD: patch-python_mozbuild_mozbuild_backend_recursivemake.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+* As of 129.0, libxul.so is built with -Wl,-z,defs (no undefined references).
+ Supply memalign() from fallback.cpp (Unified_cpp_memory_build0) for NetBSD.
+ This approach is completely incorrect, however I do not find the correct
+ way to include Unified_cpp_memory_build0.o to objs yet.
+
+--- python/mozbuild/mozbuild/backend/recursivemake.py.orig 2024-08-23 12:51:15.000000000 +0000
++++ python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -73,6 +73,8 @@ from ..util import FileAvoidWrite, ensur
+ from .common import CommonBackend
+ from .make import MakeBackend
+
++import buildconfig
++
+ # To protect against accidentally adding logic to Makefiles that belong in moz.build,
+ # we check if moz.build-like variables are defined in Makefiles. If they are, we throw
+ # an error to encourage the usage of moz.build instead.
+@@ -1426,6 +1428,8 @@ class RecursiveMakeBackend(MakeBackend):
+
+ def _process_linked_libraries(self, obj, backend_file):
+ objs, shared_libs, os_libs, static_libs = self._expand_libs(obj)
++ if buildconfig.substs["OS_ARCH"] == "NetBSD" and obj.name == "libxul.so":
++ objs.append("memory/build/Unified_cpp_memory_build0.o")
+
+ obj_target = obj.name
+ if isinstance(obj, (Program, SharedLibrary)):
Index: pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_mozdevice_mozdevice_adb.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_mozdevice_mozdevice_adb.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_mozdevice_mozdevice_adb.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-testing_mozbase_mozdevice_mozdevice_adb.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- testing/mozbase/mozdevice/mozdevice/adb.py.orig 2024-10-11 13:42:22.039323223 +0000
++++ testing/mozbase/mozdevice/mozdevice/adb.py
+@@ -4,7 +4,6 @@
+
+ import io
+ import os
+-import pipes
+ import posixpath
+ import re
+ import shlex
+@@ -1286,8 +1285,6 @@ class ADBDevice(ADBCommand):
+ """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):
Index: pkgsrc/mail/thunderbird/patches/patch-testing_xpcshell_runxpcshelltests.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-testing_xpcshell_runxpcshelltests.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-testing_xpcshell_runxpcshelltests.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,29 @@
+$NetBSD: patch-testing_xpcshell_runxpcshelltests.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- testing/xpcshell/runxpcshelltests.py.orig 2024-10-11 13:42:14.137641240 +0000
++++ testing/xpcshell/runxpcshelltests.py
+@@ -7,7 +7,7 @@
+ import copy
+ import json
+ import os
+-import pipes
++import shlex
+ import platform
+ import random
+ import re
+@@ -372,11 +372,11 @@ class XPCShellTestThread(Thread):
+ )
+ 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):
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_apk__operations.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_apk__operations.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_apk__operations.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,42 @@
+$NetBSD: patch-third__party_libwebrtc_build_android_apk__operations.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/android/apk_operations.py.orig 2024-10-11 13:43:36.953193495 +0000
++++ third_party/libwebrtc/build/android/apk_operations.py
+@@ -13,7 +13,7 @@ import collections
+ import json
+ import logging
+ import os
+-import pipes
++import shlex
+ import posixpath
+ import random
+ import re
+@@ -294,7 +294,7 @@ def _RunGdb(device, package_name, debug_
+ cmd.append('--verbose')
+ if target_cpu:
+ cmd.append('--target-arch=%s' % _TargetCpuToTargetArch(target_cpu))
+- logging.warning('Running: %s', ' '.join(pipes.quote(x) for x in cmd))
++ logging.warning('Running: %s', ' '.join(shlex.quote(x) for x in cmd))
+ print(_Colorize('All subsequent output is from adb_gdb script.',
+ colorama.Fore.YELLOW))
+ os.execv(gdb_script_path, cmd)
+@@ -502,7 +502,7 @@ def _RunDiskUsage(devices, package_name)
+ odex_paths.append('/data/dalvik-cache/%s@classes%s.dex' % (
+ mangled_apk_path, suffix))
+
+- odex_sizes = _DuHelper(d, ' '.join(pipes.quote(p) for p in odex_paths))
++ odex_sizes = _DuHelper(d, ' '.join(shlex.quote(p) for p in odex_paths))
+
+ return (data_dir_sizes, code_cache_sizes, apk_sizes, lib_sizes, odex_sizes,
+ compilation_filter)
+@@ -1002,7 +1002,7 @@ def _DisplayArgs(devices, command_line_f
+ print('Existing flags per-device (via /data/local/tmp/{}):'.format(
+ command_line_flags_file))
+ for flags in _PrintPerDeviceOutput(devices, outputs, single_line=True):
+- quoted_flags = ' '.join(pipes.quote(f) for f in flags)
++ quoted_flags = ' '.join(shlex.quote(f) for f in flags)
+ print(quoted_flags or 'No flags set.')
+
+
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_libwebrtc_build_android_gyp_util_build__utils.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/android/gyp/util/build_utils.py.orig 2024-10-11 13:43:32.145451522 +0000
++++ third_party/libwebrtc/build/android/gyp/util/build_utils.py
+@@ -12,7 +12,7 @@ import fnmatch
+ import json
+ import logging
+ import os
+-import pipes
++import shlex
+ import re
+ import shutil
+ import stat
+@@ -199,7 +199,7 @@ class CalledProcessError(Exception):
+ # A user should be able to simply copy and paste the command that failed
+ # into their shell.
+ copyable_command = '( cd {}; {} )'.format(os.path.abspath(self.cwd),
+- ' '.join(map(pipes.quote, self.args)))
++ ' '.join(map(shlex.quote, self.args)))
+ return 'Command failed: {}\n{}'.format(copyable_command, self.output)
+
+
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_chromeos_test__runner.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_chromeos_test__runner.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_chromeos_test__runner.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-third__party_libwebrtc_build_chromeos_test__runner.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/chromeos/test_runner.py.orig 2024-10-11 13:42:59.456381299 +0000
++++ third_party/libwebrtc/build/chromeos/test_runner.py
+@@ -9,7 +9,7 @@ import collections
+ import json
+ import logging
+ import os
+-import pipes
++import shlex
+ import re
+ import shutil
+ import signal
+@@ -342,7 +342,7 @@ class TastTest(RemoteTest):
+ # aren't compatible.
+ local_test_runner_cmd.append('-extrauseflags=tast_vm')
+ if self._attr_expr:
+- local_test_runner_cmd.append(pipes.quote(self._attr_expr))
++ local_test_runner_cmd.append(shlex.quote(self._attr_expr))
+ else:
+ local_test_runner_cmd.extend(self._tests)
+ device_test_script_contents.append(' '.join(local_test_runner_cmd))
+@@ -380,7 +380,7 @@ class TastTest(RemoteTest):
+ self._attr_expr = '(' + ' || '.join(names) + ')'
+
+ if self._attr_expr:
+- # Don't use pipes.quote() here. Something funky happens with the arg
++ # Don't use shlex.quote() here. Something funky happens with the arg
+ # as it gets passed down from cros_run_test to tast. (Tast picks up the
+ # escaping single quotes and complains that the attribute expression
+ # "must be within parentheses".)
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_env__dump.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_env__dump.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_env__dump.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_libwebrtc_build_env__dump.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/env_dump.py.orig 2024-10-11 13:43:22.427985012 +0000
++++ third_party/libwebrtc/build/env_dump.py
+@@ -9,7 +9,7 @@
+ import json
+ import optparse
+ import os
+-import pipes
++import shlex
+ import subprocess
+ import sys
+
+@@ -32,7 +32,7 @@ def main():
+ if not options.output_json:
+ parser.error('Requires --output-json option.')
+
+- envsetup_cmd = ' '.join(map(pipes.quote, args))
++ envsetup_cmd = ' '.join(map(shlex.quote, args))
+ full_cmd = [
+ 'bash', '-c',
+ '. %s > /dev/null; %s -d' % (envsetup_cmd, os.path.abspath(__file__))
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_print__python__deps.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_print__python__deps.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_print__python__deps.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_libwebrtc_build_print__python__deps.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/print_python_deps.py.orig 2024-10-11 13:43:27.070262533 +0000
++++ third_party/libwebrtc/build/print_python_deps.py
+@@ -14,7 +14,7 @@ This script should be compatible with Py
+ import argparse
+ import fnmatch
+ import os
+-import pipes
++import shlex
+ import sys
+
+ # Don't use any helper modules, or else they will end up in the results.
+@@ -61,7 +61,7 @@ def _NormalizeCommandLine(options):
+ for allowlist in sorted(options.allowlists):
+ args.extend(('--allowlist', os.path.relpath(allowlist, _SRC_ROOT)))
+ args.append(os.path.relpath(options.module, _SRC_ROOT))
+- return ' '.join(pipes.quote(x) for x in args)
++ return ' '.join(shlex.quote(x) for x in args)
+
+
+ def _FindPythonInDirectory(directory, allow_test):
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_vs__toolchain.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_vs__toolchain.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_libwebrtc_build_vs__toolchain.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-third__party_libwebrtc_build_vs__toolchain.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/libwebrtc/build/vs_toolchain.py.orig 2024-10-11 13:43:08.737671418 +0000
++++ third_party/libwebrtc/build/vs_toolchain.py
+@@ -9,7 +9,6 @@ import collections
+ import glob
+ import json
+ import os
+-import pipes
+ import platform
+ import re
+ import shutil
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_python_dlmanager_check.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_python_dlmanager_check.py:1.1
--- /dev/null Sat Oct 12 09:07:02 2024
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_python_dlmanager_check.py Sat Oct 12 09:07:02 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_python_dlmanager_check.py,v 1.1 2024/10/12 09:07:02 ryoon Exp $
+
+Fix build with Python 3.13.
+
+--- third_party/python/dlmanager/check.py.orig 2024-10-11 13:43:43.746252969 +0000
++++ third_party/python/dlmanager/check.py
+@@ -5,7 +5,7 @@ Run flake8 checks and tests.
+
+ import os
+ import argparse
+-import pipes
++import shlex
+ import shutil
+ import tempfile
+
+@@ -23,7 +23,7 @@ def parse_args():
+
+
+ def run(cmd, **kwargs):
+- msg = 'Running: |%s|' % ' '.join(pipes.quote(c) for c in cmd)
++ msg = 'Running: |%s|' % ' '.join(shlex.quote(c) for c in cmd)
+ if kwargs.get('cwd'):
+ msg += ' in %s' % kwargs['cwd']
+ print(msg)
Home |
Main Index |
Thread Index |
Old Index