[rpms/virtualbox-guest-additions] alext-upd-to-7.2.12: Update to 7.0.2

[rpms/virtualbox-guest-additions] alext-upd-to-7.2.12: Update to 7.0.2

[@ 2026-07-12 20:58 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/virtualbox-guest-additions
Branch : alext-upd-to-7.2.12
Commit : 213620b48a0bd4a8b73925383ea2cb35a78037aa
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2022-11-05T23:00:28+00:00
Stats  : +52/-46 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/virtualbox-guest-additions/c/213620b48a0bd4a8b73925383ea2cb35a78037aa?branch=alext-upd-to-7.2.12

Log:
Update to 7.0.2

---
diff --git a/.gitignore b/.gitignore
index ebb0ab4..b4da7a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /VirtualBox-6.1.36.tar.bz2
 /VirtualBox-6.1.38.tar.bz2
 /VirtualBox-6.1.40.tar.bz2
+/VirtualBox-7.0.2.tar.bz2

diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch
deleted file mode 100644
index 308a8ee..0000000
--- a/VirtualBox-5.2.10-xclient.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2020-06-06 06:20:12.079227656 +0100
-+++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient	2020-06-06 06:26:55.886940895 +0100
-@@ -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

diff --git a/VirtualBox-7.0.2-xclient-cleanups.patch b/VirtualBox-7.0.2-xclient-cleanups.patch
new file mode 100644
index 0000000..f16ac52
--- /dev/null
+++ b/VirtualBox-7.0.2-xclient-cleanups.patch
@@ -0,0 +1,33 @@
+# Do not show an error dialog when not running under vbox
+# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as
+# a systemd service, this works with both Wayland and Xorg based sessions
+
+---
+ src/VBox/Additions/x11/Installer/98vboxadd-xclient |   13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2022-10-19 21:20:45.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2022-10-22 12:05:28.770187860 +0300
+@@ -31,18 +31,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-session # In case VMSVGA emulation is enabled
+ fi

diff --git a/sources b/sources
index e899011..e2f317c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.1.40.tar.bz2) = 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
+SHA512 (VirtualBox-7.0.2.tar.bz2) = c79d6365f83e1fde356a7f4a6ccd23bc7306d1b5b4be669634c575f08ba53338caca684758c9409ecef2b05ab6f9ad37dfa6075ad6afbc5d7909d46ee6794927

diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index ed60321..170548e 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,7 +1,5 @@
-%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
-
 Name:       virtualbox-guest-additions
-Version:    6.1.40
+Version:    7.0.2
 Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
@@ -12,31 +10,22 @@ Source1:    vboxservice.service
 Source3:    VirtualBox-60-vboxguest.rules
 Source4:    vboxclient.service
 
-# Mainline vboxsf uses an option string rather then a custom binary data struct
-#Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
-# Do not show an error dialog when not running under vbox
-# Do not start VBoxClient --vmsvga-x11, we run VBoxClient --vmsvga as
-# a systemd service, this works with both Wayland and Xorg based sessions
-Patch3:     VirtualBox-5.2.10-xclient.patch
+Patch60:    VirtualBox-7.0.2-xclient-cleanups.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  kBuild >= 0.1.9998.r3093
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-libs-devel
 # for xsltproc
 BuildRequires:  libxslt
 BuildRequires:  makeself
 BuildRequires:  yasm
-BuildRequires:  boost-devel
-BuildRequires:  liblzf-devel
-BuildRequires:  libXcomposite-devel
-BuildRequires:  libXdamage-devel
 BuildRequires:  libXmu-devel
+BuildRequires:  libX11-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  libXt-devel
-BuildRequires:  mesa-libEGL-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  zlib-devel
@@ -77,13 +66,16 @@ rm -r kBuild/
 rm -r tools/
 # Remove bundle X11 sources and some lib sources, before patching.
 rm -r src/VBox/Additions/x11/x11include/
-rm -r src/VBox/Additions/x11/x11stubs/
-rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
+rm -r src/VBox/Additions/3D/mesa/mesa-21.3.8/
 rm -r src/libs/liblzf-3.*/
 rm -r src/libs/libpng-1.6.*/
 rm -r src/libs/libxml2-2.9.*/
-rm -r src/libs/openssl-1.*/
+rm -r src/libs/openssl-3.*/
 rm -r src/libs/zlib-1.2.*/
+rm -r src/libs/curl-7.*/
+rm -r src/libs/libvorbis-1.3.*/
+rm -r src/libs/libogg-1.3.*/
+rm -r src/libs/libtpms-0.9.0/
 
 
 %build
@@ -97,11 +89,10 @@ umask 0022
 # the installation paths, but install the tree with the default
 # layout under 'obj' and shuffle files around in %%install.
 kmk %{_smp_mflags}                                             \
+    VBOX_ONLY_ADDITIONS=1                                      \
     KBUILD_VERBOSE=2                                           \
     PATH_OUT="$PWD/obj"                                        \
     TOOL_YASM_AS=yasm                                          \
-    VBOX_WITH_TESTCASES=                                       \
-    VBOX_WITH_VALIDATIONKIT=                                   \
     VBOX_USE_SYSTEM_XORG_HEADERS=1                             \
     VBOX_USE_SYSTEM_GL_HEADERS=1                               \
     VBOX_NO_LEGACY_XORG_X11=1                                  \
@@ -122,6 +113,7 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libdir}/security
 
+# Guest-additions tools
 install -m 0755 -t %{buildroot}%{_sbindir}   \
     obj/bin/additions/VBoxService
 install -m 0755 -t %{buildroot}%{_bindir}    \
@@ -129,6 +121,7 @@ install -m 0755 -t %{buildroot}%{_bindir}    \
     obj/bin/additions/VBoxClient             \
     obj/bin/additions/VBoxControl
 
+# Guest libraries
 install -m 0755 -t %{buildroot}%{_libdir}/security \
     obj/bin/additions/pam_vbox.so
 
@@ -183,6 +176,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Sat Nov 05 2022 Sérgio Basto <sergio@serjux.com> - 7.0.2-1
+- Update to 7.0.2
+
 * Mon Oct 31 2022 Sérgio Basto <sergio@serjux.com> - 6.1.40-1
 - Update virtualbox-guest-additions to 6.1.40