commit 83d6711b4a66da87e87157b24309b7d78cea7b1e Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Dec 20 06:05:21 2019 +0000 Update VBox to 6.1.0 .gitignore | 1 + ...strings.patch => VirtualBox-6.1.0-strings.patch | 41 +++++++++++++++------- VirtualBox.spec | 34 +++++++++++------- sources | 2 +- update_vbox.sh | 10 +----- 5 files changed, 54 insertions(+), 34 deletions(-) --- diff --git a/.gitignore b/.gitignore index d6d302e..0b6ed47 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ VirtualBox-5.0.16.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 diff --git a/VirtualBox-6.0.6-strings.patch b/VirtualBox-6.1.0-strings.patch similarity index 74% rename from VirtualBox-6.0.6-strings.patch rename to VirtualBox-6.1.0-strings.patch index d40542c..1f9ee37 100644 --- a/VirtualBox-6.0.6-strings.patch +++ b/VirtualBox-6.1.0-strings.patch @@ -1,7 +1,6 @@ -diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-16 13:16:21.000000000 +0300 -+++ VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-17 11:53:03.382274383 +0300 -@@ -86,10 +86,12 @@ +--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2019-12-19 22:58:49.615873442 +0000 ++++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2019-12-19 23:03:23.696288683 +0000 +@@ -86,10 +86,12 @@ QString g_QStrHintLinuxNoMemory = QAppli ); QString g_QStrHintLinuxNoDriver = QApplication::tr( @@ -18,7 +17,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp Virt "If your system has EFI Secure Boot enabled you may also need to sign " "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before " "you can load them. Please see your Linux system's documentation for " -@@ -99,9 +101,12 @@ +@@ -99,26 +101,29 @@ QString g_QStrHintLinuxNoDriver = QAppli QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " "VirtualBox. The installation of VirtualBox was apparently not " @@ -34,7 +33,17 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp Virt QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " -@@ -116,9 +121,9 @@ + "VirtualBox. The installation of VirtualBox was apparently not " + "successful. Executing<br/><br/>" +- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>" +- "may correct this. Make sure that you are not mixing builds " +- "of VirtualBox from different sources." ++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>" ++ "may correct this. Make sure that you do not mix the " ++ "RPMFusion version and the Oracle version of VirtualBox." + ); + + QString g_QStrHintOtherNoDriver = QApplication::tr( "Make sure the kernel module has been loaded successfully." ); @@ -78,10 +87,18 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0 You will not be able to start VMs until this problem is fixed. EOF -diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp ---- VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp 2019-04-16 13:17:42.000000000 +0300 -+++ VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp 2019-04-17 11:53:03.396273870 +0300 -@@ -342,9 +342,9 @@ +--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2019-12-19 22:54:59.342051984 +0000 ++++ ./src/VBox/VMM/VMMR3/VM.cpp 2019-12-19 23:14:50.172146453 +0000 +@@ -266,7 +266,7 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp + "Secure Boot that the modules are signed if necessary in the right " + "way for your host system. Then try to recompile and reload the " + "kernel modules by executing " +- "'/sbin/vboxconfig' as root"); ++ "'akmods && systemctl restart systemd-modules-load.service' as root"); + break; + #endif + +@@ -332,9 +332,9 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " "was either not loaded, /dev/vboxdrv is not set up properly, " "or you are using EFI Secure Boot and the module is not signed " @@ -94,7 +111,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/ #else pszError = N_("VirtualBox kernel driver not loaded"); #endif -@@ -386,9 +386,9 @@ +@@ -376,9 +376,9 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp pszError = N_("VirtualBox kernel driver not Installed. The vboxdrv kernel module " "was either not loaded, /dev/vboxdrv is not set up properly, " "or you are using EFI Secure Boot and the module is not signed " @@ -103,7 +120,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/ - "'/sbin/vboxconfig' as root"); + "in the right way for your system." + "Install the kernel module by executing 'dnf install akmod-VirtualBox kernel-devel-$(uname -r)'" -+ "and 'akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service' as root"); ++ "and 'akmods && systemctl restart systemd-modules-load.service' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif diff --git a/VirtualBox.spec b/VirtualBox.spec index 2a02509..212e187 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -45,16 +45,15 @@ %endif Name: VirtualBox -Version: 6.0.14 -Release: 2%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) URL: http://www.virtualbox.org/wiki/VirtualBox -ExclusiveArch: i686 x86_64 +ExclusiveArch: x86_64 -Group: System/Emulators/PC Requires: %{name}-server%{?isa} = %{version} Obsoletes: %{name}-qt < 5.1.8 @@ -72,7 +71,7 @@ Source10: vboxweb.service Source20: os_mageia.png Source21: os_mageia_64.png Patch1: VirtualBox-6.0.0-noupdate.patch -Patch2: VirtualBox-6.0.6-strings.patch +Patch2: VirtualBox-6.1.0-strings.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch27: VirtualBox-gcc.patch Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch @@ -302,8 +301,7 @@ 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 include/VBox/HostServices/glext.h -rm include/VBox/HostServices/glxext.h +rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/ # wglext.h has typedefs for Windows-specific extensions #rm include/VBox/HostServices/wglext.h # src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions @@ -324,7 +322,7 @@ rm -r src/libs/zlib-1.2.*/ %if 0%{?fedora} < 28 || 0%{?rhel} %patch29 -p2 -R -b .gsoap3 %endif -%patch30 -p1 -b .python37 +#patch30 -p1 -b .python37 %patch32 -p1 -b .vnc %patch40 -p1 -b .python2_path # mageia support not ready for 6.0 @@ -418,6 +416,7 @@ install -d %{buildroot}%{_sbindir} install -d %{buildroot}%{_libdir} install -d %{buildroot}%{_libdir}/virtualbox install -d %{buildroot}%{_libdir}/virtualbox/components +install -d %{buildroot}%{_libdir}/virtualbox/UnattendedTemplates install -d %{buildroot}%{_libdir}/virtualbox/nls install -d %{buildroot}%{_libdir}/virtualbox/ExtensionPacks install -d %{buildroot}%{_libdir}/virtualbox/sdk @@ -433,7 +432,6 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/VBoxEFI*.fd \ - obj/bin/*.rc \ obj/bin/*.r0 # Binaries @@ -462,6 +460,7 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/VBoxVMMPreload \ obj/bin/VBoxXPCOMIPCD \ obj/bin/VBoxSysInfo.sh \ + obj/bin/vboxweb-service.sh \ %if %{with python2} || %{with python3} obj/bin/vboxshell.py \ %endif @@ -492,6 +491,8 @@ ln -s VBox %{buildroot}%{_bindir}/VBoxBalloonCtrl ln -s VBox %{buildroot}%{_bindir}/vboxballoonctrl ln -s VBox %{buildroot}%{_bindir}/VBoxAutostart ln -s VBox %{buildroot}%{_bindir}/vboxautostart +ln -s VBox %{buildroot}%{_bindir}/VirtualBoxVM +ln -s VBox %{buildroot}%{_bindir}/virtualboxvm %if %{with webservice} ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv %endif @@ -502,6 +503,7 @@ ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img # Components, preserve symlinks cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/ +cp obj/bin/UnattendedTemplates/* %{buildroot}%{_libdir}/virtualbox/UnattendedTemplates # Language files install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \ @@ -571,9 +573,9 @@ install -m 0755 -t %{buildroot}%{_bindir} \ # Guest libraries install -m 0755 -t %{buildroot}%{_libdir}/security \ obj/bin/additions/pam_vbox.so -install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \ - obj/bin/additions/VBoxOGL*.so -ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1 +#install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \ +# obj/bin/additions/VBoxOGL*.so +#ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1 # init/vboxadd-x11 code near call the function install_x11_startup_app install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ @@ -760,6 +762,8 @@ getent passwd vboxadd >/dev/null || \ %dir %{_libdir}/virtualbox %{_libdir}/virtualbox/*.[^p]* %exclude %{_libdir}/virtualbox/VBoxDbg.so +%exclude %{_libdir}/virtualbox/UICommon.so +%exclude %{_libdir}/virtualbox/VirtualBoxVM.so %if %{with python2} %exclude %{_libdir}/virtualbox/VBoxPython2_7.so %endif @@ -775,6 +779,7 @@ getent passwd vboxadd >/dev/null || \ %{_libdir}/virtualbox/SUPInstall %{_libdir}/virtualbox/SUPLoggerCtl %{_libdir}/virtualbox/SUPUninstall +%{_libdir}/virtualbox/UnattendedTemplates %{_libdir}/virtualbox/VBoxAutostart %{_libdir}/virtualbox/VBoxVMMPreload %{_libdir}/virtualbox/VBoxBugReport @@ -806,6 +811,8 @@ getent passwd vboxadd >/dev/null || \ %{_bindir}/virtualbox %{_libdir}/virtualbox/VBoxTestOGL %{_libdir}/virtualbox/VBoxDbg.so +%{_libdir}/virtualbox/UICommon.so +%{_libdir}/virtualbox/VirtualBoxVM.so %{_libdir}/virtualbox/nls %{_datadir}/pixmaps/*.png %{_datadir}/applications/*.desktop @@ -862,6 +869,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Wed Dec 18 2019 Sérgio Monteiro Basto <sergio(a)serjux.com&gt; - 6.1.0-1 +- Update VBox to 6.1.0 + * Tue Oct 29 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.14-2 - Add appstream file (copied from openSUSE) diff --git a/sources b/sources index 78e7928..5a18108 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.0.14.tar.bz2) = e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d +SHA512 (VirtualBox-6.1.0.tar.bz2) = 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618 SHA512 (UserManual.pdf) = 20aa696821faf2c87a76d2c93a5fdd29e79d42d712774b50ae5876e899c6399fac7c0edbe66fed0d8adfec933ebe4d12ecdc4240796c327c3224cd92b52704ca diff --git a/update_vbox.sh b/update_vbox.sh index 76c2ae0..453b574 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=6.0.14 +VERSION=6.1.0 REL=1 RAWHIDE=32 if [ -z "$1" ] @@ -46,12 +46,4 @@ fi echo Press enter to continue; read dummy; git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master -cd ../VirtualBox-kmod/ -if test $stage -le 5 -then -echo STAGE 5 -git pull -rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox-kmod.spec -rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-kmod-$VERSION-$REL.fc$RAWHIDE.src.rpm -fi echo "Continue in ../VirtualBox-kmod/update_vbox.sh"