[VirtualBox] Update VBox to 5.1.4

commit 30c594bf5e97217ac981fa86d2034f7384bd3d9b Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Sep 4 17:52:43 2016 +0100 Update VBox to 5.1.4 - Sat Jul 16 2016 Rok Mandeljc <rok.mandeljc(a)gmail.com&gt; - Fixed the 64-bit lib suffix in /usr/bin/VirtualBox so that it finds the VirtualBox installation instead of ending up in infinite call loop - Update VirtualBox to 5.1.0 - Drop upstream patches, rebase the rest - Add Qt5 dependencies 02-gsoap-build-fix.patch | 2 +- VirtualBox-4.3.0-no-bundles.patch | 2 +- VirtualBox-4.3.10-xserver_guest.patch | 4 +-- VirtualBox-5.0.22-guest_soname.patch | 14 +++----- VirtualBox-5.1.0-strings.patch | 67 +++++++++++++++++++++++++++++++++++ VirtualBox-OSE-4.0.2-aiobug.patch | 4 +-- VirtualBox-OSE-4.1.4-noupdate.patch | 2 +- VirtualBox.spec | 51 ++++++++++++++++---------- changeset_trunk_59959.diff | 11 ------ changeset_trunk_59960.diff | 16 --------- 10 files changed, 111 insertions(+), 62 deletions(-) --- diff --git a/02-gsoap-build-fix.patch b/02-gsoap-build-fix.patch index 459f454..3e3f315 100644 --- a/02-gsoap-build-fix.patch +++ b/02-gsoap-build-fix.patch @@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk =================================================================== --- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:32:51.211124975 -0500 +++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:36:04.531133954 -0500 -@@ -685,7 +685,7 @@ +@@ -707,7 +707,7 @@ : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) $(RM) -f $@ diff --git a/VirtualBox-4.3.0-no-bundles.patch b/VirtualBox-4.3.0-no-bundles.patch index 96e88ac..2f32485 100644 --- a/VirtualBox-4.3.0-no-bundles.patch +++ b/VirtualBox-4.3.0-no-bundles.patch @@ -1,6 +1,6 @@ --- ./Config.kmk.orig 2015-12-18 16:16:51.000000000 +0000 +++ ./Config.kmk 2015-12-21 23:27:27.833020706 +0000 -@@ -3181,19 +3181,19 @@ VBOXLNX32GUEST_SUFF_LIB = .a +@@ -3446,19 +3446,19 @@ VBOXLNX32GUEST_SUFF_LIB = .a # SDKs for external libraries. # SDK_VBOX_LIBXML2 = . diff --git a/VirtualBox-4.3.10-xserver_guest.patch b/VirtualBox-4.3.10-xserver_guest.patch index 084df8a..7e107d6 100644 --- a/VirtualBox-4.3.10-xserver_guest.patch +++ b/VirtualBox-4.3.10-xserver_guest.patch @@ -2,7 +2,7 @@ Just compile with X11 system source and we may remove bundle X11 source code. --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100 -@@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES +@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -26,7 +26,7 @@ Just compile with X11 system source and we may remove bundle X11 source code. VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -@@ -213,10 +207,10 @@ +@@ -214,10 +208,10 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_LIBS += \ diff --git a/VirtualBox-5.0.22-guest_soname.patch b/VirtualBox-5.0.22-guest_soname.patch index 02c2d0f..6447ffb 100644 --- a/VirtualBox-5.0.22-guest_soname.patch +++ b/VirtualBox-5.0.22-guest_soname.patch @@ -1,13 +1,7 @@ -Warning this patch may disable X11 guest 3D, don't use it ! . -Still under investigation, RPMFusion needs VirtualBox-guest-additions rpm doesn't -provides : -libEGL.so.1()(64bit) -libGL.so.1()(64bit) - Do not change SONAME in Linux for VBoxOGL and VBoxEGL ---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-06-24 20:01:44.794134277 +0100 -+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-06-24 20:01:54.994262126 +0100 -@@ -227,7 +227,6 @@ if1of ($(KBUILD_TARGET), linux solaris f +--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-15 23:07:46.253032128 +0200 ++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-07-15 23:20:17.923679249 +0200 +@@ -221,7 +221,6 @@ dl endif else @@ -15,7 +9,7 @@ Do not change SONAME in Linux for VBoxOGL and VBoxEGL VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain endif endif -@@ -711,7 +710,6 @@ VBoxEGL_TEMPLATE = VBOXCROGLR3GUES +@@ -705,7 +704,6 @@ VBoxEGL_SOURCES = egl.c VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7 VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED) diff --git a/VirtualBox-5.1.0-strings.patch b/VirtualBox-5.1.0-strings.patch new file mode 100644 index 0000000..1ec6b16 --- /dev/null +++ b/VirtualBox-5.1.0-strings.patch @@ -0,0 +1,67 @@ +--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2016-07-15 22:49:01.368518594 +0200 ++++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2016-07-15 22:52:19.852192522 +0200 +@@ -101,11 +101,12 @@ + ); + + QString g_QStrHintLinuxNoDriver = QApplication::tr( +- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " +- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " +- "module by executing<br/><br/>" +- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>" +- "as root." ++ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded." ++ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:" ++ " <font color=blue>dnf install akmod-VirtualBox kernel-devel-$(uname -r)</font>" ++ "If you installed VirtualBox packages and don't want reboot the system, you may need load the " ++ "kernel driver, doing as root:" ++ " <font color=blue>akmods; systemctl restart systemd-modules-load.service</font><br/><br/>" + ); + + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +@@ -119,18 +120,18 @@ + "The VirtualBox kernel modules do not match this version of " + "VirtualBox. The installation of VirtualBox was apparently not " + "successful. Executing<br/><br/>" +- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>" ++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>" + "may correct this. Make sure that you do not mix the " +- "OSE version and the PUEL version of VirtualBox." ++ "RPMFusion version and the Oracle version of VirtualBox." + ); + + QString g_QStrHintOtherNoDriver = QApplication::tr( + "Make sure the kernel module has been loaded successfully." + ); + +-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ ++/* We're going to try to give a helping hand */ + QString g_QStrHintReinstall = QApplication::tr( +- "Please try reinstalling VirtualBox." ++ "Please report the problem to the RPM Fusion Bugzilla." + ); + + +--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2016-07-15 22:49:17.314169835 +0200 ++++ ./src/VBox/VMM/VMMR3/VM.cpp 2016-07-15 22:53:46.385309383 +0200 +@@ -384,8 +384,8 @@ + #ifdef RT_OS_LINUX + pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " + "was either not loaded or /dev/vboxdrv is not set up properly. " +- "Re-setup the kernel module by executing " +- "'/sbin/vboxconfig' as root"); ++ "Load the kernel module by executing " ++ "'systemctl restart systemd-modules-load.service' as root"); + #else + pszError = N_("VirtualBox kernel driver not loaded"); + #endif +@@ -426,8 +426,8 @@ + #ifdef RT_OS_LINUX + pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module " + "was either not loaded or /dev/vboxdrv was not created for some " +- "reason. Re-setup the kernel module by executing " +- "'/sbin/vboxconfig' as root"); ++ "reason. Install the kernel module by executing 'dnf install akmod-VirtualBox'" ++ "and 'akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service' as root"); + #else + pszError = N_("VirtualBox kernel driver not installed"); + #endif diff --git a/VirtualBox-OSE-4.0.2-aiobug.patch b/VirtualBox-OSE-4.0.2-aiobug.patch index ea6e0a1..2ef7307 100644 --- a/VirtualBox-OSE-4.0.2-aiobug.patch +++ b/VirtualBox-OSE-4.0.2-aiobug.patch @@ -11,7 +11,7 @@ diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-clien index cfa0bd4..ef4aca4 100644 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp -@@ -2870,6 +2870,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, +@@ -4057,6 +4057,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, mfSnapshotFolderSizeWarningShown = true; } @@ -20,7 +20,7 @@ index cfa0bd4..ef4aca4 100644 #ifdef RT_OS_LINUX /* * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located -@@ -2925,6 +2927,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, +@@ -4110,6 +4112,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, } } #endif diff --git a/VirtualBox-OSE-4.1.4-noupdate.patch b/VirtualBox-OSE-4.1.4-noupdate.patch index 66dedbe..d5a2af1 100644 --- a/VirtualBox-OSE-4.1.4-noupdate.patch +++ b/VirtualBox-OSE-4.1.4-noupdate.patch @@ -11,7 +11,7 @@ Let's not bug the user with updates that are not yet packaged. --- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:27.022252299 +0100 +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:37.597338185 +0100 -@@ -138,7 +138,7 @@ +@@ -163,7 +163,7 @@ if (m_dayList.isEmpty()) populate(); PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0])); diff --git a/VirtualBox.spec b/VirtualBox.spec index 262a66d..c328f83 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -16,7 +16,7 @@ %global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot %bcond_without webservice -%if 0%{?rhel} +%if 0%{?rhel} %bcond_with docs %else %bcond_without docs @@ -24,9 +24,9 @@ %bcond_with vnc Name: VirtualBox -Version: 5.0.26 -#Release: 6%%{?prerel:.%%{prerel}}%%{?dist} -Release: 2%{?dist} +Version: 5.1.4 +#Release: 1%%{?prerel:.%%{prerel}}%%{?dist} +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -40,7 +40,7 @@ Source7: VirtualBox-guest.modules Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-5.0.12-strings.patch +Patch2: VirtualBox-5.1.0-strings.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch22: VirtualBox-OSE-4.1.12-gsoap.patch Patch23: VirtualBox-4.3.10-xserver_guest.patch @@ -49,9 +49,7 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch Patch27: VirtualBox-gcc.patch # from Debian Patch28: 02-gsoap-build-fix.patch -# Upstream patches -Patch30: changeset_trunk_59959.diff -Patch31: changeset_trunk_59960.diff +# Upstream patches # I added some fixes for gcc6 just applied to Fedora 24+ Patch33: VirtualBox-gcc6-fixes.patch # just applied to Fedora 25+ @@ -69,7 +67,9 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: libcap-devel -BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt5-linguist %if %{with webservice} BuildRequires: gsoap-devel %endif @@ -115,6 +115,7 @@ BuildRequires: xorg-x11-server-devel BuildRequires: libXcursor-devel BuildRequires: libXcomposite-devel BuildRequires: libXmu-devel +BuildRequires: libXinerama-devel %if %{with vnc} BuildRequires: libvncserver-devel %endif @@ -227,10 +228,8 @@ rm -r src/libs/zlib-1.2.8/ %patch26 -p1 -b .nobundles #patch27 -p1 -b .gcc %if 0%{?fedora} > 20 -%patch28 -p1 -b .gsoap2 +#patch28 -p1 -b .gsoap2 %endif -%patch30 -p1 -b .gcc6 -%patch31 -p1 -b .gcc6 %if 0%{?fedora} > 23 %patch33 -p1 -b .gcc6 %endif @@ -242,6 +241,13 @@ rm -r src/libs/zlib-1.2.8/ # CRLF->LF sed -i 's/\r//' COPYING +# Fix the library path in wrapper script for 64-bit; otherwise, it will +# find itself as the VirtualBox executable, and end up in endless call +# loop... +%ifarch x86_64 +sed -i 's@/usr/lib@/usr/lib64@' src/VBox/Installer/linux/VBox.sh +%endif + %build ./configure --disable-kmods \ %if %{with webservice} @@ -260,7 +266,7 @@ sed -i 's/\r//' COPYING . ./env.sh #TODO fix publisher in copr -%global publisher _%{?vendor:%(echo "%{vendor}" | \ +%global publisher _%{?vendor:%(echo "%{vendor}" | \ sed -e 's/[^[:alnum:]]//g; s/FedoraProject//' | cut -c -9)}%{?!vendor:custom} # VirtualBox build system installs and builds in the same step, @@ -438,7 +444,7 @@ install -d %{buildroot}%{_libdir}/security install -m 0755 -t %{buildroot}%{_libdir}/security \ obj/bin/additions/pam_vbox.so -# init/vboxadd-x11 code near call the function install_x11_startup_app +# init/vboxadd-x11 code near call the function install_x11_startup_app install -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 \ @@ -680,6 +686,15 @@ fi %{_datadir}/%{name}-kmod-%{version} %changelog +* Sun Sep 04 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.4-1 +- Update VBox to 5.1.4 +- Sat Jul 16 2016 Rok Mandeljc <rok.mandeljc(a)gmail.com&gt; + - Fixed the 64-bit lib suffix in /usr/bin/VirtualBox so that it finds the + VirtualBox installation instead of ending up in infinite call loop + - Update VirtualBox to 5.1.0 + - Drop upstream patches, rebase the rest + - Add Qt5 dependencies + * Sun Sep 04 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 5.0.26-2 - Rebuild for new libvpx version @@ -822,7 +837,7 @@ https://www.virtualbox.org/ticket/15205#comment:8 - Rebuild for new x11-xorg-server * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-1 -- In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi and use bundled +- In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi and use bundled x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have glapi in xorg-x11-server-source, but by what I saw, seems is not correct use it. - New upstream release @@ -1402,14 +1417,14 @@ cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available * Tue Oct 30 2007 Till Maas <opensource till name> - 1.5.2-1 - Update to new version -* Wed Oct 03 2007 Till Maas <opensource till name> +* Wed Oct 03 2007 Till Maas <opensource till name> - 1.5.2-0.2.20071003svn5134 - update to devel Version -* Wed Sep 19 2007 Till Maas <opensource till name> +* Wed Sep 19 2007 Till Maas <opensource till name> - 1.5.2-0.1.20070919svn4897 - Update to devel Version that may support Fedora as Guest again -- Make /dev/vboxdrv owned by root instead of vboxusers, because only +- Make /dev/vboxdrv owned by root instead of vboxusers, because only the group is needed * Mon Sep 03 2007 Till Maas <opensource till name> - 1.5.0-1