virtualbox/vbox-python-py310.patch
Larry Finger 144e439b1a Accepting request 990809 from home:lwfinger:branches:Virtualization
- Version bump to 6.1.36 released by Oracle July 19 2022
  This is a maintenance release. The following items were fixed and/or added:
  VMM: Fixed possible Linux guest kernel crash when configuring Speculative Store Bypass for a single vCPU VM
  GUI: In the storage page of the virtual machine settings dialog, fixed a bug which disrupted mouse interaction with the native file selector on KDE
  NAT: Prevent issue when host resolver incorrectly returned NXDOMAIN for unsupported queries (bug #20977)
  Audio: General improvements in saved state area
  Recording: Various fixes for settings handling
  VGA: Performance improvements for screen updates when VBE banking is used
  USB: Fixed rare crashes when detaching a USB device
  ATA: Fixed NT4 guests taking a minute to eject CDs
  vboximg-mount: Fixed broken write support (bug #20896)
  SDK: Fixed Python bindings incorrectly trying to convert arbitrary byte data into unicode objects with Python 3, causing exceptions (bug #19740)
  API: Fixed an issue when virtual USB mass storage devices or virtual USB DVD drives are added while the VM is not running are by default not marked as hot-pluggable
  API: Initial support for Python 3.10
  API: Solaris OS types cleanup
  Linux and Solaris hosts: Allow to mount shared folder if it is represented as a symlink on a host side (bug #17491)
  Linux Host and Guest drivers: Introduced initial support for kernels 5.18, 5.19 and RHEL 9.1 (bugs #20914, #20941)
  Linux Host and Guest drivers: Better support for kernels built with clang compiler (bugs #20425 and #20998)
  Solaris Guest Additions: General improvements in installer area
  Solaris Guest Additions: Fixed guest screen resize in VMSVGA graphics configuration
  Linux and Solaris Guest Additions: Fixed multi-screen handling in VBoxVGA and VBoxSVGA graphics configuration
  Linux and Solaris Guest Additions: Added support for setting primary screen via VBoxManage
  Linux and Solaris Guest Additions: Fixed X11 resources leak when resizing guest screens
  Linux and Solaris Guest Additions: Fixed file descriptor leak when starting a process using guest control (bug #20902)
  Linux and Solaris Guest Additions: Fixed guest control executing processes as root
  Linux Guest Additions: Improved guests booting time by preventing kernel modules from being rebuilt when it is not necessary (bug #20502)
  Windows Guest Additions: Fixed VBoxTray crash on startup in NT4 guests on rare circumstances
  deleted file "fixes_for_kernel_5.18.patch" - fixed upstream.
  Fixes CVE-2022-21571) VUL-0: CVE-2022-21571,CVE-2022-21554 - boo#1201720

OBS-URL: https://build.opensuse.org/request/show/990809
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=648
2022-07-23 14:10:28 +00:00

73 lines
2.5 KiB
Diff

# https://www.virtualbox.org/changeset/90537/vbox
Index: VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-6.1.36.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk
@@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
endif
endif
+ifdef VBOX_PYTHON310_INC
+#
+# Python 3.10 version
+#
+DLLS += VBoxPython3_10
+VBoxPython3_10_EXTENDS = VBoxPythonBase
+VBoxPython3_10_EXTENDS_BY = appending
+VBoxPython3_10_TEMPLATE = XPCOM
+VBoxPython3_10_INCS = $(VBOX_PYTHON310_INC)
+VBoxPython3_10_LIBS = $(VBOX_PYTHON310_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+ ifdef VBOX_PYTHON310_LIB_X86
+DLLS += VBoxPython3_10_x86
+VBoxPython3_10_x86_EXTENDS = VBoxPythonBase_x86
+VBoxPython3_10_x86_EXTENDS_BY = appending
+VBoxPython3_10_x86_TEMPLATE = XPCOM
+VBoxPython3_10_x86_INCS = $(VBOX_PYTHON310_INC)
+VBoxPython3_10_x86_LIBS = $(VBOX_PYTHON310_LIB_X86)
+ endif
+ endif
+endif
+
+ifdef VBOX_PYTHON310M_INC
+#
+# Python 3.10 version with pymalloc
+#
+DLLS += VBoxPython3_10m
+VBoxPython3_10m_EXTENDS = VBoxPythonBase_m
+VBoxPython3_10m_EXTENDS_BY = appending
+VBoxPython3_10m_TEMPLATE = XPCOM
+VBoxPython3_10m_INCS = $(VBOX_PYTHON310M_INC)
+VBoxPython3_10m_LIBS = $(VBOX_PYTHON310M_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+ ifdef VBOX_PYTHON310M_LIB_X86
+DLLS += VBoxPython3_10m_x86
+VBoxPython3_10m_x86_EXTENDS = VBoxPythonBase_x86_m
+VBoxPython3_10m_x86_EXTENDS_BY = appending
+VBoxPython3_10m_x86_TEMPLATE_ = XPCOM
+VBoxPython3_10m_x86_INCS = $(VBOX_PYTHON310M_INC)
+VBoxPython3_10m_x86_LIBS = $(VBOX_PYTHON310M_LIB_X86)
+ endif
+ endif
+endif
+
ifdef VBOX_PYTHONDEF_INC
#
# Python without versioning
Index: VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h
===================================================================
--- VirtualBox-6.1.36.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok
# define PyInt_Check(o) PyLong_Check(o)
# define PyInt_AsLong(o) PyLong_AsLong(o)
# define PyNumber_Int(o) PyNumber_Long(o)
-# if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
+# if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
# ifndef PyUnicode_AsUTF8
# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
# endif