horok-backports/virtualbox
1
0
Fork 0
Code Activity

Merging debian version 7.1.8-dfsg-1.

Browse source 
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
Daniel Baumann 2025-06-24 20:42:04 +02:00
parent 2b3ba1f3e4
commit d121a0defb
Signed by: daniel.baumann
GPG key ID: BCC918A2ABD66424
20 changed files with 99 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

26
debian/changelog vendored
View file

@ -1,3 +1,27 @@
virtualbox (7.1.8-dfsg-1) unstable; urgency=medium
[ Gianfranco Costamagna ]
* New upstream version 7.1.0-dfsg
* Refresh patches
* Add libfuse2 runtime dependency (Closes: #1082889), thanks Marco Moock for the report
* Bump copyright years
* Bump copyright years for Debian packaging
* Bump std-version to 4.7.2
* Also try to build arm64 and armhf
* Add a source lintian override for dita file licensing not used in build
[ Tobias Frost ]
* Fix broken watchfile (Closes: #1094801)
[ Mateusz Łukasik ]
* New upstream version 7.1.8-dfsg
* Disable build docs for now to fix FTBFS.
* Add patch for fix FTBFS with python-3.13.
* Add python3-setuptools to B-D.
* Add conflict on virtualbox-7.1
-- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 16 May 2025 17:55:04 +0200
virtualbox (7.0.26-dfsg-1~progress8.99u1) horok-backports; urgency=medium
* Initial upload to horok-backports.
@ -38,7 +62,7 @@ virtualbox (7.0.20-dfsg-1.2) unstable; urgency=medium
[ Tobias Frost ]
* Non maintainer upload, importing doko's patch from Ubuntu.
* Add NEWS entry for the kernel 6.12 issue (See: #1082157)
[ Matthias Klose ]
* Check for Python 3.13. (Closes: #1092081)

12
debian/control vendored
View file

@ -39,9 +39,10 @@ Build-Depends: bzip2,
libpixman-1-dev,
libpng-dev,
libpulse-dev,
libqt5x11extras5-dev,
libqt5opengl5-dev,
qttools5-dev,
# libqt5x11extras5-dev,
libqt6opengl6-dev,
qt6-scxml-dev,
qt6-tools-dev,
libsdl1.2-dev,
libsdl2-dev,
libssl-dev,
@ -81,7 +82,7 @@ Build-Depends: bzip2,
xsltproc,
yasm,
zlib1g-dev
Standards-Version: 4.7.0
Standards-Version: 4.7.2
Rules-Requires-Root: no
Homepage: https://www.virtualbox.org
Vcs-Browser: https://git.progress-linux.org/horok-backports/virtualbox
@ -130,6 +131,7 @@ Conflicts: virtualbox-2.0,
virtualbox-6.0,
virtualbox-6.1,
virtualbox-7.0,
virtualbox-7.1
Description: x86 virtualization solution - base binaries
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@ -182,7 +184,7 @@ Package: virtualbox-guest-x11
Section: contrib/x11
Replaces: virtualbox-guest-x11-hwe (<< 7.0.16-dfsg-5)
Breaks: virtualbox-guest-x11-hwe (<< 7.0.16-dfsg-5)
Architecture: amd64 i386
Architecture: amd64 arm64 armhf i386
Depends: libnotify-bin,
x11-xserver-utils,
virtualbox-guest-utils (= ${binary:Version}),

4
debian/copyright vendored
View file

@ -12,7 +12,7 @@ Upstream Author: Oracle Corporation
Copyright:
Copyright (C) 2004-2023 Oracle Corporation
Copyright (C) 2004-2024 Oracle Corporation
VirtualBox contains portions of QEMU which is governed by the licenses in and and
Copyright (C) 2003-2005 Fabrice Bellard; Copyright (C) 2004-2005 Vassili Karpov (malc);
@ -771,7 +771,7 @@ ______________
COPYING file last revised: July 22, 2022
The Debian packaging is copyright 2007-2024,
The Debian packaging is copyright 2007-2025,
Patrick Winnertz <patrick.winnertz@skolelinux.org>,
Daniel Baumann <daniel@debian.org>,
Philipp Hug <debian@hug.cx>,

2
debian/patches/01-build-arch.patch vendored
View file

@ -3,7 +3,7 @@ Author: Michael Meskes <meskes@debian.org>
--- a/configure
+++ b/configure
@@ -381,7 +381,7 @@ test_execute_path()
@@ -385,7 +385,7 @@ test_execute_path()
check_environment()
{
test_header environment

4
debian/patches/04-vboxdrv-references.patch vendored
View file

@ -54,7 +54,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/main.cpp
@@ -98,8 +98,9 @@
@@ -109,8 +109,9 @@
QString g_QStrHintLinuxNoDriver = QApplication::tr(
"The VirtualBox Linux kernel driver is either not loaded or not set "
@ -66,7 +66,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/main.cpp
"as root.<br/><br/>"
"If your system has EFI Secure Boot enabled you may also need to sign "
"the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
@@ -118,7 +119,7 @@
@@ -129,7 +130,7 @@
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"

33
debian/patches/06-xsession.patch vendored
View file

@ -5,18 +5,23 @@ Index: virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient
===================================================================
--- virtualbox.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient
@@ -40,9 +40,9 @@
# 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.
- /usr/bin/VBoxClient --clipboard
- /usr/bin/VBoxClient --checkhostversion
- /usr/bin/VBoxClient --seamless
- /usr/bin/VBoxClient --draganddrop
- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled
+ /usr/bin/VBoxClient --clipboard || true
+ /usr/bin/VBoxClient --checkhostversion || true
+ /usr/bin/VBoxClient --seamless || true
+ /usr/bin/VBoxClient --draganddrop || true
+ /usr/bin/VBoxClient --vmsvga-session || true # In case VMSVGA emulation is enabled
@@ -44,13 +44,13 @@ elif test -z "${SSH_CONNECTION}"; then
# Check wheather X11 or Wayland version of VBoxClient should be started.
vbox_wl_check=$(/usr/bin/vboxwl --check 2> /dev/null)
if test "$vbox_wl_check" = "WL"; then
- /usr/bin/VBoxClient --wayland
+ /usr/bin/VBoxClient --wayland || true
else
- /usr/bin/VBoxClient --clipboard
- /usr/bin/VBoxClient --seamless
- /usr/bin/VBoxClient --draganddrop
+ /usr/bin/VBoxClient --clipboard || true
+ /usr/bin/VBoxClient --seamless || true
+ /usr/bin/VBoxClient --draganddrop || true
fi
- /usr/bin/VBoxClient --checkhostversion
- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled
+ /usr/bin/VBoxClient --checkhostversion || true
+ /usr/bin/VBoxClient --vmsvga-session || true # In case VMSVGA emulation is enabled
fi

4
debian/patches/12-make-module.patch vendored
View file

@ -6,9 +6,9 @@ Author: Michael Meskes <meskes@debian.org>, Gianfranco Costamagna <locutusofborg
@@ -60,7 +60,7 @@
#
# VBOX_KBUILD_TARGET_ARCH = amd64|x86
# VBOX_KBUILD_TARGET_ARCH = amd64|x86|arm64|arm32
-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
+ifeq ($(filter-out x86_64 amd64 AMD64,$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)),)
VBOX_KBUILD_TARGET_ARCH_DEFAULT := amd64
else
VBOX_KBUILD_TARGET_ARCH_DEFAULT := x86
ifeq ($(filter-out aarch64,$(shell uname -m)),)

54
debian/patches/16-no-update.patch vendored
View file

@ -1,34 +1,30 @@
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
Index: virtualbox/doc/manual/en_US/user_Introduction.xml
Index: virtualbox/doc/manual/en_US/dita/topics/preferences.dita
===================================================================
--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
+++ virtualbox/doc/manual/en_US/user_Introduction.xml
@@ -6090,14 +6090,14 @@
<xref linkend="specialcharacters"/>.
</para>
</listitem>
-
+ <!--
<listitem>
<para>
<emphasis role="bold">Update.</emphasis> Enables you to
--- virtualbox.orig/doc/manual/en_US/dita/topics/preferences.dita
+++ virtualbox/doc/manual/en_US/dita/topics/preferences.dita
@@ -31,11 +31,11 @@
<li>
<p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
</li>
- <li>
+ <!--<li>
<p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
</para>
</listitem>
-
+ -->
<listitem>
<para>
<emphasis role="bold">Language.</emphasis> Enables you to
</p>
- </li>
+ </li>-->
<li>
<p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
<ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2420,7 +2420,7 @@
@@ -2412,7 +2412,7 @@
bool UIExtraDataManager::applicationUpdateEnabled()
{
/* 'True' unless 'restriction' feature allowed: */
@ -37,11 +33,11 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager
}
QString UIExtraDataManager::applicationUpdateData()
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -48,10 +48,10 @@
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@ -56,7 +52,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
@@ -100,7 +100,7 @@
@@ -98,7 +98,7 @@
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@ -65,7 +61,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
#endif
/* Language page: */
@@ -111,7 +111,7 @@
@@ -109,7 +109,7 @@
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@ -74,7 +70,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
#endif
#ifdef VBOX_WS_WIN
@@ -227,14 +227,14 @@
@@ -219,14 +219,14 @@
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@ -91,7 +87,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
@@ -256,14 +256,14 @@
@@ -248,14 +248,14 @@
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */

2
debian/patches/23-remove-invalid-chars-check.patch vendored
View file

@ -4,7 +4,7 @@ Author: Felix Geyer <fgeyer@debian.org>
--- a/configure
+++ b/configure
@@ -195,11 +195,6 @@ BUILD_TYPE="release"
@@ -199,11 +199,6 @@ BUILD_TYPE="release"
# the restricting tool is ar (mri mode).
INVALID_CHARS="[^A-Za-z0-9/\\$:._-]"

8
debian/patches/27-hide-host-cache-warning.patch vendored
View file

@ -2,11 +2,11 @@ Description: Silently enable the host I/O cache when the image is on an ext4/XFS
No need to warn users about it.
Author: Felix Geyer <fgeyer@debian.org>
Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
Index: virtualbox/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp
===================================================================
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -4651,34 +4651,12 @@
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp
+++ virtualbox/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp
@@ -1084,34 +1084,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{

2
debian/patches/28-no-selinux-fedora.patch vendored
View file

@ -5,7 +5,7 @@ Index: virtualbox/src/VBox/Additions/linux/Makefile.kmk
===================================================================
--- virtualbox.orig/src/VBox/Additions/linux/Makefile.kmk
+++ virtualbox/src/VBox/Additions/linux/Makefile.kmk
@@ -301,9 +301,7 @@
@@ -315,9 +315,7 @@
lnx_add_inst-noexec_SOURCES = \
$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \

16
debian/patches/29-fix-ftbfs-as-needed.patch vendored
View file

@ -1,16 +0,0 @@
Description: Fix FTBFS with ld --as-needed.
Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch?revision=1.2&view=markup
Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:46:59.611743003 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:46:59.611743003 +0200
@@ -6658,7 +6658,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
-TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl
+TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt
else ifeq ($(KBUILD_HOST),os2)
TEMPLATE_VBoxBldProg_TOOL = GXX3OMF
TEMPLATE_VBoxBldProg_LIBS = socket iconv

2
debian/patches/36-fix-vnc-version-string.patch vendored
View file

@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk
+++ virtualbox/Config.kmk
@@ -3861,6 +3861,7 @@
@@ -4040,6 +4040,7 @@
-e 's+@VBOX_VERSION_MINOR@+$(VBOX_VERSION_MINOR)+g' \
-e 's+@VBOX_VERSION_BUILD@+$(VBOX_VERSION_BUILD)+g' \
-e 's+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g' \

2
debian/patches/python3.13.diff vendored
View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -2168,7 +2168,7 @@ extern "C" int main(void)
@@ -2182,7 +2182,7 @@ extern "C" int main(void)
}
EOF
found=

1
debian/patches/series vendored
View file

@ -9,7 +9,6 @@
23-remove-invalid-chars-check.patch
27-hide-host-cache-warning.patch
28-no-selinux-fedora.patch
#29-fix-ftbfs-as-needed.patch
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch

12
debian/rules vendored
View file

@ -52,7 +52,8 @@ endif
--disable-kmods \
--enable-webservice \
--enable-vde \
--enable-vnc
--enable-vnc \
--disable-docs
override_dh_python3:
dh_python3 --no-ext-rename
@ -71,7 +72,8 @@ override_dh_auto_build:
VBOX_WITH_REGISTRATION_REQUEST= \
VBOX_WITH_UPDATE_REQUEST= \
KBUILD_VERBOSE=2 \
VBOX_WITH_EXTPACK_VBOXDTRACE=
VBOX_WITH_EXTPACK_VBOXDTRACE= \
VBOX_DITA_OT_PATH=/usr/share/dita-ot VBOX_DITA_CLASSPATH=/usr/share/dita-ot/lib/ant-launcher.jar
xsltproc --nonet --stringparam section.autolabel 1 \
-o debian/README.Debian.html \
@ -88,7 +90,7 @@ override_dh_auto_install:
ifneq (,$(filter $(sname), $(shell dh_listpackages)))
export VBOX_INSTALL_PATH=$(INSTALL_PATH) && \
cd out/bin/sdk/installer && \
cd out/bin/sdk/installer/python && \
python3 ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname)
endif
@ -182,10 +184,6 @@ endif
endif
override_dh_shlibdeps:
ifneq (,$(filter $(sname), $(shell dh_listpackages)))
dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \
-dRecommends debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -dDepends
endif
dh_shlibdeps --remaining-packages
override_dh_compress:

2
debian/source/lintian-overrides vendored Normal file
View file

@ -0,0 +1,2 @@
virtualbox source: license-problem-non-free-RFC doc/manual/en_US/dita/topics/licensing/vbox-base/licensing-license-vbox-base-glibc-2.17-326.0.9.el7_9.dita
virtualbox source: license-problem-non-free-RFC doc/manual/en_US/dita/topics/licensing/vbox-ext/licensing-license-vbox-ext-glibc-2.17-326.0.9.el7_9.dita

2
debian/virtualbox-source.files/control.modules.in vendored
View file

@ -8,7 +8,7 @@ XSBC-Original-Uploaders: Ritesh Raj Sarraf <rrs@debian.org>,
Gianfranco Costamagna <locutusofborg@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: debhelper-compat (= 13), kbuild
Standards-Version: 4.7.0
Standards-Version: 4.7.2
Homepage: https://www.virtualbox.org
Vcs-Browser: https://git.progress-linux.org/horok-backports/virtualbox
Vcs-Git: https://git.progress-linux.org/horok-backports/virtualbox

1
debian/virtualbox.docs vendored
View file

@ -1,2 +1 @@
debian/README.Debian.html
out/bin/UserManual.*

1
debian/virtualbox.install vendored
View file

@ -17,7 +17,6 @@ out/bin/VBoxNet* /usr/lib/virtualbox
out/bin/VBoxSDL /usr/lib/virtualbox
out/bin/VBoxSVC /usr/lib/virtualbox
out/bin/VBoxSysInfo.sh /usr/lib/virtualbox
out/bin/VBoxTestOGL /usr/lib/virtualbox
out/bin/VBoxVMM* /usr/lib/virtualbox
out/bin/VBoxVolInfo /usr/lib/virtualbox
out/bin/VBoxXPCOM* /usr/lib/virtualbox