Date: Tuesday, May 24, 2022 @ 21:52:29 Author: heftig Revision: 1210266
archrelease: copy trunk to community-x86_64 Added: virtualbox/repos/community-x86_64/001-disable-update.patch (from rev 1210265, virtualbox/trunk/001-disable-update.patch) virtualbox/repos/community-x86_64/002-python310.patch (from rev 1210265, virtualbox/trunk/002-python310.patch) virtualbox/repos/community-x86_64/003-pyunicode.patch (from rev 1210265, virtualbox/trunk/003-pyunicode.patch) virtualbox/repos/community-x86_64/004-drop-Wno-format.patch (from rev 1210265, virtualbox/trunk/004-drop-Wno-format.patch) virtualbox/repos/community-x86_64/005-gsoap-build.patch (from rev 1210265, virtualbox/trunk/005-gsoap-build.patch) virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch (from rev 1210265, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch) virtualbox/repos/community-x86_64/008-no-vboxvideo.patch (from rev 1210265, virtualbox/trunk/008-no-vboxvideo.patch) virtualbox/repos/community-x86_64/009-i3wm.patch (from rev 1210265, virtualbox/trunk/009-i3wm.patch) virtualbox/repos/community-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (from rev 1210265, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch) virtualbox/repos/community-x86_64/013-Makefile.patch (from rev 1210265, virtualbox/trunk/013-Makefile.patch) virtualbox/repos/community-x86_64/017-fix-narrowing-conversion.patch (from rev 1210265, virtualbox/trunk/017-fix-narrowing-conversion.patch) virtualbox/repos/community-x86_64/018-xclient.patch (from rev 1210265, virtualbox/trunk/018-xclient.patch) virtualbox/repos/community-x86_64/019-vboxr0-cflags.patch (from rev 1210265, virtualbox/trunk/019-vboxr0-cflags.patch) virtualbox/repos/community-x86_64/020-linux518.patch (from rev 1210265, virtualbox/trunk/020-linux518.patch) virtualbox/repos/community-x86_64/60-vboxdrv.rules (from rev 1210265, virtualbox/trunk/60-vboxdrv.rules) virtualbox/repos/community-x86_64/60-vboxguest.rules (from rev 1210265, virtualbox/trunk/60-vboxguest.rules) virtualbox/repos/community-x86_64/LocalConfig.kmk (from rev 1210265, virtualbox/trunk/LocalConfig.kmk) virtualbox/repos/community-x86_64/PKGBUILD (from rev 1210265, virtualbox/trunk/PKGBUILD) virtualbox/repos/community-x86_64/build.sh (from rev 1210265, virtualbox/trunk/build.sh) virtualbox/repos/community-x86_64/vboxdrmclient.path (from rev 1210265, virtualbox/trunk/vboxdrmclient.path) virtualbox/repos/community-x86_64/vboxdrmclient.service (from rev 1210265, virtualbox/trunk/vboxdrmclient.service) virtualbox/repos/community-x86_64/vboxreload (from rev 1210265, virtualbox/trunk/vboxreload) virtualbox/repos/community-x86_64/vboxservice-nox.service (from rev 1210265, virtualbox/trunk/vboxservice-nox.service) virtualbox/repos/community-x86_64/vboxservice.service (from rev 1210265, virtualbox/trunk/vboxservice.service) virtualbox/repos/community-x86_64/vboxweb.service (from rev 1210265, virtualbox/trunk/vboxweb.service) virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install (from rev 1210265, virtualbox/trunk/virtualbox-ext-vnc.install) virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers (from rev 1210265, virtualbox/trunk/virtualbox-guest-utils.sysusers) virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf (from rev 1210265, virtualbox/trunk/virtualbox-host-dkms.conf) virtualbox/repos/community-x86_64/virtualbox-host-dkms.install (from rev 1210265, virtualbox/trunk/virtualbox-host-dkms.install) virtualbox/repos/community-x86_64/virtualbox.sysusers (from rev 1210265, virtualbox/trunk/virtualbox.sysusers) Deleted: virtualbox/repos/community-x86_64/001-disable-update.patch virtualbox/repos/community-x86_64/002-python310.patch virtualbox/repos/community-x86_64/003-pyunicode.patch virtualbox/repos/community-x86_64/004-drop-Wno-format.patch virtualbox/repos/community-x86_64/005-gsoap-build.patch virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch virtualbox/repos/community-x86_64/008-no-vboxvideo.patch virtualbox/repos/community-x86_64/009-i3wm.patch virtualbox/repos/community-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch virtualbox/repos/community-x86_64/013-Makefile.patch virtualbox/repos/community-x86_64/017-fix-narrowing-conversion.patch virtualbox/repos/community-x86_64/018-xclient.patch virtualbox/repos/community-x86_64/019-vboxr0-cflags.patch virtualbox/repos/community-x86_64/60-vboxdrv.rules virtualbox/repos/community-x86_64/60-vboxguest.rules virtualbox/repos/community-x86_64/LocalConfig.kmk virtualbox/repos/community-x86_64/PKGBUILD virtualbox/repos/community-x86_64/build.sh virtualbox/repos/community-x86_64/vboxdrmclient.path virtualbox/repos/community-x86_64/vboxdrmclient.service virtualbox/repos/community-x86_64/vboxreload virtualbox/repos/community-x86_64/vboxservice-nox.service virtualbox/repos/community-x86_64/vboxservice.service virtualbox/repos/community-x86_64/vboxweb.service virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf virtualbox/repos/community-x86_64/virtualbox-host-dkms.install virtualbox/repos/community-x86_64/virtualbox.sysusers -----------------------------------------------------+ 001-disable-update.patch | 26 002-python310.patch | 286 +++---- 003-pyunicode.patch | 52 - 004-drop-Wno-format.patch | 244 +++--- 005-gsoap-build.patch | 22 006-rdesktop-vrdp-keymap-path.patch | 24 008-no-vboxvideo.patch | 24 009-i3wm.patch | 100 +- 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch | 28 013-Makefile.patch | 88 +- 017-fix-narrowing-conversion.patch | 74 - 018-xclient.patch | 48 - 019-vboxr0-cflags.patch | 36 020-linux518.patch | 16 60-vboxdrv.rules | 16 60-vboxguest.rules | 4 LocalConfig.kmk | 78 - PKGBUILD | 726 +++++++++--------- build.sh | 6 vboxdrmclient.path | 12 vboxdrmclient.service | 14 vboxreload | 74 - vboxservice-nox.service | 22 vboxservice.service | 26 vboxweb.service | 22 virtualbox-ext-vnc.install | 54 - virtualbox-guest-utils.sysusers | 2 virtualbox-host-dkms.conf | 62 - virtualbox-host-dkms.install | 24 virtualbox.sysusers | 2 30 files changed, 1115 insertions(+), 1097 deletions(-) Deleted: 001-disable-update.patch =================================================================== --- 001-disable-update.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 001-disable-update.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,13 +0,0 @@ -diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -index da373c92..18fb69a7 100644 ---- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion() - bool UIExtraDataManager::applicationUpdateEnabled() - { - /* 'True' unless 'restriction' feature allowed: */ -- return !isFeatureAllowed(GUI_PreventApplicationUpdate); -+ return false; - } - - QString UIExtraDataManager::applicationUpdateData() Copied: virtualbox/repos/community-x86_64/001-disable-update.patch (from rev 1210265, virtualbox/trunk/001-disable-update.patch) =================================================================== --- 001-disable-update.patch (rev 0) +++ 001-disable-update.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,13 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +index da373c92..18fb69a7 100644 +--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion() + bool UIExtraDataManager::applicationUpdateEnabled() + { + /* 'True' unless 'restriction' feature allowed: */ +- return !isFeatureAllowed(GUI_PreventApplicationUpdate); ++ return false; + } + + QString UIExtraDataManager::applicationUpdateData() Deleted: 002-python310.patch =================================================================== --- 002-python310.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 002-python310.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,143 +0,0 @@ -# https://www.virtualbox.org/changeset/90537/vbox - -Index: trunk/configure -=================================================================== ---- trunk/configure (revision 90536) -+++ trunk/configure (revision 90537) -@@ -3,7 +3,7 @@ - # libraries VBox OSE depends on. - - # --# Copyright (C) 2006-2020 Oracle Corporation -+# Copyright (C) 2006-2021 Oracle Corporation - # - # This file is part of VirtualBox Open Source Edition (OSE), as - # available from http://www.virtualbox.org. This file is free software; -@@ -2043,7 +2043,7 @@ - } - 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" -+ 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" - 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 -Index: trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp -=================================================================== ---- trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90537) -@@ -84,7 +84,11 @@ - # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) - # endif - # ifdef VBOX_PYXPCOM_VERSIONED --# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 -+# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 -+# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") -+# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) -+ -+# elif PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 - # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9") - # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9) - -Index: trunk/src/libs/xpcom18a4/python/Makefile.kmk -=================================================================== ---- trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90537) -@@ -4,7 +4,7 @@ - # - - # --# Copyright (C) 2009-2017 Oracle Corporation -+# Copyright (C) 2009-2021 Oracle Corporation - # - # This file is part of VirtualBox Open Source Edition (OSE), as - # available from http://www.virtualbox.org. This file is free software; -@@ -20,7 +20,7 @@ - - # - # List of supported Python versions, defining a number of --# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables -+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables - # which get picked up below. - # - ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. -@@ -646,6 +646,52 @@ - 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 -@@ -730,4 +776,3 @@ - - - include $(FILE_KBUILD_SUB_FOOTER) -- -Index: trunk/src/libs/xpcom18a4/python/gen_python_deps.py -=================================================================== ---- trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90537) -@@ -1,7 +1,7 @@ - #!/usr/bin/python - - """ --Copyright (C) 2009-2016 Oracle Corporation -+Copyright (C) 2009-2021 Oracle Corporation - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; -@@ -16,7 +16,7 @@ - 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" ] -+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" ] - prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] - known = {} - Copied: virtualbox/repos/community-x86_64/002-python310.patch (from rev 1210265, virtualbox/trunk/002-python310.patch) =================================================================== --- 002-python310.patch (rev 0) +++ 002-python310.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,143 @@ +# https://www.virtualbox.org/changeset/90537/vbox + +Index: trunk/configure +=================================================================== +--- trunk/configure (revision 90536) ++++ trunk/configure (revision 90537) +@@ -3,7 +3,7 @@ + # libraries VBox OSE depends on. + + # +-# Copyright (C) 2006-2020 Oracle Corporation ++# Copyright (C) 2006-2021 Oracle Corporation + # + # This file is part of VirtualBox Open Source Edition (OSE), as + # available from http://www.virtualbox.org. This file is free software; +@@ -2043,7 +2043,7 @@ + } + 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" ++ 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" + 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 +Index: trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp +=================================================================== +--- trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90536) ++++ trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90537) +@@ -84,7 +84,11 @@ + # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) + # endif + # ifdef VBOX_PYXPCOM_VERSIONED +-# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 ++# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 ++# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") ++# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) ++ ++# elif PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 + # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9") + # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9) + +Index: trunk/src/libs/xpcom18a4/python/Makefile.kmk +=================================================================== +--- trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90536) ++++ trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90537) +@@ -4,7 +4,7 @@ + # + + # +-# Copyright (C) 2009-2017 Oracle Corporation ++# Copyright (C) 2009-2021 Oracle Corporation + # + # This file is part of VirtualBox Open Source Edition (OSE), as + # available from http://www.virtualbox.org. This file is free software; +@@ -20,7 +20,7 @@ + + # + # List of supported Python versions, defining a number of +-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables ++# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables + # which get picked up below. + # + ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. +@@ -646,6 +646,52 @@ + 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 +@@ -730,4 +776,3 @@ + + + include $(FILE_KBUILD_SUB_FOOTER) +- +Index: trunk/src/libs/xpcom18a4/python/gen_python_deps.py +=================================================================== +--- trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90536) ++++ trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90537) +@@ -1,7 +1,7 @@ + #!/usr/bin/python + + """ +-Copyright (C) 2009-2016 Oracle Corporation ++Copyright (C) 2009-2021 Oracle Corporation + + This file is part of VirtualBox Open Source Edition (OSE), as + available from http://www.virtualbox.org. This file is free software; +@@ -16,7 +16,7 @@ + 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" ] ++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" ] + prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] + known = {} + Deleted: 003-pyunicode.patch =================================================================== --- 003-pyunicode.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 003-pyunicode.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,26 +0,0 @@ -# https://www.virtualbox.org/changeset/86623/vbox - -Index: trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h -=================================================================== ---- trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86622) -+++ trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86623) -@@ -137,12 +137,14 @@ - # define PyInt_Check(o) PyLong_Check(o) - # define PyInt_AsLong(o) PyLong_AsLong(o) - # define PyNumber_Int(o) PyNumber_Long(o) --# ifndef PyUnicode_AsUTF8 --# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) -+# 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 -+# ifndef PyUnicode_AsUTF8AndSize -+# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) -+# endif - # endif --# ifndef PyUnicode_AsUTF8AndSize --# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) --# endif - typedef struct PyMethodChain - { - PyMethodDef *methods; Copied: virtualbox/repos/community-x86_64/003-pyunicode.patch (from rev 1210265, virtualbox/trunk/003-pyunicode.patch) =================================================================== --- 003-pyunicode.patch (rev 0) +++ 003-pyunicode.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,26 @@ +# https://www.virtualbox.org/changeset/86623/vbox + +Index: trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h +=================================================================== +--- trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86622) ++++ trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86623) +@@ -137,12 +137,14 @@ + # define PyInt_Check(o) PyLong_Check(o) + # define PyInt_AsLong(o) PyLong_AsLong(o) + # define PyNumber_Int(o) PyNumber_Long(o) +-# ifndef PyUnicode_AsUTF8 +-# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) ++# 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 ++# ifndef PyUnicode_AsUTF8AndSize ++# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) ++# endif + # endif +-# ifndef PyUnicode_AsUTF8AndSize +-# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) +-# endif + typedef struct PyMethodChain + { + PyMethodDef *methods; Deleted: 004-drop-Wno-format.patch =================================================================== --- 004-drop-Wno-format.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 004-drop-Wno-format.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,122 +0,0 @@ -From ff59d7f89a64a9386b3b97a3e7b062df59474192 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <m...@eworm.de> -Date: Tue, 18 Jan 2022 21:16:33 +0100 -Subject: [PATCH 1/1] drop -Wno-format - ---- - src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +- - .../EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf | 4 ++-- - .../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 4 ++-- - src/VBox/Devices/Makefile.kmk | 2 +- - src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +- - src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +- - src/VBox/Main/webservice/Makefile.kmk | 2 -- - 7 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk -index a5affd4d..d8dd9ed0 100644 ---- a/src/VBox/Devices/EFI/Firmware/Config.kmk -+++ b/src/VBox/Devices/EFI/Firmware/Config.kmk -@@ -126,7 +126,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \ - ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/ - TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \ - -Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \ -- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \ -+ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \ - -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label - TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \ - -Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \ -diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index 83831a1a..8b22fa0b 100644 ---- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -657,9 +657,9 @@ - # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). - # - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS -+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - -diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index fe28ee67..de03e6df 100644 ---- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -605,9 +605,9 @@ - # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). - # - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS -+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - -diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk -index bd64e790..136e203b 100644 ---- a/src/VBox/Devices/Makefile.kmk -+++ b/src/VBox/Devices/Makefile.kmk -@@ -727,7 +727,7 @@ endif - ifeq ($(KBUILD_TARGET),win) - $(file)_CFLAGS = -wd4018 - else -- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast -+ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast - endif - endef - -diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk -index d35d50c0..64d0079b 100644 ---- a/src/VBox/Devices/PC/ipxe/Makefile.kmk -+++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk -@@ -358,7 +358,7 @@ endif - # - BLDPROGS += ipxezbin - ipxezbin_TEMPLATE = VBoxBldProg -- ipxezbin_CFLAGS = -Wno-format -Wno-unused-function -+ ipxezbin_CFLAGS = -Wno-unused-function - ipxezbin_SOURCES = src/util/zbin.c - - endif -diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -index 4c1a863f..c1af03f6 100644 ---- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -@@ -107,7 +107,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK) - VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 - VBoxDTraceCmd_SDKS = VBOX_ZLIB - ifn1of ($(KBUILD_TARGET), win) -- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow -+ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow - endif - VBoxDTraceCmd_INCS = \ - include \ -diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk -index 6e088b14..3c1d9fa7 100644 ---- a/src/VBox/Main/webservice/Makefile.kmk -+++ b/src/VBox/Main/webservice/Makefile.kmk -@@ -273,7 +273,6 @@ ifdef VBOX_GSOAP_INSTALLED - $(VBOXWEB_OUT_DIR)/soapC-29.cpp - vboxsoap_CXXFLAGS += \ - $(VBOX_GCC_Wno-vla) \ -- $(if-expr $(KBUILD_TARGET) == "win",,-Wno-format) \ - $(if-expr $(KBUILD_TARGET) == "win",,-Wno-deprecated-declarations) - endif - vboxsoap_CLEAN := $(vboxsoap_SOURCES) # lazy bird -@@ -284,7 +283,6 @@ ifdef VBOX_GSOAP_INSTALLED - $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts - ifn1of ($(KBUILD_TARGET), win) - $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \ -- -Wno-format \ - $(VBOX_GCC_Wno-int-in-bool-context) \ - $(if $(VBOX_GCC_Wlogical-op),-Wno-error=logical-op,) - # currently necessary when compiling against OpenSSL 1.0 due to a missing --- -2.34.1 - Copied: virtualbox/repos/community-x86_64/004-drop-Wno-format.patch (from rev 1210265, virtualbox/trunk/004-drop-Wno-format.patch) =================================================================== --- 004-drop-Wno-format.patch (rev 0) +++ 004-drop-Wno-format.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,122 @@ +From ff59d7f89a64a9386b3b97a3e7b062df59474192 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Tue, 18 Jan 2022 21:16:33 +0100 +Subject: [PATCH 1/1] drop -Wno-format + +--- + src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +- + .../EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf | 4 ++-- + .../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 4 ++-- + src/VBox/Devices/Makefile.kmk | 2 +- + src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +- + src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +- + src/VBox/Main/webservice/Makefile.kmk | 2 -- + 7 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk +index a5affd4d..d8dd9ed0 100644 +--- a/src/VBox/Devices/EFI/Firmware/Config.kmk ++++ b/src/VBox/Devices/EFI/Firmware/Config.kmk +@@ -126,7 +126,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \ + ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/ + TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \ + -Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \ +- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \ ++ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \ + -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label + TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \ + -Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \ +diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf +index 83831a1a..8b22fa0b 100644 +--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf ++++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf +@@ -657,9 +657,9 @@ + # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). + # + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS ++ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable ++ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable + GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + +diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +index fe28ee67..de03e6df 100644 +--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf ++++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +@@ -605,9 +605,9 @@ + # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). + # + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS ++ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable +- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable ++ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable + GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized + +diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk +index bd64e790..136e203b 100644 +--- a/src/VBox/Devices/Makefile.kmk ++++ b/src/VBox/Devices/Makefile.kmk +@@ -727,7 +727,7 @@ endif + ifeq ($(KBUILD_TARGET),win) + $(file)_CFLAGS = -wd4018 + else +- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast ++ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast + endif + endef + +diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk +index d35d50c0..64d0079b 100644 +--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk ++++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk +@@ -358,7 +358,7 @@ endif + # + BLDPROGS += ipxezbin + ipxezbin_TEMPLATE = VBoxBldProg +- ipxezbin_CFLAGS = -Wno-format -Wno-unused-function ++ ipxezbin_CFLAGS = -Wno-unused-function + ipxezbin_SOURCES = src/util/zbin.c + + endif +diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +index 4c1a863f..c1af03f6 100644 +--- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +@@ -107,7 +107,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK) + VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 + VBoxDTraceCmd_SDKS = VBOX_ZLIB + ifn1of ($(KBUILD_TARGET), win) +- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow ++ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow + endif + VBoxDTraceCmd_INCS = \ + include \ +diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk +index 6e088b14..3c1d9fa7 100644 +--- a/src/VBox/Main/webservice/Makefile.kmk ++++ b/src/VBox/Main/webservice/Makefile.kmk +@@ -273,7 +273,6 @@ ifdef VBOX_GSOAP_INSTALLED + $(VBOXWEB_OUT_DIR)/soapC-29.cpp + vboxsoap_CXXFLAGS += \ + $(VBOX_GCC_Wno-vla) \ +- $(if-expr $(KBUILD_TARGET) == "win",,-Wno-format) \ + $(if-expr $(KBUILD_TARGET) == "win",,-Wno-deprecated-declarations) + endif + vboxsoap_CLEAN := $(vboxsoap_SOURCES) # lazy bird +@@ -284,7 +283,6 @@ ifdef VBOX_GSOAP_INSTALLED + $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts + ifn1of ($(KBUILD_TARGET), win) + $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \ +- -Wno-format \ + $(VBOX_GCC_Wno-int-in-bool-context) \ + $(if $(VBOX_GCC_Wlogical-op),-Wno-error=logical-op,) + # currently necessary when compiling against OpenSSL 1.0 due to a missing +-- +2.34.1 + Deleted: 005-gsoap-build.patch =================================================================== --- 005-gsoap-build.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 005-gsoap-build.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,11 +0,0 @@ ---- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628 +0100 -+++ b/src/VBox/Main/webservice/Makefile.kmk 2016-08-18 15:16:05.803599026 +0100 -@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \ - $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) - $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) - $(RM) -f $@ -- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) -+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) - ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. - $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" - $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" Copied: virtualbox/repos/community-x86_64/005-gsoap-build.patch (from rev 1210265, virtualbox/trunk/005-gsoap-build.patch) =================================================================== --- 005-gsoap-build.patch (rev 0) +++ 005-gsoap-build.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,11 @@ +--- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628 +0100 ++++ b/src/VBox/Main/webservice/Makefile.kmk 2016-08-18 15:16:05.803599026 +0100 +@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \ + $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) + $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) + $(RM) -f $@ +- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) ++ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) + ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. + $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" + $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" Deleted: 006-rdesktop-vrdp-keymap-path.patch =================================================================== --- 006-rdesktop-vrdp-keymap-path.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 006-rdesktop-vrdp-keymap-path.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,12 +0,0 @@ -# 2015 © Sébastien Luttringer ---- a/src/VBox/RDP/client-1.8.4/Makefile.kmk -+++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk -@@ -41,7 +41,7 @@ - EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \ - HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \ - HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \ -- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \ -+ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \ - RDESKTOP=1 - ifdef WITH_BIRD_VD_HACKS - rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS Copied: virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch (from rev 1210265, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch) =================================================================== --- 006-rdesktop-vrdp-keymap-path.patch (rev 0) +++ 006-rdesktop-vrdp-keymap-path.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,12 @@ +# 2015 © Sébastien Luttringer +--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk ++++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk +@@ -41,7 +41,7 @@ + EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \ + HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \ + HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \ +- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \ ++ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \ + RDESKTOP=1 + ifdef WITH_BIRD_VD_HACKS + rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS Deleted: 008-no-vboxvideo.patch =================================================================== --- 008-no-vboxvideo.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 008-no-vboxvideo.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,12 +0,0 @@ -Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7 ---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:23.184986182 +0100 -+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 -@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo - - ifdef VBOX_USE_SYSTEM_XORG_HEADERS - # Build using local X.Org headers. We assume X.Org Server 1.7 or later. -- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system -+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) - SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) - vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_system_CFLAGS := \ Copied: virtualbox/repos/community-x86_64/008-no-vboxvideo.patch (from rev 1210265, virtualbox/trunk/008-no-vboxvideo.patch) =================================================================== --- 008-no-vboxvideo.patch (rev 0) +++ 008-no-vboxvideo.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,12 @@ +Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7 +--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:23.184986182 +0100 ++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 +@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo + + ifdef VBOX_USE_SYSTEM_XORG_HEADERS + # Build using local X.Org headers. We assume X.Org Server 1.7 or later. +- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system ++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) + SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) + vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_system_CFLAGS := \ Deleted: 009-i3wm.patch =================================================================== --- 009-i3wm.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 009-i3wm.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,50 +0,0 @@ -diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp ---- VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp 2017-03-08 18:19:53.000000000 +0100 -+++ VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp 2017-03-10 10:25:58.876132400 +0100 -@@ -282,7 +282,7 @@ - /* Get cached available-geometry: */ - const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex); - /* Return cached available-geometry if it's valid or screen-geometry otherwise: */ -- return availableGeometry.isValid() ? availableGeometry : -+ return availableGeometry.isValid() && X11WindowManagerType() != X11WMType_i3 ? availableGeometry : - QApplication::desktop()->screenGeometry(iHostScreenIndex); - #else /* !VBOX_WS_X11 */ - /* Redirect call to desktop-widget: */ -diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp ---- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp 2017-03-08 18:19:54.000000000 +0100 -+++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp 2017-03-10 10:23:15.729460200 +0100 -@@ -93,6 +93,9 @@ - else - if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive)) - wmType = X11WMType_Xfwm4; -+ else -+ if (QString((const char*)pcData).contains("i3", Qt::CaseInsensitive)) -+ wmType = X11WMType_i3; - if (pcData) - XFree(pcData); - } -diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h ---- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h 2017-03-08 18:19:54.000000000 +0100 -+++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h 2017-03-10 10:22:11.876123200 +0100 -@@ -27,6 +27,7 @@ - X11WMType_KWin, - X11WMType_Mutter, - X11WMType_Xfwm4, -+ X11WMType_i3, - }; - - /** X11: Determines and returns whether the compositing manager is running. */ -diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp ---- VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2017-03-08 18:19:58.000000000 +0100 -+++ VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2017-03-10 10:29:12.549409400 +0100 -@@ -727,6 +727,10 @@ - /* Enable translucency through Qt API if supported: */ - if (vboxGlobal().isCompositingManagerRunning()) - setAttribute(Qt::WA_TranslucentBackground); -+ -+ if (X11WindowManagerType() == X11WMType_i3) -+ setWindowFlags(Qt::FramelessWindowHint); -+ - #endif /* VBOX_WS_X11 */ - - /* Make sure we have no focus: */ Copied: virtualbox/repos/community-x86_64/009-i3wm.patch (from rev 1210265, virtualbox/trunk/009-i3wm.patch) =================================================================== --- 009-i3wm.patch (rev 0) +++ 009-i3wm.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,50 @@ +diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp +--- VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp 2017-03-08 18:19:53.000000000 +0100 ++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp 2017-03-10 10:25:58.876132400 +0100 +@@ -282,7 +282,7 @@ + /* Get cached available-geometry: */ + const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex); + /* Return cached available-geometry if it's valid or screen-geometry otherwise: */ +- return availableGeometry.isValid() ? availableGeometry : ++ return availableGeometry.isValid() && X11WindowManagerType() != X11WMType_i3 ? availableGeometry : + QApplication::desktop()->screenGeometry(iHostScreenIndex); + #else /* !VBOX_WS_X11 */ + /* Redirect call to desktop-widget: */ +diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp +--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp 2017-03-08 18:19:54.000000000 +0100 ++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp 2017-03-10 10:23:15.729460200 +0100 +@@ -93,6 +93,9 @@ + else + if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive)) + wmType = X11WMType_Xfwm4; ++ else ++ if (QString((const char*)pcData).contains("i3", Qt::CaseInsensitive)) ++ wmType = X11WMType_i3; + if (pcData) + XFree(pcData); + } +diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h +--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h 2017-03-08 18:19:54.000000000 +0100 ++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h 2017-03-10 10:22:11.876123200 +0100 +@@ -27,6 +27,7 @@ + X11WMType_KWin, + X11WMType_Mutter, + X11WMType_Xfwm4, ++ X11WMType_i3, + }; + + /** X11: Determines and returns whether the compositing manager is running. */ +diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp +--- VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2017-03-08 18:19:58.000000000 +0100 ++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2017-03-10 10:29:12.549409400 +0100 +@@ -727,6 +727,10 @@ + /* Enable translucency through Qt API if supported: */ + if (vboxGlobal().isCompositingManagerRunning()) + setAttribute(Qt::WA_TranslucentBackground); ++ ++ if (X11WindowManagerType() == X11WMType_i3) ++ setWindowFlags(Qt::FramelessWindowHint); ++ + #endif /* VBOX_WS_X11 */ + + /* Make sure we have no focus: */ Deleted: 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch =================================================================== --- 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,14 +0,0 @@ -diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp -index 6ad7df3e..2f12c277 100644 ---- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp -+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp -@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32 - */ - DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient) - { -+ -+ return false; -+ - /* - * Seems we get VINF_SUCCESS back from the host if we try unsupported - * guest control functions, so we need to supply some random message Copied: virtualbox/repos/community-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (from rev 1210265, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch) =================================================================== --- 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (rev 0) +++ 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,14 @@ +diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp +index 6ad7df3e..2f12c277 100644 +--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp ++++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp +@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32 + */ + DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient) + { ++ ++ return false; ++ + /* + * Seems we get VINF_SUCCESS back from the host if we try unsupported + * guest control functions, so we need to supply some random message Deleted: 013-Makefile.patch =================================================================== --- 013-Makefile.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 013-Makefile.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,44 +0,0 @@ -diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile -index 18466b48..7c7de4e5 100644 ---- a/src/VBox/HostDrivers/linux/Makefile -+++ b/src/VBox/HostDrivers/linux/Makefile -@@ -23,25 +23,25 @@ - # terms and conditions of either the GPL or the CDDL or both. - # - --ifneq ($(KERNELRELEASE),) -+ifneq ($(KBUILD_EXTMOD),) - --# Building from kBuild (make -C <kernel_directory> M=`pwd`), --# or inside a kernel source tree. -+# Building from kBuild (make -C <kernel_directory> M=`pwd`). -+# KBUILD_EXTMOD is set to $(M) in this case. - - obj-m = vboxdrv/ --ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),) -+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),) - obj-m += vboxnetflt/ - endif --ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) -+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),) - obj-m += vboxnetadp/ - endif --ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),) -+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),) - obj-m += vboxpci/ - endif - --else # ! KERNELRELEASE -+else # ! KBUILD_EXTMOD - --# convenience Makefile without KERNELRELEASE -+# convenience Makefile without KBUILD_EXTMOD - - KBUILD_VERBOSE ?= - KERN_VER ?= $(shell uname -r) -@@ -146,4 +146,4 @@ load: unload - fi; \ - done - --endif # ! KERNELRELEASE -+endif # ! KBUILD_EXTMOD Copied: virtualbox/repos/community-x86_64/013-Makefile.patch (from rev 1210265, virtualbox/trunk/013-Makefile.patch) =================================================================== --- 013-Makefile.patch (rev 0) +++ 013-Makefile.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,44 @@ +diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile +index 18466b48..7c7de4e5 100644 +--- a/src/VBox/HostDrivers/linux/Makefile ++++ b/src/VBox/HostDrivers/linux/Makefile +@@ -23,25 +23,25 @@ + # terms and conditions of either the GPL or the CDDL or both. + # + +-ifneq ($(KERNELRELEASE),) ++ifneq ($(KBUILD_EXTMOD),) + +-# Building from kBuild (make -C <kernel_directory> M=`pwd`), +-# or inside a kernel source tree. ++# Building from kBuild (make -C <kernel_directory> M=`pwd`). ++# KBUILD_EXTMOD is set to $(M) in this case. + + obj-m = vboxdrv/ +-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),) ++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),) + obj-m += vboxnetflt/ + endif +-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) ++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),) + obj-m += vboxnetadp/ + endif +-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),) ++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),) + obj-m += vboxpci/ + endif + +-else # ! KERNELRELEASE ++else # ! KBUILD_EXTMOD + +-# convenience Makefile without KERNELRELEASE ++# convenience Makefile without KBUILD_EXTMOD + + KBUILD_VERBOSE ?= + KERN_VER ?= $(shell uname -r) +@@ -146,4 +146,4 @@ load: unload + fi; \ + done + +-endif # ! KERNELRELEASE ++endif # ! KBUILD_EXTMOD Deleted: 017-fix-narrowing-conversion.patch =================================================================== --- 017-fix-narrowing-conversion.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 017-fix-narrowing-conversion.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,37 +0,0 @@ -From ee6ae088673d14c407d4773855dbda821024653c Mon Sep 17 00:00:00 2001 -From: Christian Hesse <m...@eworm.de> -Date: Sun, 17 May 2020 00:40:18 +0200 -Subject: [PATCH 1/1] fix narrowing conversion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building fails with: - -/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp: In function ‘const char* dbgcMachoCpuType(uint32_t, uint32_t)’: -/build/virtualbox/src/VirtualBox-6.1.8/include/iprt/formats/mach-o.h:41:46: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ [-Wnarrowing] - 41 | #define CPU_TYPE_ANY INT32_C(-1) - | ^ -/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro ‘CPU_TYPE_ANY’ - 471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; - | ^~~~~~~~~~~~ - -As uType is unsigned it can never match CPU_TYPE_ANY, which is -1. - -Signed-off-by: Christian Hesse <m...@eworm.de> ---- - src/VBox/Debugger/DBGCDumpImage.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp -index 02ba3158..d906c37c 100644 ---- a/src/VBox/Debugger/DBGCDumpImage.cpp -+++ b/src/VBox/Debugger/DBGCDumpImage.cpp -@@ -468,7 +468,6 @@ static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType) - { - switch (uType) - { -- case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; - case CPU_TYPE_VAX: return "VAX"; - case CPU_TYPE_MC680x0: return "MC680x0"; - case CPU_TYPE_X86: return "X86"; Copied: virtualbox/repos/community-x86_64/017-fix-narrowing-conversion.patch (from rev 1210265, virtualbox/trunk/017-fix-narrowing-conversion.patch) =================================================================== --- 017-fix-narrowing-conversion.patch (rev 0) +++ 017-fix-narrowing-conversion.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,37 @@ +From ee6ae088673d14c407d4773855dbda821024653c Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Sun, 17 May 2020 00:40:18 +0200 +Subject: [PATCH 1/1] fix narrowing conversion +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building fails with: + +/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp: In function ‘const char* dbgcMachoCpuType(uint32_t, uint32_t)’: +/build/virtualbox/src/VirtualBox-6.1.8/include/iprt/formats/mach-o.h:41:46: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ [-Wnarrowing] + 41 | #define CPU_TYPE_ANY INT32_C(-1) + | ^ +/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro ‘CPU_TYPE_ANY’ + 471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; + | ^~~~~~~~~~~~ + +As uType is unsigned it can never match CPU_TYPE_ANY, which is -1. + +Signed-off-by: Christian Hesse <m...@eworm.de> +--- + src/VBox/Debugger/DBGCDumpImage.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp +index 02ba3158..d906c37c 100644 +--- a/src/VBox/Debugger/DBGCDumpImage.cpp ++++ b/src/VBox/Debugger/DBGCDumpImage.cpp +@@ -468,7 +468,6 @@ static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType) + { + switch (uType) + { +- case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; + case CPU_TYPE_VAX: return "VAX"; + case CPU_TYPE_MC680x0: return "MC680x0"; + case CPU_TYPE_X86: return "X86"; Deleted: 018-xclient.patch =================================================================== --- 018-xclient.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 018-xclient.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,24 +0,0 @@ ---- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do - test -w $i || rm -f $i - done - --if ! test -c /dev/vboxguest 2>/dev/null; then -- # Do not start if the kernel module is not present. -- # Execute notify-send in the back-ground to avoid racing with sddm, -- # as notify-send may wait for sddm to start while it waits for us to exit. -- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." & --elif test -z "${SSH_CONNECTION}"; then -- # This script can also be triggered by a connection over SSH, which is not -- # what we had in mind, so we do not start VBoxClient in that case. We do -- # not use "exit" here as this script is "source"d, not executed. -+# Do not start if the kernel module is not present; or if this script is -+# triggered by a connection over SSH. -+if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then - /usr/bin/VBoxClient --clipboard - /usr/bin/VBoxClient --checkhostversion - /usr/bin/VBoxClient --seamless - /usr/bin/VBoxClient --draganddrop -- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled - fi Copied: virtualbox/repos/community-x86_64/018-xclient.patch (from rev 1210265, virtualbox/trunk/018-xclient.patch) =================================================================== --- 018-xclient.patch (rev 0) +++ 018-xclient.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,24 @@ +--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient +@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do + test -w $i || rm -f $i + done + +-if ! test -c /dev/vboxguest 2>/dev/null; then +- # Do not start if the kernel module is not present. +- # Execute notify-send in the back-ground to avoid racing with sddm, +- # as notify-send may wait for sddm to start while it waits for us to exit. +- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." & +-elif test -z "${SSH_CONNECTION}"; then +- # This script can also be triggered by a connection over SSH, which is not +- # what we had in mind, so we do not start VBoxClient in that case. We do +- # not use "exit" here as this script is "source"d, not executed. ++# Do not start if the kernel module is not present; or if this script is ++# triggered by a connection over SSH. ++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then + /usr/bin/VBoxClient --clipboard + /usr/bin/VBoxClient --checkhostversion + /usr/bin/VBoxClient --seamless + /usr/bin/VBoxClient --draganddrop +- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled + fi Deleted: 019-vboxr0-cflags.patch =================================================================== --- 019-vboxr0-cflags.patch 2022-05-24 21:52:20 UTC (rev 1210265) +++ 019-vboxr0-cflags.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,18 +0,0 @@ ---- a/Config.kmk -+++ b/Config.kmk -@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) - TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) -+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) - TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ - $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ - -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) -+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. -+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding -+ endif - TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding - TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding Copied: virtualbox/repos/community-x86_64/019-vboxr0-cflags.patch (from rev 1210265, virtualbox/trunk/019-vboxr0-cflags.patch) =================================================================== --- 019-vboxr0-cflags.patch (rev 0) +++ 019-vboxr0-cflags.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,18 @@ +--- a/Config.kmk ++++ b/Config.kmk +@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf) + TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) + TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ + $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ +- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) ++ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) + TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ + $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ + $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ + -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) ++ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. ++TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding ++ endif + TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding + TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables + TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding Copied: virtualbox/repos/community-x86_64/020-linux518.patch (from rev 1210265, virtualbox/trunk/020-linux518.patch) =================================================================== --- 020-linux518.patch (rev 0) +++ 020-linux518.patch 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,16 @@ +Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +=================================================================== +--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -2312,5 +2312,11 @@ + Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); + Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); ++#if RTLNX_VER_MIN(5,18,0) ++ local_bh_disable(); ++ err = netif_rx(pBuf); ++ local_bh_enable(); ++#else + err = netif_rx_ni(pBuf); ++#endif + if (err) + rc = RTErrConvertFromErrno(err); Deleted: 60-vboxdrv.rules =================================================================== --- 60-vboxdrv.rules 2022-05-24 21:52:20 UTC (rev 1210265) +++ 60-vboxdrv.rules 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,8 +0,0 @@ -KERNEL=="vboxdrv", OWNER="root", GROUP="root", MODE="0600" -KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666" -KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600" - -SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" Copied: virtualbox/repos/community-x86_64/60-vboxdrv.rules (from rev 1210265, virtualbox/trunk/60-vboxdrv.rules) =================================================================== --- 60-vboxdrv.rules (rev 0) +++ 60-vboxdrv.rules 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,8 @@ +KERNEL=="vboxdrv", OWNER="root", GROUP="root", MODE="0600" +KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666" +KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600" + +SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" Deleted: 60-vboxguest.rules =================================================================== --- 60-vboxguest.rules 2022-05-24 21:52:20 UTC (rev 1210265) +++ 60-vboxguest.rules 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" Copied: virtualbox/repos/community-x86_64/60-vboxguest.rules (from rev 1210265, virtualbox/trunk/60-vboxguest.rules) =================================================================== --- 60-vboxguest.rules (rev 0) +++ 60-vboxguest.rules 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" Deleted: LocalConfig.kmk =================================================================== --- LocalConfig.kmk 2022-05-24 21:52:20 UTC (rev 1210265) +++ LocalConfig.kmk 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,39 +0,0 @@ -# do not build test cases -VBOX_WITH_TESTCASES := -VBOX_WITH_TESTSUITE := -VBOX_WITH_VALIDATIONKIT := - -# no legacy X.org - use KMS -VBOX_USE_SYSTEM_XORG_HEADERS = 1 -VBOX_NO_LEGACY_XORG_X11 = 1 - -# archlinux path -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox -VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) -VBOX_BLD_PYTHON = python -VBOX_JAVA_HOME = /usr/lib/jvm/java-8-openjdk - -# do not fail on warning -VBOX_GCC_WERR = -VBOX_GCC_WARN = - -# fix gsoap missing zlib include and produce errors with --as-needed -VBOX_GSOAP_CXX_LIBS := gsoapssl++ z - -# use system xorg and gl headers -VBOX_USE_SYSTEM_XORG_HEADERS = 1 -VBOX_USE_SYSTEM_GL_HEADERS = 1 - -# no update request. update are handled via pacman -VBOX_WITH_UPDATE_REQUEST := 0 - -# build shared library -VBOX_GUI_WITH_SHARED_LIBRARY = 1 - -# disable experimental cloud infrastructure integration -VBOX_WITH_CLOUD_NET := Copied: virtualbox/repos/community-x86_64/LocalConfig.kmk (from rev 1210265, virtualbox/trunk/LocalConfig.kmk) =================================================================== --- LocalConfig.kmk (rev 0) +++ LocalConfig.kmk 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,39 @@ +# do not build test cases +VBOX_WITH_TESTCASES := +VBOX_WITH_TESTSUITE := +VBOX_WITH_VALIDATIONKIT := + +# no legacy X.org - use KMS +VBOX_USE_SYSTEM_XORG_HEADERS = 1 +VBOX_NO_LEGACY_XORG_X11 = 1 + +# archlinux path +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox +VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) +VBOX_BLD_PYTHON = python +VBOX_JAVA_HOME = /usr/lib/jvm/java-8-openjdk + +# do not fail on warning +VBOX_GCC_WERR = +VBOX_GCC_WARN = + +# fix gsoap missing zlib include and produce errors with --as-needed +VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + +# use system xorg and gl headers +VBOX_USE_SYSTEM_XORG_HEADERS = 1 +VBOX_USE_SYSTEM_GL_HEADERS = 1 + +# no update request. update are handled via pacman +VBOX_WITH_UPDATE_REQUEST := 0 + +# build shared library +VBOX_GUI_WITH_SHARED_LIBRARY = 1 + +# disable experimental cloud infrastructure integration +VBOX_WITH_CLOUD_NET := Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-24 21:52:20 UTC (rev 1210265) +++ PKGBUILD 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,362 +0,0 @@ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgbase=virtualbox -pkgname=('virtualbox' - 'virtualbox-host-dkms' - 'virtualbox-sdk' - 'virtualbox-guest-utils' - 'virtualbox-guest-utils-nox' - 'virtualbox-ext-vnc') -pkgver=6.1.34 -_tarver=${pkgver} -pkgrel=2 -arch=('x86_64') -url='https://virtualbox.org/' -license=('GPL' 'custom') -makedepends=('alsa-lib' - 'bin86' - 'cdrkit' - 'curl' - 'dev86' - 'device-mapper' - 'git' - 'glu' - 'gsoap' - 'iasl' - 'jdk8-openjdk' - 'libidl2' - 'libpulse' - 'libvncserver' - 'libvpx' - 'libxcomposite' - 'libxcursor' - 'libxinerama' - 'libxml2' - 'libxmu' - 'libxrandr' - 'libxslt' - 'libxtst' - 'linux-headers' - 'mesa' - 'opus' - 'python' - 'qt5-base' - 'qt5-x11extras' - 'qt5-tools' - 'sdl' - 'sdl_ttf' - 'vde2' - 'xalan-c' - 'xorgproto' - 'xorg-server-devel') -source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarver}.tar.bz2" - 'virtualbox-host-dkms.conf' - 'virtualbox.sysusers' - 'virtualbox-guest-utils.sysusers' - '60-vboxdrv.rules' - '60-vboxguest.rules' - 'LocalConfig.kmk' - 'vboxservice.service' - 'vboxservice-nox.service' - 'vboxdrmclient.path' - 'vboxdrmclient.service' - 'vboxweb.service' - 'vboxreload' - '001-disable-update.patch' - '002-python310.patch' - '003-pyunicode.patch' - '004-drop-Wno-format.patch' - '005-gsoap-build.patch' - '006-rdesktop-vrdp-keymap-path.patch' - '008-no-vboxvideo.patch' - '009-i3wm.patch' - '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' - '013-Makefile.patch' - '017-fix-narrowing-conversion.patch' - '018-xclient.patch' - '019-vboxr0-cflags.patch') -sha256sums=('9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49' - '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' - '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' - 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' - 'f876e9f55243eded423fda4fc2ffe3b174dca90380a6315f7c9b3cd1c9d07206' - '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95' - '3cf42bc6e9e55fd2cb6be7b89c5b98d0f6a2eff6125a9ee7efafaabc35f1de22' - 'c41a801fe344a4471a7b61a4764d1d857c403e4fb96e2ba6bc89c77a35f2be7a' - '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' - '83d8f24bff25bb925083cf39b3195236c6136105e62417712cc3f25b92e14b47' - '2beab8de525220fa418c9873f9e0d657ddbad4ff9e4a46d7053e6cd9bc4ce95e' - 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' - '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' - '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' - '361a6de4fd91070f3e34d4a59b086a84c8a38c707f44b6db82b658d9076f69ce' - '3bb1643a212b9ecb4d75e31add984a6b206f71a9f46f460007812d1ce648c1a0' - '2ef32b9f6df4c5489751de36446f29825b4602048ee6d5e59573e4b01c8f4846' - '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' - '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' - '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' - 'c1e13ea4340cff681b273408b1e7f38c887ff8dab6923db390aa58d5ae0f82fa' - '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' - 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' - '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99' - 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3' - '25066d566042a3b3d6dee805fe783ca07fd3c3671a098db2b5f09aeb07624cd2') - -prepare() { - cd "VirtualBox-$pkgver" - - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - echo "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - - echo 'Applying local config' - cp "$srcdir/LocalConfig.kmk" . - - echo 'Use our CFLAGS' - echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk -} - -build() { - cd "VirtualBox-$pkgver" - - echo 'Build virtualbox' - ./configure \ - --disable-docs \ - --disable-kmods \ - --disable-vmmraw \ - --enable-vde \ - --enable-vnc \ - --enable-webservice \ - --with-makeself=/usr/bin/echo - # fake makeself binary to compile without nofatal - # makeself is used by linux installer. we don't need it. - source ./env.sh - kmk - - echo 'Build rdesktop-vrdp' - kmk -C src/VBox/RDP/client-1.8.4 - - echo 'Build VNC extension pack' - kmk -C src/VBox/ExtPacks/VNC packing - - echo 'Build vboximg-mount' - kmk -C src/VBox/ImageMounter/vboximg-mount -} - -package_virtualbox() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use' - depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl' - 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib' - 'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt' - 'opus' 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES') - optdepends=('vde2: Virtual Distributed Ethernet support' - 'virtualbox-guest-iso: Guest Additions CD image' - 'virtualbox-ext-vnc: VNC server support' - 'virtualbox-sdk: Developer kit') - backup=('etc/vbox/vbox.cfg') - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - # binaries - install -dm0755 "$pkgdir/usr/bin" - install -m0755 VBox.sh "$pkgdir/usr/bin/VBox" - for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do - ln -sf VBox "$pkgdir/usr/bin/$i" - ln -sf VBox "$pkgdir/usr/bin/${i,,}" - done - install -m0755 VBoxTunctl "$pkgdir/usr/bin" - install -m0755 rdesktop-vrdp "$pkgdir/usr/bin" - install -m0755 vboximg-mount "$pkgdir/usr/bin" - - # libraries - install -dm0755 "$pkgdir/usr/lib/virtualbox" - install -m0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m0644 *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - ## setuid root binaries - install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox" - ## other binaries - install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - # components - install -dm0755 "$pkgdir/usr/lib/virtualbox/components" - install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - # extensions packs - ## as virtualbox install itself stuff in this directory, move it to /var and - ## trick it with a symlink - ## FIXME: trick is disabled for now - #install -dm0755 "$pkgdir/var/lib/virtualbox/extensions" - #install -dm0755 "$pkgdir/usr/share/virtualbox/extensions" - #ln -s ../../../var/lib/virtualbox/extensions "$pkgdir/usr/lib/virtualbox/ExtensionPacks" - install -dm0755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks" - - # languages - install -dm0755 "$pkgdir/usr/share/virtualbox/nls" - install -m0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - # rdesktop keymaps - install -dm0755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" - install -m0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" - - # useless scripts - install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - # icons - install -Dm0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons >/dev/null - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd >/dev/null - - #desktop - install -Dm0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -Dm0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - install -dm0755 "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - # back to srcdir - cd "$srcdir" - - #licence - install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # install systemd stuff - install -Dm0644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules" - install -Dm0644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service" - install -Dm0644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf" - - # install module reloading shortcut (with a symlink with default helper) - install -Dm0755 vboxreload "$pkgdir/usr/bin" - ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv" -} - -package_virtualbox-sdk() { - pkgdesc='VirtualBox Software Developer Kit (SDK)' - depends=('python') - - install -dm0755 "$pkgdir/usr/lib/virtualbox" - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -Dm0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - # python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install --root "$pkgdir" - popd - cp -r sdk "$pkgdir/usr/lib/virtualbox" - rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer" - # licence - install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_virtualbox-host-dkms() { - pkgdesc='VirtualBox Host kernel modules sources' - depends=('dkms' 'gcc' 'make') - replaces=('virtualbox-source' - 'virtualbox-host-source' - 'virtualbox-host-modules-lts') - conflicts=('virtualbox-source' 'virtualbox-host-source') - provides=('VIRTUALBOX-HOST-MODULES') - install=virtualbox-host-dkms.install - - install -dm0755 "$pkgdir/usr/src" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE" - # licence - install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # module loading - local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf" - install -Dm0644 /dev/null "$_p" - printf "vboxdrv\nvboxnetadp\nvboxnetflt\n" > "$_p" - # starting vbox 5.1, dkms.conf file was dropped - local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf" - install -Dm0644 "$srcdir/$pkgname.conf" "$_p" - sed -i "s,@VERSION@,$pkgver," "$_p" -} - -package_virtualbox-guest-utils() { - pkgdesc='VirtualBox Guest userspace utilities' - depends=('glibc' 'pam' 'libx11' 'libxcomposite' 'libxdamage' 'libxext' - 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr' 'xf86-video-vmware' - 'VIRTUALBOX-GUEST-MODULES') - replaces=('virtualbox-archlinux-additions' - 'virtualbox-guest-additions' - 'virtualbox-guest-dkms') - conflicts=('virtualbox-archlinux-additions' - 'virtualbox-guest-additions' - 'virtualbox-guest-utils-nox' - 'virtualbox-guest-dkms') - - source "VirtualBox-$pkgver/env.sh" - pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - install -d "$pkgdir/usr/bin" - install -m0755 VBoxClient VBoxControl VBoxDRMClient VBoxService "$pkgdir/usr/bin" - install -m0755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m0644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" - popd - # systemd stuff - install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - install -Dm0644 vboxdrmclient.path "$pkgdir/usr/lib/systemd/system/vboxdrmclient.path" - install -Dm0644 vboxdrmclient.service "$pkgdir/usr/lib/systemd/system/vboxdrmclient.service" - install -Dm0644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service" - install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" - # licence - install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_virtualbox-guest-utils-nox() { - pkgdesc='VirtualBox Guest userspace utilities without X support' - depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES') - replaces=('virtualbox-guest-dkms') - conflicts=('virtualbox-guest-utils' - 'virtualbox-guest-dkms') - - source "VirtualBox-$pkgver/env.sh" - pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - install -d "$pkgdir/usr/bin" - install -m0755 VBoxControl VBoxService "$pkgdir/usr/bin" - install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" - popd - # systemd stuff - install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - install -Dm0644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service" - install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" - # licence - install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_virtualbox-ext-vnc() { - pkgdesc='VirtualBox VNC extension pack' - depends=('virtualbox' 'libvncserver') - optdepends=('tigervnc: vnc client') - install=virtualbox-ext-vnc.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" - install -Dm0644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" - # licence - install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: virtualbox/repos/community-x86_64/PKGBUILD (from rev 1210265, virtualbox/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,364 @@ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgbase=virtualbox +pkgname=('virtualbox' + 'virtualbox-host-dkms' + 'virtualbox-sdk' + 'virtualbox-guest-utils' + 'virtualbox-guest-utils-nox' + 'virtualbox-ext-vnc') +pkgver=6.1.34 +_tarver=${pkgver} +pkgrel=3 +arch=('x86_64') +url='https://virtualbox.org/' +license=('GPL' 'custom') +makedepends=('alsa-lib' + 'bin86' + 'cdrkit' + 'curl' + 'dev86' + 'device-mapper' + 'git' + 'glu' + 'gsoap' + 'iasl' + 'jdk8-openjdk' + 'libidl2' + 'libpulse' + 'libvncserver' + 'libvpx' + 'libxcomposite' + 'libxcursor' + 'libxinerama' + 'libxml2' + 'libxmu' + 'libxrandr' + 'libxslt' + 'libxtst' + 'linux-headers' + 'mesa' + 'opus' + 'python' + 'qt5-base' + 'qt5-x11extras' + 'qt5-tools' + 'sdl' + 'sdl_ttf' + 'vde2' + 'xalan-c' + 'xorgproto' + 'xorg-server-devel') +source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarver}.tar.bz2" + 'virtualbox-host-dkms.conf' + 'virtualbox.sysusers' + 'virtualbox-guest-utils.sysusers' + '60-vboxdrv.rules' + '60-vboxguest.rules' + 'LocalConfig.kmk' + 'vboxservice.service' + 'vboxservice-nox.service' + 'vboxdrmclient.path' + 'vboxdrmclient.service' + 'vboxweb.service' + 'vboxreload' + '001-disable-update.patch' + '002-python310.patch' + '003-pyunicode.patch' + '004-drop-Wno-format.patch' + '005-gsoap-build.patch' + '006-rdesktop-vrdp-keymap-path.patch' + '008-no-vboxvideo.patch' + '009-i3wm.patch' + '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' + '013-Makefile.patch' + '017-fix-narrowing-conversion.patch' + '018-xclient.patch' + '019-vboxr0-cflags.patch' + '020-linux518.patch') +sha256sums=('9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49' + '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' + '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' + 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' + 'f876e9f55243eded423fda4fc2ffe3b174dca90380a6315f7c9b3cd1c9d07206' + '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95' + '3cf42bc6e9e55fd2cb6be7b89c5b98d0f6a2eff6125a9ee7efafaabc35f1de22' + 'c41a801fe344a4471a7b61a4764d1d857c403e4fb96e2ba6bc89c77a35f2be7a' + '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' + '83d8f24bff25bb925083cf39b3195236c6136105e62417712cc3f25b92e14b47' + '2beab8de525220fa418c9873f9e0d657ddbad4ff9e4a46d7053e6cd9bc4ce95e' + 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' + '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' + '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' + '361a6de4fd91070f3e34d4a59b086a84c8a38c707f44b6db82b658d9076f69ce' + '3bb1643a212b9ecb4d75e31add984a6b206f71a9f46f460007812d1ce648c1a0' + '2ef32b9f6df4c5489751de36446f29825b4602048ee6d5e59573e4b01c8f4846' + '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' + '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' + '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' + 'c1e13ea4340cff681b273408b1e7f38c887ff8dab6923db390aa58d5ae0f82fa' + '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' + 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' + '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99' + 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3' + '25066d566042a3b3d6dee805fe783ca07fd3c3671a098db2b5f09aeb07624cd2' + '1bdce861cb3609256da3b0ce07cab59d17801d48fa67c55b2c4dad9b09014f47') + +prepare() { + cd "VirtualBox-$pkgver" + + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + echo "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + + echo 'Applying local config' + cp "$srcdir/LocalConfig.kmk" . + + echo 'Use our CFLAGS' + echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk +} + +build() { + cd "VirtualBox-$pkgver" + + echo 'Build virtualbox' + ./configure \ + --disable-docs \ + --disable-kmods \ + --disable-vmmraw \ + --enable-vde \ + --enable-vnc \ + --enable-webservice \ + --with-makeself=/usr/bin/echo + # fake makeself binary to compile without nofatal + # makeself is used by linux installer. we don't need it. + source ./env.sh + kmk + + echo 'Build rdesktop-vrdp' + kmk -C src/VBox/RDP/client-1.8.4 + + echo 'Build VNC extension pack' + kmk -C src/VBox/ExtPacks/VNC packing + + echo 'Build vboximg-mount' + kmk -C src/VBox/ImageMounter/vboximg-mount +} + +package_virtualbox() { + pkgdesc='Powerful x86 virtualization for enterprise as well as home use' + depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl' + 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib' + 'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt' + 'opus' 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES') + optdepends=('vde2: Virtual Distributed Ethernet support' + 'virtualbox-guest-iso: Guest Additions CD image' + 'virtualbox-ext-vnc: VNC server support' + 'virtualbox-sdk: Developer kit') + backup=('etc/vbox/vbox.cfg') + replaces=('virtualbox-ose') + conflicts=('virtualbox-ose') + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + # binaries + install -dm0755 "$pkgdir/usr/bin" + install -m0755 VBox.sh "$pkgdir/usr/bin/VBox" + for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do + ln -sf VBox "$pkgdir/usr/bin/$i" + ln -sf VBox "$pkgdir/usr/bin/${i,,}" + done + install -m0755 VBoxTunctl "$pkgdir/usr/bin" + install -m0755 rdesktop-vrdp "$pkgdir/usr/bin" + install -m0755 vboximg-mount "$pkgdir/usr/bin" + + # libraries + install -dm0755 "$pkgdir/usr/lib/virtualbox" + install -m0755 *.so "$pkgdir/usr/lib/virtualbox" + install -m0644 *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" + ## setuid root binaries + install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox" + ## other binaries + install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" + + # components + install -dm0755 "$pkgdir/usr/lib/virtualbox/components" + install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" + + # extensions packs + ## as virtualbox install itself stuff in this directory, move it to /var and + ## trick it with a symlink + ## FIXME: trick is disabled for now + #install -dm0755 "$pkgdir/var/lib/virtualbox/extensions" + #install -dm0755 "$pkgdir/usr/share/virtualbox/extensions" + #ln -s ../../../var/lib/virtualbox/extensions "$pkgdir/usr/lib/virtualbox/ExtensionPacks" + install -dm0755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks" + + # languages + install -dm0755 "$pkgdir/usr/share/virtualbox/nls" + install -m0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" + + # rdesktop keymaps + install -dm0755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" + install -m0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" + + # useless scripts + install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" + + # icons + install -Dm0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" + + pushd icons >/dev/null + for i in *; do + install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + done + popd >/dev/null + + #desktop + install -Dm0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" + install -Dm0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" + + #install configuration + install -dm0755 "$pkgdir/etc/vbox" + echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" + + # back to srcdir + cd "$srcdir" + + #licence + install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # install systemd stuff + install -Dm0644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules" + install -Dm0644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service" + install -Dm0644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf" + + # install module reloading shortcut (with a symlink with default helper) + install -Dm0755 vboxreload "$pkgdir/usr/bin" + ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv" +} + +package_virtualbox-sdk() { + pkgdesc='VirtualBox Software Developer Kit (SDK)' + depends=('python') + + install -dm0755 "$pkgdir/usr/lib/virtualbox" + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + install -Dm0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" + # python sdk + pushd sdk/installer + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install --root "$pkgdir" + popd + cp -r sdk "$pkgdir/usr/lib/virtualbox" + rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer" + # licence + install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_virtualbox-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' + depends=('dkms' 'gcc' 'make') + replaces=('virtualbox-source' + 'virtualbox-host-source' + 'virtualbox-host-modules-lts') + conflicts=('virtualbox-source' 'virtualbox-host-source') + provides=('VIRTUALBOX-HOST-MODULES') + install=virtualbox-host-dkms.install + + install -dm0755 "$pkgdir/usr/src" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE" + # licence + install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # module loading + local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + install -Dm0644 /dev/null "$_p" + printf "vboxdrv\nvboxnetadp\nvboxnetflt\n" > "$_p" + # starting vbox 5.1, dkms.conf file was dropped + local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf" + install -Dm0644 "$srcdir/$pkgname.conf" "$_p" + sed -i "s,@VERSION@,$pkgver," "$_p" +} + +package_virtualbox-guest-utils() { + pkgdesc='VirtualBox Guest userspace utilities' + depends=('glibc' 'pam' 'libx11' 'libxcomposite' 'libxdamage' 'libxext' + 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr' 'xf86-video-vmware' + 'VIRTUALBOX-GUEST-MODULES') + replaces=('virtualbox-archlinux-additions' + 'virtualbox-guest-additions' + 'virtualbox-guest-dkms') + conflicts=('virtualbox-archlinux-additions' + 'virtualbox-guest-additions' + 'virtualbox-guest-utils-nox' + 'virtualbox-guest-dkms') + + source "VirtualBox-$pkgver/env.sh" + pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + install -d "$pkgdir/usr/bin" + install -m0755 VBoxClient VBoxControl VBoxDRMClient VBoxService "$pkgdir/usr/bin" + install -m0755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + "$pkgdir"/usr/bin/VBoxClient-all + install -m0644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + "$pkgdir"/etc/xdg/autostart/vboxclient.desktop + install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" + popd + # systemd stuff + install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" + install -Dm0644 vboxdrmclient.path "$pkgdir/usr/lib/systemd/system/vboxdrmclient.path" + install -Dm0644 vboxdrmclient.service "$pkgdir/usr/lib/systemd/system/vboxdrmclient.service" + install -Dm0644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service" + install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" + # licence + install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_virtualbox-guest-utils-nox() { + pkgdesc='VirtualBox Guest userspace utilities without X support' + depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES') + replaces=('virtualbox-guest-dkms') + conflicts=('virtualbox-guest-utils' + 'virtualbox-guest-dkms') + + source "VirtualBox-$pkgver/env.sh" + pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + install -d "$pkgdir/usr/bin" + install -m0755 VBoxControl VBoxService "$pkgdir/usr/bin" + install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" + popd + # systemd stuff + install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" + install -Dm0644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service" + install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" + # licence + install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_virtualbox-ext-vnc() { + pkgdesc='VirtualBox VNC extension pack' + depends=('virtualbox' 'libvncserver') + optdepends=('tigervnc: vnc client') + install=virtualbox-ext-vnc.install + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" + install -Dm0644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" + # licence + install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Deleted: build.sh =================================================================== --- build.sh 2022-05-24 21:52:20 UTC (rev 1210265) +++ build.sh 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,3 +0,0 @@ -#!/bin/bash - -multilib-build "$@" && extra-i686-build "$@" Copied: virtualbox/repos/community-x86_64/build.sh (from rev 1210265, virtualbox/trunk/build.sh) =================================================================== --- build.sh (rev 0) +++ build.sh 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,3 @@ +#!/bin/bash + +multilib-build "$@" && extra-i686-build "$@" Deleted: vboxdrmclient.path =================================================================== --- vboxdrmclient.path 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxdrmclient.path 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,6 +0,0 @@ -[Unit] -Description=VirtualBox Guest VMSVGA resize client -ConditionVirtualization=oracle - -[Path] -PathExistsGlob=/dev/dri/renderD* Copied: virtualbox/repos/community-x86_64/vboxdrmclient.path (from rev 1210265, virtualbox/trunk/vboxdrmclient.path) =================================================================== --- vboxdrmclient.path (rev 0) +++ vboxdrmclient.path 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,6 @@ +[Unit] +Description=VirtualBox Guest VMSVGA resize client +ConditionVirtualization=oracle + +[Path] +PathExistsGlob=/dev/dri/renderD* Deleted: vboxdrmclient.service =================================================================== --- vboxdrmclient.service 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxdrmclient.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,7 +0,0 @@ -[Unit] -Description=VirtualBox Guest VMSVGA resize client -ConditionVirtualization=oracle -ConditionPathExistsGlob=/dev/dri/renderD* - -[Service] -ExecStart=/usr/bin/VBoxDRMClient Copied: virtualbox/repos/community-x86_64/vboxdrmclient.service (from rev 1210265, virtualbox/trunk/vboxdrmclient.service) =================================================================== --- vboxdrmclient.service (rev 0) +++ vboxdrmclient.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,7 @@ +[Unit] +Description=VirtualBox Guest VMSVGA resize client +ConditionVirtualization=oracle +ConditionPathExistsGlob=/dev/dri/renderD* + +[Service] +ExecStart=/usr/bin/VBoxDRMClient Deleted: vboxreload =================================================================== --- vboxreload 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxreload 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,37 +0,0 @@ -#!/bin/bash - -# vboxreload: shortcut to reload virtualbox host modules -# -# Copyright © 2016 Sébastien Luttringer -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; } - -modules=(vboxnetadp vboxnetflt vboxdrv) - -echo -n 'Unloading modules: ' -for _m in "${modules[@]}"; do - lsmod|grep -q "$_m" && rmmod "$_m" && echo -n "$_m " -done -echo - -echo -n 'Loading modules: ' -for _m in "${modules[@]}"; do - modprobe "$_m" && echo -n "$_m " -done -echo - -# vim:set ts=2 sw=2 ai et: Copied: virtualbox/repos/community-x86_64/vboxreload (from rev 1210265, virtualbox/trunk/vboxreload) =================================================================== --- vboxreload (rev 0) +++ vboxreload 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,37 @@ +#!/bin/bash + +# vboxreload: shortcut to reload virtualbox host modules +# +# Copyright © 2016 Sébastien Luttringer +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; } + +modules=(vboxnetadp vboxnetflt vboxdrv) + +echo -n 'Unloading modules: ' +for _m in "${modules[@]}"; do + lsmod|grep -q "$_m" && rmmod "$_m" && echo -n "$_m " +done +echo + +echo -n 'Loading modules: ' +for _m in "${modules[@]}"; do + modprobe "$_m" && echo -n "$_m " +done +echo + +# vim:set ts=2 sw=2 ai et: Deleted: vboxservice-nox.service =================================================================== --- vboxservice-nox.service 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxservice-nox.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,11 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle - -[Service] -ExecStartPre=-/usr/bin/modprobe vboxguest -ExecStartPre=-/usr/bin/modprobe vboxsf -ExecStart=/usr/bin/VBoxService -f - -[Install] -WantedBy=multi-user.target Copied: virtualbox/repos/community-x86_64/vboxservice-nox.service (from rev 1210265, virtualbox/trunk/vboxservice-nox.service) =================================================================== --- vboxservice-nox.service (rev 0) +++ vboxservice-nox.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,11 @@ +[Unit] +Description=VirtualBox Guest Service +ConditionVirtualization=oracle + +[Service] +ExecStartPre=-/usr/bin/modprobe vboxguest +ExecStartPre=-/usr/bin/modprobe vboxsf +ExecStart=/usr/bin/VBoxService -f + +[Install] +WantedBy=multi-user.target Deleted: vboxservice.service =================================================================== --- vboxservice.service 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxservice.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,13 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle -Wants=vboxdrmclient.path - -[Service] -ExecStartPre=-/usr/bin/modprobe vboxguest -ExecStartPre=-/usr/bin/modprobe vboxvideo -ExecStartPre=-/usr/bin/modprobe vboxsf -ExecStart=/usr/bin/VBoxService -f - -[Install] -WantedBy=multi-user.target Copied: virtualbox/repos/community-x86_64/vboxservice.service (from rev 1210265, virtualbox/trunk/vboxservice.service) =================================================================== --- vboxservice.service (rev 0) +++ vboxservice.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,13 @@ +[Unit] +Description=VirtualBox Guest Service +ConditionVirtualization=oracle +Wants=vboxdrmclient.path + +[Service] +ExecStartPre=-/usr/bin/modprobe vboxguest +ExecStartPre=-/usr/bin/modprobe vboxvideo +ExecStartPre=-/usr/bin/modprobe vboxsf +ExecStart=/usr/bin/VBoxService -f + +[Install] +WantedBy=multi-user.target Deleted: vboxweb.service =================================================================== --- vboxweb.service 2022-05-24 21:52:20 UTC (rev 1210265) +++ vboxweb.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,11 +0,0 @@ -[Unit] -Description=VirtualBox Web Service -After=network.target - -[Service] -Type=forking -PIDFile=/run/vboxweb.pid -ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background - -[Install] -WantedBy=multi-user.target Copied: virtualbox/repos/community-x86_64/vboxweb.service (from rev 1210265, virtualbox/trunk/vboxweb.service) =================================================================== --- vboxweb.service (rev 0) +++ vboxweb.service 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,11 @@ +[Unit] +Description=VirtualBox Web Service +After=network.target + +[Service] +Type=forking +PIDFile=/run/vboxweb.pid +ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background + +[Install] +WantedBy=multi-user.target Deleted: virtualbox-ext-vnc.install =================================================================== --- virtualbox-ext-vnc.install 2022-05-24 21:52:20 UTC (rev 1210265) +++ virtualbox-ext-vnc.install 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,27 +0,0 @@ -#!/bin/bash - -# arg 1: the new package version -post_install() { - EXTPACK="/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" - ACCEPT="$(bsdtar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt | sha256sum | head --bytes=64)" - VBoxManage extpack install "${EXTPACK}" --accept-license="${ACCEPT}" >/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -# arg 1: the old package version -pre_remove() { - VBoxManage extpack uninstall 'VNC' >/dev/null -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install (from rev 1210265, virtualbox/trunk/virtualbox-ext-vnc.install) =================================================================== --- virtualbox-ext-vnc.install (rev 0) +++ virtualbox-ext-vnc.install 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,27 @@ +#!/bin/bash + +# arg 1: the new package version +post_install() { + EXTPACK="/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" + ACCEPT="$(bsdtar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt | sha256sum | head --bytes=64)" + VBoxManage extpack install "${EXTPACK}" --accept-license="${ACCEPT}" >/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + VBoxManage extpack uninstall 'VNC' >/dev/null +} + +# vim:set ts=2 sw=2 ft=sh et: Deleted: virtualbox-guest-utils.sysusers =================================================================== --- virtualbox-guest-utils.sysusers 2022-05-24 21:52:20 UTC (rev 1210265) +++ virtualbox-guest-utils.sysusers 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1 +0,0 @@ -g vboxsf 109 - Copied: virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers (from rev 1210265, virtualbox/trunk/virtualbox-guest-utils.sysusers) =================================================================== --- virtualbox-guest-utils.sysusers (rev 0) +++ virtualbox-guest-utils.sysusers 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1 @@ +g vboxsf 109 - Deleted: virtualbox-host-dkms.conf =================================================================== --- virtualbox-host-dkms.conf 2022-05-24 21:52:20 UTC (rev 1210265) +++ virtualbox-host-dkms.conf 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,31 +0,0 @@ -## @file -# Linux DKMS config script for the VirtualBox guest kernel modules -# - -# -# Copyright (C) 2006-2015 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# - -PACKAGE_NAME="vboxhost" -PACKAGE_VERSION=@VERSION@_OSE -AUTOINSTALL=yes - -BUILT_MODULE_NAME[0]="vboxdrv" -BUILT_MODULE_LOCATION[0]="vboxdrv" -DEST_MODULE_LOCATION[0]="/kernel/misc" - -BUILT_MODULE_NAME[1]="vboxnetflt" -BUILT_MODULE_LOCATION[1]="vboxnetflt" -DEST_MODULE_LOCATION[1]="/kernel/misc" - -BUILT_MODULE_NAME[2]="vboxnetadp" -BUILT_MODULE_LOCATION[2]="vboxnetadp" -DEST_MODULE_LOCATION[2]="/kernel/misc" Copied: virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf (from rev 1210265, virtualbox/trunk/virtualbox-host-dkms.conf) =================================================================== --- virtualbox-host-dkms.conf (rev 0) +++ virtualbox-host-dkms.conf 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,31 @@ +## @file +# Linux DKMS config script for the VirtualBox guest kernel modules +# + +# +# Copyright (C) 2006-2015 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +PACKAGE_NAME="vboxhost" +PACKAGE_VERSION=@VERSION@_OSE +AUTOINSTALL=yes + +BUILT_MODULE_NAME[0]="vboxdrv" +BUILT_MODULE_LOCATION[0]="vboxdrv" +DEST_MODULE_LOCATION[0]="/kernel/misc" + +BUILT_MODULE_NAME[1]="vboxnetflt" +BUILT_MODULE_LOCATION[1]="vboxnetflt" +DEST_MODULE_LOCATION[1]="/kernel/misc" + +BUILT_MODULE_NAME[2]="vboxnetadp" +BUILT_MODULE_LOCATION[2]="vboxnetadp" +DEST_MODULE_LOCATION[2]="/kernel/misc" Deleted: virtualbox-host-dkms.install =================================================================== --- virtualbox-host-dkms.install 2022-05-24 21:52:20 UTC (rev 1210265) +++ virtualbox-host-dkms.install 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1,12 +0,0 @@ -#!/bin/bash - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if (( $(vercmp $2 5.0.16-3) < 0 )); then - echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.' - echo '==> Read modules-load.d man page to disable them.' - fi -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: virtualbox/repos/community-x86_64/virtualbox-host-dkms.install (from rev 1210265, virtualbox/trunk/virtualbox-host-dkms.install) =================================================================== --- virtualbox-host-dkms.install (rev 0) +++ virtualbox-host-dkms.install 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1,12 @@ +#!/bin/bash + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( $(vercmp $2 5.0.16-3) < 0 )); then + echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.' + echo '==> Read modules-load.d man page to disable them.' + fi +} + +# vim:set ts=2 sw=2 ft=sh et: Deleted: virtualbox.sysusers =================================================================== --- virtualbox.sysusers 2022-05-24 21:52:20 UTC (rev 1210265) +++ virtualbox.sysusers 2022-05-24 21:52:29 UTC (rev 1210266) @@ -1 +0,0 @@ -g vboxusers 108 - Copied: virtualbox/repos/community-x86_64/virtualbox.sysusers (from rev 1210265, virtualbox/trunk/virtualbox.sysusers) =================================================================== --- virtualbox.sysusers (rev 0) +++ virtualbox.sysusers 2022-05-24 21:52:29 UTC (rev 1210266) @@ -0,0 +1 @@ +g vboxusers 108 -