From 156f51c0ca2097e798f69530a459b475dcaec114 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Jan 22 2022 20:03:13 +0000 Subject: Change to exploded SRPM format for CBS --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bf9b628..0000000 --- a/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -/VirtualBox-5.2.6.tar.bz2 -/VirtualBox-5.2.8.tar.bz2 -/VirtualBox-5.2.10.tar.bz2 -/VirtualBox-5.2.12.tar.bz2 -/VirtualBox-5.2.14.tar.bz2 -/VirtualBox-5.2.16.tar.bz2 -/VirtualBox-5.2.18.tar.bz2 -/VirtualBox-5.2.20.tar.bz2 -/VirtualBox-5.2.22.tar.bz2 -/VirtualBox-6.0.0.tar.bz2 -/VirtualBox-6.0.2.tar.bz2 -/VirtualBox-6.0.4.tar.bz2 -/VirtualBox-6.0.6.tar.bz2 -/VirtualBox-6.0.8.tar.bz2 -/VirtualBox-6.0.10.tar.bz2 -/VirtualBox-6.0.12.tar.bz2 -/VirtualBox-6.0.14.tar.bz2 -/VirtualBox-6.1.0.tar.bz2 -/VirtualBox-6.1.2.tar.bz2 -/VirtualBox-6.1.4.tar.bz2 -/VirtualBox-6.1.6.tar.bz2 -/VirtualBox-6.1.8.tar.bz2 -/VirtualBox-6.1.10.tar.bz2 -/VirtualBox-6.1.12.tar.bz2 -/VirtualBox-6.1.14a.tar.bz2 -/VirtualBox-6.1.16.tar.bz2 -/VirtualBox-6.1.18.tar.bz2 -/VirtualBox-6.1.20.tar.bz2 -/VirtualBox-6.1.22.tar.bz2 -/VirtualBox-6.1.26.tar.bz2 -/VirtualBox-6.1.28.tar.bz2 -/VirtualBox-6.1.30.tar.bz2 -/VirtualBox-6.1.32.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 338cbeb..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# virtualbox-guest-additions - -The virtualbox-guest-additions package diff --git a/SOURCES/VirtualBox-5.2.10-xclient.patch b/SOURCES/VirtualBox-5.2.10-xclient.patch new file mode 100644 index 0000000..308a8ee --- /dev/null +++ b/SOURCES/VirtualBox-5.2.10-xclient.patch @@ -0,0 +1,24 @@ +--- ./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/SOURCES/VirtualBox-60-vboxguest.rules b/SOURCES/VirtualBox-60-vboxguest.rules new file mode 100644 index 0000000..d804611 --- /dev/null +++ b/SOURCES/VirtualBox-60-vboxguest.rules @@ -0,0 +1,4 @@ +KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxadd", MODE="0660" +KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0666" + +ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service" diff --git a/SOURCES/vboxclient.service b/SOURCES/vboxclient.service new file mode 100644 index 0000000..3fabb54 --- /dev/null +++ b/SOURCES/vboxclient.service @@ -0,0 +1,8 @@ +[Unit] +Description=VirtualBox guest VMSVGA resize client +ConditionVirtualization=|oracle + +[Service] +Type=simple +ExecStart=/usr/bin/VBoxDRMClient +Restart=on-failure diff --git a/SOURCES/vboxservice.service b/SOURCES/vboxservice.service new file mode 100644 index 0000000..dcc3200 --- /dev/null +++ b/SOURCES/vboxservice.service @@ -0,0 +1,12 @@ +[Unit] +Description=VirtualBox guest services +ConditionVirtualization=|oracle + +[Service] +Type=simple +ExecStartPre=-/usr/sbin/modprobe vboxguest +ExecStart=/usr/sbin/VBoxService -f +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/SPECS/virtualbox-guest-additions.spec b/SPECS/virtualbox-guest-additions.spec new file mode 100644 index 0000000..5799aad --- /dev/null +++ b/SPECS/virtualbox-guest-additions.spec @@ -0,0 +1,390 @@ +%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions + +Name: virtualbox-guest-additions +Version: 6.1.32 +Release: 2%{?dist} +Summary: VirtualBox Guest Additions +License: GPLv2 or (GPLv2 and CDDL) +URL: https://www.virtualbox.org/wiki/VirtualBox + +Source0: https://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}.tar.bz2 +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 + +BuildRequires: gcc-c++ +BuildRequires: kBuild >= 0.1.9998.r3093 +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: desktop-file-utils +# for xsltproc +BuildRequires: libxslt +BuildRequires: makeself +BuildRequires: yasm +BuildRequires: boost-devel +BuildRequires: liblzf-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXdamage-devel +BuildRequires: libXmu-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 +# For the OpenGL passthru libs, these are statically linked against libstdc++ +# like mesa itself is to avoid trouble with game-runtimes providing their +# own older libstdc++ (e.g. steam does this) +BuildRequires: libstdc++-static +%{?systemd_requires} +BuildRequires: systemd + +# Obsoletes/provides for upgrade path from the rpmfusion guest-additions pkg +Obsoletes: VirtualBox-guest-additions < %{version}-%{release} +Provides: VirtualBox-guest-additions = %{version}-%{release} +# VirtualBox guests are always x86, no need to build for other archs +ExclusiveArch: i686 x86_64 + +# kernel 5.6.14 have the fixes for vboxguest on VBox 6.1.x +Requires: kernel >= 5.6.14 + +# VBoxOGL was removed in 6.1.0 +# we need obsolete it to fix upgrade path +Obsoletes: %{name}-ogl < 6.0.14-2 + +%description +VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for +enterprise as well as home use. This package contains the VirtualBox +Guest Additions which support better integration of VirtualBox guests +with the Host, including file sharing, clipboard sharing and Seamless mode. + + +%prep +%autosetup -p1 -n VirtualBox-%{version} +# Remove prebuilt binaries +find -name '*.py[co]' -delete +rm -r src/VBox/Additions/WINNT +rm -r src/VBox/Additions/os2 +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/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/zlib-1.2.*/ + + +%build +./configure --only-additions --disable-kmods +. ./env.sh +umask 0022 + +# VirtualBox build system installs and builds in the same step, +# not always looking for the installed files in places they have +# really been installed to. Therefore we do not override any of +# the installation paths, but install the tree with the default +# layout under 'obj' and shuffle files around in %%install. +kmk %{_smp_mflags} \ + 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 \ + SDK_VBOX_LIBPNG_INCS="" \ + SDK_VBOX_LIBXML2_INCS="" \ + SDK_VBOX_LZF_LIBS="lzf" \ + SDK_VBOX_LZF_INCS="/usr/include/liblzf" \ + SDK_VBOX_OPENSSL_INCS="" \ + SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ + SDK_VBOX_ZLIB_INCS="" \ + VBOX_BUILD_PUBLISHER=_Fedora + + +%install +# The directory layout created below attempts to mimic the one of +# the commercially supported version to minimize confusion +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_libdir}/security + +install -m 0755 -t %{buildroot}%{_sbindir} \ + obj/bin/additions/VBoxService +install -m 0755 -t %{buildroot}%{_bindir} \ + obj/bin/additions/VBoxDRMClient \ + obj/bin/additions/VBoxClient \ + obj/bin/additions/VBoxControl + +install -m 0755 -t %{buildroot}%{_libdir}/security \ + obj/bin/additions/pam_vbox.so + +install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh +ln -s ../..%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh \ + %{buildroot}%{_bindir}/VBoxClient-all +desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \ + --remove-key=Encoding src/VBox/Additions/x11/Installer/vboxclient.desktop +desktop-file-validate \ + %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop + +install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/vboxservice.service +install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules +install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxclient.service + + +%pre +# Add a group "vboxsf" for Shared Folders access +# All users which want to access the auto-mounted Shared Folders have to +# be added to this group. +getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1 +getent passwd vboxadd >/dev/null || \ + useradd -r -g 1 -d /var/run/vboxadd -s /sbin/nologin vboxadd 2>&1 + +%post +%systemd_post vboxclient.service +%systemd_post vboxservice.service + +%preun +%systemd_preun vboxclient.service +%systemd_preun vboxservice.service + +%postun +%systemd_postun_with_restart vboxclient.service +%systemd_postun_with_restart vboxservice.service + + +%files +%license COPYING* +%{_bindir}/VBoxClient +%{_bindir}/VBoxControl +%{_bindir}/VBoxClient-all +%{_bindir}/VBoxDRMClient +%{_sbindir}/VBoxService +%{_libdir}/security/pam_vbox.so +%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh +%{_sysconfdir}/xdg/autostart/vboxclient.desktop +%{_unitdir}/vboxclient.service +%{_unitdir}/vboxservice.service +%{_udevrulesdir}/60-vboxguest.rules + + +%changelog +* Sat Jan 22 2022 Fedora Release Engineering - 6.1.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 19 2022 Sérgio Basto - 6.1.32-1 +- Update Virtualbox Guest Additions to 6.1.32 (#2042010) + +* Wed Nov 24 2021 Sérgio Basto - 6.1.30-1 +- Update Virtualbox Guest Additions to 6.1.30 (#2025728) + +* Fri Oct 22 2021 Sérgio Basto - 6.1.28-1 +- Update Virtualbox Guest Additions to 6.1.28 (#2015655) + +* Wed Aug 11 2021 Sérgio Basto - 6.1.26-1 +- Update Virtualbox Guest Additions to 6.1.26 (#1984089) + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Sérgio Basto - 6.1.22-1 +- Update Virtualbox Guest Additions to 6.1.22 (#1955281) + +* Fri Apr 23 2021 Sérgio Basto - 6.1.20-1 +- Update Virtualbox Guest Additions to 6.1.20 (#1951631) + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.1.18-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 6.1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Fedora Release Monitoring - 6.1.18-1 +- Update to 6.1.18 (#1918032) + +* Fri Oct 23 2020 Sérgio Basto - 6.1.16-1 +- Update Virtualbox Guest Additions to 6.1.16a + +* Sun Sep 13 2020 Sérgio Basto - 6.1.14-1 +- Update Virtualbox Guest Additions to 6.1.14a + +* Sun Aug 02 2020 Sérgio Basto - 6.1.12-1 +- Update Virtualbox Guest Additions to 6.1.12 + +* Wed Jul 29 2020 Fedora Release Engineering - 6.1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 08 2020 Hans de Goede - 6.1.10-2 +- Install the new VBoxDRMClient binary and make vboxclient.service + run that instead of VBoxClient, this fixes VM display resizing when + the guest is running a Wayland session + +* Sat Jun 06 2020 Sérgio Basto - 6.1.10-1 +- Update Virtualbox Guest Additions to 6.1.10 + +* Wed May 20 2020 Hans de Goede - 6.1.8-2 +- Add a vboxclient.service which runs VBoxClient --vwsvga when using the + VMSVGA virtual GPU, this fixes resizing in wayland sessions (rhbz 1789545) +- Drop VBoxClient --vwsvga-x11 from VBoxClient-all, it is not necessary + now that we run VBoxClient --vwsvga as service and it was breaking resize + support with the VBoxSVGA virtual GPU (rhbz 1789545) +- Drop ExecStartPre modprove vboxvideo vboxsf from vboxservice.service, + this is not necessary, they will be loaded automatically + +* Sat May 16 2020 Sérgio Basto - 6.1.8-1 +- Update Virtualbox Guest Additions to 6.1.8 + +* Thu Apr 16 2020 Sérgio Basto - 6.1.6-1 +- Update Virtualbox Guest Additions to 6.1.6 + +* Wed Mar 11 2020 Sérgio Basto - 6.1.4-4 +- koji test + +* Wed Mar 11 2020 Sérgio Basto - 6.1.4-3 +- Fix for clipboard +- Obsoletes virtualbox-guest-additions-ogl + +* Tue Mar 3 2020 Hans de Goede - 6.1.4-2 +- Fix VBoxClient --vmsvga-x11 crash (rhbz#1806778) + +* Sat Feb 22 2020 Sérgio Basto - 6.1.4-1 +- Update Virtualbox Guest Additions to 6.1.4 +- Remove hack "Conflicts VirtualBox-server > %%{version}". With kernel 5.5.6 + (more or less), vboxsf is included in Fedora kernel and + virtualbox-guest-additions don't need akmod-VirtualBox, anymore. + +* Fri Jan 31 2020 Fedora Release Engineering - 6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 19 2020 Sérgio Basto - 6.1.2-1 +- Update Virtualbox Guest Additions to 6.1.2 + +* Fri Dec 20 2019 Sérgio Basto - 6.1.0-1 +- Upgrade to 6.1.0 +- Seems that VBoxOGL was removed in 6.1.0 + +* Wed Nov 13 2019 Sérgio Basto - 6.0.14-2 +- Change BR from python2 to python3 + +* Thu Oct 17 2019 Sérgio Basto - 6.0.14-1 +- Update Virtualbox Guest Additions to 6.0.14 + +* Fri Sep 06 2019 Sérgio Basto - 6.0.12-1 +- Update Virtualbox Guest Additions to 6.0.12 + +* Sat Jul 27 2019 Fedora Release Engineering - 6.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 17 2019 Sérgio Basto - 6.0.10-1 +- Update Virtualbox Guest Additions to 6.0.10 + +* Fri May 24 2019 Sérgio Basto - 6.0.8-2 +- Just force same version and not same release + +* Sun May 19 2019 Sérgio Basto - 6.0.8-1 +- Update Virtualbox Guest Additions to 6.0.8 + +* Fri Apr 26 2019 Sérgio Basto - 6.0.6-1 +- Update Virtualbox Guest Additions to 6.0.6 + +* Wed Mar 20 2019 Hans de Goede - 6.0.4-2 +- Fix automounted shares not working on 6.0.x hosts + +* Thu Mar 07 2019 Sérgio Basto - 6.0.4-1 +- Update Virtualbox Guest Additions to 6.0.4 + +* Sun Feb 03 2019 Fedora Release Engineering - 6.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Hans de Goede - 6.0.2-1 +- Update Virtualbox Guest Additions to 6.0.2, security fix version + +* Mon Jan 14 2019 Björn Esser - 6.0.0-2 +- Rebuilt for libcrypt.so.2 (#1666033) +- Add a patch to fix build on Fedora 30 + +* Thu Dec 20 2018 Sérgio Basto - 6.0.0-1 +- VirtualBox 6.0.0 + +* Mon Nov 12 2018 Sérgio Basto - 5.2.22-1 +- Update Virtualbox Guest Additions to 5.2.22, security fix version + +* Sat Oct 20 2018 Sérgio Basto - 5.2.20-1 +- Update Virtualbox Guest Additions to 5.2.20, bugfix version + +* Thu Aug 30 2018 Sérgio Basto - 5.2.18-1 +- Update Virtualbox Guest Additions to 5.2.18 + +* Wed Aug 01 2018 Sérgio Basto - 5.2.16-2 +- Force instalation of same version VirtualBox-kmodsrc and + virtualBox-guest-additions + +* Sat Jul 21 2018 Sérgio Basto - 5.2.16-1 +- Update Virtualbox Guest Additions to 5.2.16 + +* Sat Jul 14 2018 Fedora Release Engineering - 5.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +- https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot + +* Mon Jul 02 2018 Sérgio Basto - 5.2.14-1 +- Update Virtualbox Guest Additions to 5.2.14 + +* Sat May 12 2018 Sérgio Basto - 5.2.12-1 +- Update to 5.2.12 + +* Sun Apr 22 2018 Sérgio Basto - 5.2.10-1 +- Update to 5.2.10 + +* Thu Mar 1 2018 Hans de Goede - 5.2.8-1 +- Update to 5.2.8 +- Use https for all URLs + +* Wed Feb 7 2018 Hans de Goede - 5.2.6-4 +- Do not use pkg-config for includes, as pkg-config prefixes an unwanted -I +- Fix /etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh to now show an error + notification when not running under vbox, as we will be part of the + Workstation livecd which may run anywhere + +* Mon Jan 29 2018 Hans de Goede - 5.2.6-3 +- Update to 5.2.6 +- Drop VirtualBox-4.3.0-no-bundles.patch, set make variables instead +- Adjust automount vboxservice for mainline vboxsf filesystem driver +- Drop mount.vboxsf, the mainline vboxsf filesystem driver works with the + regular mount binary +- Drop commented out Requires: kernel, this is bad idea (rhbz#1534595) +- Use pkgconfig to get include/libs instead of hardcoding (rhbz#1534595) +- Rename to lowercaps virtualbox-guest-additions, add Obsoletes / Provides + for upgradepath from rpmfusion (rhbz#1534595) +- Add Provides: VirtualBox-kmod-common for rpmfusion upgradepath (rhbz#1534595) +- Latest rpmfusion Release is 2, set our Release field to 3 + +* Sun Nov 26 2017 Hans de Goede - 5.2.2-1 +- Update to 5.2.2 + +* Thu Sep 21 2017 Hans de Goede - 5.2.0-0.1.svn68769 +- Switch to a 5.2 svn snapshot, as 5.2 has a new /dev/vboxguest ioctl API + which the mainline version of the vboxguest drivers implement + +* Mon Aug 28 2017 Hans de Goede - 5.1.26-3 +- Put the libGL.so.1 replacement libs and VBoxOGLRun scripts in an -ogl + subpackage, so that people can install both the i686 and x86_64 versions. +- Filter out libGL.so.1 provides + +* Mon Aug 14 2017 Hans de Goede - 5.1.26-2 +- Initial Fedora package based on the guest-addition parts of the + rpmfusion VirtualBox package 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-60-vboxguest.rules b/VirtualBox-60-vboxguest.rules deleted file mode 100644 index d804611..0000000 --- a/VirtualBox-60-vboxguest.rules +++ /dev/null @@ -1,4 +0,0 @@ -KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxadd", MODE="0660" -KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0666" - -ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service" diff --git a/sources b/sources deleted file mode 100644 index 285a29d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (VirtualBox-6.1.32.tar.bz2) = 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e diff --git a/update_vbox.sh b/update_vbox.sh deleted file mode 100755 index 1c1b9de..0000000 --- a/update_vbox.sh +++ /dev/null @@ -1,49 +0,0 @@ -VERSION=6.1.32 -BUG=2042010 -REL=1 -RAWHIDE=36 -BRANCHES="f35 f34" -if [ -z "$1" ] -then - stage=0 -else - stage=$1 -fi - -git checkout rawhide -git pull -if test $stage -le 0 -then -echo STAGE 0 -rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to ${VERSION} (#${BUG})" virtualbox-guest-additions.spec -spectool -g virtualbox-guest-additions.spec -# to not download sources again we do new-sources right now -echo Press enter scratch-build or n to skip ; read dummy; - if [[ "$dummy" != "n" ]]; then - # to test i686 builds - fedpkg scratch-build --srpm --nowait - fi -echo Press enter to build on corp -build or n to skip ; read dummy; - if [[ "$dummy" != "n" ]]; then - fedpkg srpm && copr-cli build sergiomb/vboxfor23 virtualbox-guest-additions-$VERSION-$REL.fc$RAWHIDE.src.rpm - fi -fi - -if test $stage -le 1 -then -echo STAGE 1 -echo Press enter to upload sources; read dummy; -fedpkg new-sources ./VirtualBox-${VERSION}.tar.bz2 -fedpkg ci -c && git show -echo Press enter to push and build on rawhide; read dummy; -fedpkg push && fedpkg build --nowait -fi - -if test $stage -le 2 -then -echo STAGE 2 -for BRANCH in $BRANCHES ; do -echo Press enter to build $BRANCH to continue; read dummy; -git checkout $BRANCH && git merge rawhide && git push && fedpkg build --nowait; git checkout rawhide -done -fi diff --git a/vboxclient.service b/vboxclient.service deleted file mode 100644 index 3fabb54..0000000 --- a/vboxclient.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=VirtualBox guest VMSVGA resize client -ConditionVirtualization=|oracle - -[Service] -Type=simple -ExecStart=/usr/bin/VBoxDRMClient -Restart=on-failure diff --git a/vboxservice.service b/vboxservice.service deleted file mode 100644 index dcc3200..0000000 --- a/vboxservice.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=VirtualBox guest services -ConditionVirtualization=|oracle - -[Service] -Type=simple -ExecStartPre=-/usr/sbin/modprobe vboxguest -ExecStart=/usr/sbin/VBoxService -f -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec deleted file mode 100644 index 5799aad..0000000 --- a/virtualbox-guest-additions.spec +++ /dev/null @@ -1,390 +0,0 @@ -%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions - -Name: virtualbox-guest-additions -Version: 6.1.32 -Release: 2%{?dist} -Summary: VirtualBox Guest Additions -License: GPLv2 or (GPLv2 and CDDL) -URL: https://www.virtualbox.org/wiki/VirtualBox - -Source0: https://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}.tar.bz2 -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 - -BuildRequires: gcc-c++ -BuildRequires: kBuild >= 0.1.9998.r3093 -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: desktop-file-utils -# for xsltproc -BuildRequires: libxslt -BuildRequires: makeself -BuildRequires: yasm -BuildRequires: boost-devel -BuildRequires: liblzf-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXdamage-devel -BuildRequires: libXmu-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 -# For the OpenGL passthru libs, these are statically linked against libstdc++ -# like mesa itself is to avoid trouble with game-runtimes providing their -# own older libstdc++ (e.g. steam does this) -BuildRequires: libstdc++-static -%{?systemd_requires} -BuildRequires: systemd - -# Obsoletes/provides for upgrade path from the rpmfusion guest-additions pkg -Obsoletes: VirtualBox-guest-additions < %{version}-%{release} -Provides: VirtualBox-guest-additions = %{version}-%{release} -# VirtualBox guests are always x86, no need to build for other archs -ExclusiveArch: i686 x86_64 - -# kernel 5.6.14 have the fixes for vboxguest on VBox 6.1.x -Requires: kernel >= 5.6.14 - -# VBoxOGL was removed in 6.1.0 -# we need obsolete it to fix upgrade path -Obsoletes: %{name}-ogl < 6.0.14-2 - -%description -VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for -enterprise as well as home use. This package contains the VirtualBox -Guest Additions which support better integration of VirtualBox guests -with the Host, including file sharing, clipboard sharing and Seamless mode. - - -%prep -%autosetup -p1 -n VirtualBox-%{version} -# Remove prebuilt binaries -find -name '*.py[co]' -delete -rm -r src/VBox/Additions/WINNT -rm -r src/VBox/Additions/os2 -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/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/zlib-1.2.*/ - - -%build -./configure --only-additions --disable-kmods -. ./env.sh -umask 0022 - -# VirtualBox build system installs and builds in the same step, -# not always looking for the installed files in places they have -# really been installed to. Therefore we do not override any of -# the installation paths, but install the tree with the default -# layout under 'obj' and shuffle files around in %%install. -kmk %{_smp_mflags} \ - 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 \ - SDK_VBOX_LIBPNG_INCS="" \ - SDK_VBOX_LIBXML2_INCS="" \ - SDK_VBOX_LZF_LIBS="lzf" \ - SDK_VBOX_LZF_INCS="/usr/include/liblzf" \ - SDK_VBOX_OPENSSL_INCS="" \ - SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ - SDK_VBOX_ZLIB_INCS="" \ - VBOX_BUILD_PUBLISHER=_Fedora - - -%install -# The directory layout created below attempts to mimic the one of -# the commercially supported version to minimize confusion -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_libdir}/security - -install -m 0755 -t %{buildroot}%{_sbindir} \ - obj/bin/additions/VBoxService -install -m 0755 -t %{buildroot}%{_bindir} \ - obj/bin/additions/VBoxDRMClient \ - obj/bin/additions/VBoxClient \ - obj/bin/additions/VBoxControl - -install -m 0755 -t %{buildroot}%{_libdir}/security \ - obj/bin/additions/pam_vbox.so - -install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh -ln -s ../..%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh \ - %{buildroot}%{_bindir}/VBoxClient-all -desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \ - --remove-key=Encoding src/VBox/Additions/x11/Installer/vboxclient.desktop -desktop-file-validate \ - %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop - -install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/vboxservice.service -install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules -install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxclient.service - - -%pre -# Add a group "vboxsf" for Shared Folders access -# All users which want to access the auto-mounted Shared Folders have to -# be added to this group. -getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1 -getent passwd vboxadd >/dev/null || \ - useradd -r -g 1 -d /var/run/vboxadd -s /sbin/nologin vboxadd 2>&1 - -%post -%systemd_post vboxclient.service -%systemd_post vboxservice.service - -%preun -%systemd_preun vboxclient.service -%systemd_preun vboxservice.service - -%postun -%systemd_postun_with_restart vboxclient.service -%systemd_postun_with_restart vboxservice.service - - -%files -%license COPYING* -%{_bindir}/VBoxClient -%{_bindir}/VBoxControl -%{_bindir}/VBoxClient-all -%{_bindir}/VBoxDRMClient -%{_sbindir}/VBoxService -%{_libdir}/security/pam_vbox.so -%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh -%{_sysconfdir}/xdg/autostart/vboxclient.desktop -%{_unitdir}/vboxclient.service -%{_unitdir}/vboxservice.service -%{_udevrulesdir}/60-vboxguest.rules - - -%changelog -* Sat Jan 22 2022 Fedora Release Engineering - 6.1.32-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 19 2022 Sérgio Basto - 6.1.32-1 -- Update Virtualbox Guest Additions to 6.1.32 (#2042010) - -* Wed Nov 24 2021 Sérgio Basto - 6.1.30-1 -- Update Virtualbox Guest Additions to 6.1.30 (#2025728) - -* Fri Oct 22 2021 Sérgio Basto - 6.1.28-1 -- Update Virtualbox Guest Additions to 6.1.28 (#2015655) - -* Wed Aug 11 2021 Sérgio Basto - 6.1.26-1 -- Update Virtualbox Guest Additions to 6.1.26 (#1984089) - -* Fri Jul 23 2021 Fedora Release Engineering - 6.1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 06 2021 Sérgio Basto - 6.1.22-1 -- Update Virtualbox Guest Additions to 6.1.22 (#1955281) - -* Fri Apr 23 2021 Sérgio Basto - 6.1.20-1 -- Update Virtualbox Guest Additions to 6.1.20 (#1951631) - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.1.18-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 6.1.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Fedora Release Monitoring - 6.1.18-1 -- Update to 6.1.18 (#1918032) - -* Fri Oct 23 2020 Sérgio Basto - 6.1.16-1 -- Update Virtualbox Guest Additions to 6.1.16a - -* Sun Sep 13 2020 Sérgio Basto - 6.1.14-1 -- Update Virtualbox Guest Additions to 6.1.14a - -* Sun Aug 02 2020 Sérgio Basto - 6.1.12-1 -- Update Virtualbox Guest Additions to 6.1.12 - -* Wed Jul 29 2020 Fedora Release Engineering - 6.1.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 08 2020 Hans de Goede - 6.1.10-2 -- Install the new VBoxDRMClient binary and make vboxclient.service - run that instead of VBoxClient, this fixes VM display resizing when - the guest is running a Wayland session - -* Sat Jun 06 2020 Sérgio Basto - 6.1.10-1 -- Update Virtualbox Guest Additions to 6.1.10 - -* Wed May 20 2020 Hans de Goede - 6.1.8-2 -- Add a vboxclient.service which runs VBoxClient --vwsvga when using the - VMSVGA virtual GPU, this fixes resizing in wayland sessions (rhbz 1789545) -- Drop VBoxClient --vwsvga-x11 from VBoxClient-all, it is not necessary - now that we run VBoxClient --vwsvga as service and it was breaking resize - support with the VBoxSVGA virtual GPU (rhbz 1789545) -- Drop ExecStartPre modprove vboxvideo vboxsf from vboxservice.service, - this is not necessary, they will be loaded automatically - -* Sat May 16 2020 Sérgio Basto - 6.1.8-1 -- Update Virtualbox Guest Additions to 6.1.8 - -* Thu Apr 16 2020 Sérgio Basto - 6.1.6-1 -- Update Virtualbox Guest Additions to 6.1.6 - -* Wed Mar 11 2020 Sérgio Basto - 6.1.4-4 -- koji test - -* Wed Mar 11 2020 Sérgio Basto - 6.1.4-3 -- Fix for clipboard -- Obsoletes virtualbox-guest-additions-ogl - -* Tue Mar 3 2020 Hans de Goede - 6.1.4-2 -- Fix VBoxClient --vmsvga-x11 crash (rhbz#1806778) - -* Sat Feb 22 2020 Sérgio Basto - 6.1.4-1 -- Update Virtualbox Guest Additions to 6.1.4 -- Remove hack "Conflicts VirtualBox-server > %%{version}". With kernel 5.5.6 - (more or less), vboxsf is included in Fedora kernel and - virtualbox-guest-additions don't need akmod-VirtualBox, anymore. - -* Fri Jan 31 2020 Fedora Release Engineering - 6.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 19 2020 Sérgio Basto - 6.1.2-1 -- Update Virtualbox Guest Additions to 6.1.2 - -* Fri Dec 20 2019 Sérgio Basto - 6.1.0-1 -- Upgrade to 6.1.0 -- Seems that VBoxOGL was removed in 6.1.0 - -* Wed Nov 13 2019 Sérgio Basto - 6.0.14-2 -- Change BR from python2 to python3 - -* Thu Oct 17 2019 Sérgio Basto - 6.0.14-1 -- Update Virtualbox Guest Additions to 6.0.14 - -* Fri Sep 06 2019 Sérgio Basto - 6.0.12-1 -- Update Virtualbox Guest Additions to 6.0.12 - -* Sat Jul 27 2019 Fedora Release Engineering - 6.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 17 2019 Sérgio Basto - 6.0.10-1 -- Update Virtualbox Guest Additions to 6.0.10 - -* Fri May 24 2019 Sérgio Basto - 6.0.8-2 -- Just force same version and not same release - -* Sun May 19 2019 Sérgio Basto - 6.0.8-1 -- Update Virtualbox Guest Additions to 6.0.8 - -* Fri Apr 26 2019 Sérgio Basto - 6.0.6-1 -- Update Virtualbox Guest Additions to 6.0.6 - -* Wed Mar 20 2019 Hans de Goede - 6.0.4-2 -- Fix automounted shares not working on 6.0.x hosts - -* Thu Mar 07 2019 Sérgio Basto - 6.0.4-1 -- Update Virtualbox Guest Additions to 6.0.4 - -* Sun Feb 03 2019 Fedora Release Engineering - 6.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 23 2019 Hans de Goede - 6.0.2-1 -- Update Virtualbox Guest Additions to 6.0.2, security fix version - -* Mon Jan 14 2019 Björn Esser - 6.0.0-2 -- Rebuilt for libcrypt.so.2 (#1666033) -- Add a patch to fix build on Fedora 30 - -* Thu Dec 20 2018 Sérgio Basto - 6.0.0-1 -- VirtualBox 6.0.0 - -* Mon Nov 12 2018 Sérgio Basto - 5.2.22-1 -- Update Virtualbox Guest Additions to 5.2.22, security fix version - -* Sat Oct 20 2018 Sérgio Basto - 5.2.20-1 -- Update Virtualbox Guest Additions to 5.2.20, bugfix version - -* Thu Aug 30 2018 Sérgio Basto - 5.2.18-1 -- Update Virtualbox Guest Additions to 5.2.18 - -* Wed Aug 01 2018 Sérgio Basto - 5.2.16-2 -- Force instalation of same version VirtualBox-kmodsrc and - virtualBox-guest-additions - -* Sat Jul 21 2018 Sérgio Basto - 5.2.16-1 -- Update Virtualbox Guest Additions to 5.2.16 - -* Sat Jul 14 2018 Fedora Release Engineering - 5.2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -- https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot - -* Mon Jul 02 2018 Sérgio Basto - 5.2.14-1 -- Update Virtualbox Guest Additions to 5.2.14 - -* Sat May 12 2018 Sérgio Basto - 5.2.12-1 -- Update to 5.2.12 - -* Sun Apr 22 2018 Sérgio Basto - 5.2.10-1 -- Update to 5.2.10 - -* Thu Mar 1 2018 Hans de Goede - 5.2.8-1 -- Update to 5.2.8 -- Use https for all URLs - -* Wed Feb 7 2018 Hans de Goede - 5.2.6-4 -- Do not use pkg-config for includes, as pkg-config prefixes an unwanted -I -- Fix /etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh to now show an error - notification when not running under vbox, as we will be part of the - Workstation livecd which may run anywhere - -* Mon Jan 29 2018 Hans de Goede - 5.2.6-3 -- Update to 5.2.6 -- Drop VirtualBox-4.3.0-no-bundles.patch, set make variables instead -- Adjust automount vboxservice for mainline vboxsf filesystem driver -- Drop mount.vboxsf, the mainline vboxsf filesystem driver works with the - regular mount binary -- Drop commented out Requires: kernel, this is bad idea (rhbz#1534595) -- Use pkgconfig to get include/libs instead of hardcoding (rhbz#1534595) -- Rename to lowercaps virtualbox-guest-additions, add Obsoletes / Provides - for upgradepath from rpmfusion (rhbz#1534595) -- Add Provides: VirtualBox-kmod-common for rpmfusion upgradepath (rhbz#1534595) -- Latest rpmfusion Release is 2, set our Release field to 3 - -* Sun Nov 26 2017 Hans de Goede - 5.2.2-1 -- Update to 5.2.2 - -* Thu Sep 21 2017 Hans de Goede - 5.2.0-0.1.svn68769 -- Switch to a 5.2 svn snapshot, as 5.2 has a new /dev/vboxguest ioctl API - which the mainline version of the vboxguest drivers implement - -* Mon Aug 28 2017 Hans de Goede - 5.1.26-3 -- Put the libGL.so.1 replacement libs and VBoxOGLRun scripts in an -ogl - subpackage, so that people can install both the i686 and x86_64 versions. -- Filter out libGL.so.1 provides - -* Mon Aug 14 2017 Hans de Goede - 5.1.26-2 -- Initial Fedora package based on the guest-addition parts of the - rpmfusion VirtualBox package