commit 513594c399c2363faf63b0a243bf461e2d62654d Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Jul 19 13:21:49 2023 +0100 Update VirtualBox to 7.0.10 VirtualBox-python3.12.patch | 31 ------------------------------- VirtualBox.spec | 39 +++++++++++++++++++++------------------ sources | 4 ++-- update_vbox.sh | 5 ++++- 4 files changed, 27 insertions(+), 52 deletions(-) --- diff --git a/VirtualBox-python3.12.patch b/VirtualBox-python3.12.patch index eeafed6..71c5fcf 100644 --- a/VirtualBox-python3.12.patch +++ b/VirtualBox-python3.12.patch @@ -1,25 +1,3 @@ ---- VirtualBox-6.1.36/configure 2022-07-19 21:48:52.000000000 +0100 -+++ VirtualBox-6.1.34.orig/configure 2022-07-25 14:00:03.679779468 +0100 -@@ -2027,7 +2027,7 @@ extern "C" int main(void) - } - EOF - found= -- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m" -+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m python3.11 python3.11m python3.12 python3.12m" - for p in $PYTHONDIR; do - for d in $SUPPYTHONLIBS; do - for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do ---- ./src/libs/xpcom18a4/python/gen_python_deps.py.python3.11 2023-04-17 16:58:21.000000000 +0100 -+++ ./src/libs/xpcom18a4/python/gen_python_deps.py 2023-07-10 17:59:12.392551776 +0100 -@@ -26,7 +26,7 @@ from __future__ import print_function - import os,sys - from distutils.version import StrictVersion - --versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m" ] -+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m", "3.12", "3.12m" ] - prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] - known = {} - --- ./src/libs/xpcom18a4/python/Makefile.kmk.python3.11 2023-04-17 16:58:21.000000000 +0100 +++ ./src/libs/xpcom18a4/python/Makefile.kmk 2023-04-18 20:34:47.463630061 +0100 @@ -30,7 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -130,15 +108,6 @@ ifdef VBOX_PYTHONDEF_INC # # Python without versioning -@@ -707,7 +799,7 @@ ifndef VBOX_ONLY_SDK - # TODO: ASSUMING that we don't need a different headers for pymalloc - # ('m' builds < 3.8) and CRT malloc. - # -- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \ -+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 312 34 33 \ - ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,))) - ifneq ($(VBOX_PYTHON_LIMITED_API_VER),) - DLLS += VBoxPython3 --- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2022-10-30 04:19:33.834495672 +0000 +++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-10-30 04:24:11.895463023 +0000 @@ -84,7 +84,15 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter diff --git a/VirtualBox.spec b/VirtualBox.spec index 3eda632..87c1e2f 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -45,8 +45,8 @@ %bcond_without python3 Name: VirtualBox -Version: 7.0.8 -Release: 4%{?dist} +Version: 7.0.10 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -335,26 +335,26 @@ rm -r src/libs/libtpms-0.9.*/ %endif #rm -r src/libs/softfloat-3e/ -%patch1 -p1 -b .noupdates -%patch2 -p1 -b .strings -%patch3 -p1 -b .default_os_fedora -%patch4 -p1 -b .lib64-VBox.sh -#patch27 -p1 -b .gcc -%patch28 -p1 -b .gcc +%patch -P 1 -p1 -b .noupdates +%patch -P 2 -p1 -b .strings +%patch -P 3 -p1 -b .default_os_fedora +%patch -P 4 -p1 -b .lib64-VBox.sh +#patch -P 27 -p1 -b .gcc +%patch -P 28 -p1 -b .gcc %if 0%{?rhel} && 0%{?rhel} < 8 -%patch29 -p2 -R -b .gsoap3 +%patch -P 29 -p2 -R -b .gsoap3 %endif %if %{with python3} -%patch40 -p1 -b .python2_path +%patch -P 40 -p1 -b .python2_path %endif -%patch50 -p1 -b .mageia-support -%patch52 -p1 -b .qt -%patch53 -p1 -b .qt2 -%patch54 -p1 -b .dtrace -%patch60 -p1 -b .xclient -#patch70 -p1 -b .python-detection -%patch80 -p1 -b .gcc10 -%patch90 -p1 -b .python3.11 +%patch -P 50 -p1 -b .mageia-support +%patch -P 52 -p1 -b .qt +%patch -P 53 -p1 -b .qt2 +%patch -P 54 -p1 -b .dtrace +%patch -P 60 -p1 -b .xclient +#patch -P 70 -p1 -b .python-detection +%patch -P 80 -p1 -b .gcc10 +%patch -P 90 -p1 -b .python3.12 %build @@ -900,6 +900,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Wed Jul 19 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.10-1 +- Update VirtualBox to 7.0.10 + * Sat Jul 08 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 7.0.8-4 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 41255b5..9e10e40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-7.0.8.tar.bz2) = 4c25f8275269d085cf347596a242b8921f140e0e40d8c44fd6b171742b8cbd0c9a45f4702dbc0c1272e10091be68c3668711c9e4d1a8b3ce57d25f871e0eb9fe -SHA512 (UserManual.pdf) = 310f83fe2b832b496b8419bfee85e30ff1a1b668d68bb32b3c34ba2be25cbfc89d199f3ef09e4d1b787bc691e2173bb03997b25ce5cfd6525920363d19a7c44c +SHA512 (VirtualBox-7.0.10.tar.bz2) = 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd +SHA512 (UserManual.pdf) = 24bb1741e6cb0f8dcfa32e534e2f54c0cd585b1761d57de499bfa631b04a2ebb9253c72bf841efc24d4890d6d852b1cc7fbb17cac823d70d02b8ecaf487ef08e diff --git a/update_vbox.sh b/update_vbox.sh index c9c5df6..4baea9a 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=7.0.8 +VERSION=7.0.10 REL=1 RAWHIDE=39 REPOS="f38 f37 f36 el9 el8" @@ -21,7 +21,10 @@ rm UserManual.pdf spectool -g VirtualBox.spec # we need update sources files to avoid download the wrong UserManual.pdf rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf +echo "checking patches" +rfpkg prep fi + echo Press enter scratch-build or n to skip ; read dummy; if [[ "$dummy" != "n" ]]; then rfpkg scratch-build --srpm