[VirtualBox/f26] Update VBox to 5.2.4

commit 72db59315804a845db663c7c063a3e6123f46488 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Jan 16 04:23:03 2018 +0000 Update VBox to 5.2.4 Rebase patches: - VirtualBox-5.1.0-add-Mageia-support.patch - VirtualBox-OSE-4.0.2-aiobug.patch - VirtualBox-5.0.18-xserver_guest.patch .gitignore | 1 + VirtualBox-5.0.18-xserver_guest.patch | 75 ++--------------------- VirtualBox-5.1.0-add-Mageia-support.patch | 98 +++++++++++++++---------------- VirtualBox-OSE-4.0.2-aiobug.patch | 24 ++++---- VirtualBox.spec | 19 ++++-- sources | 2 +- 6 files changed, 83 insertions(+), 136 deletions(-) --- diff --git a/.gitignore b/.gitignore index dddf925..b26cf3d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ VirtualBox-5.0.16.tar.bz2 /VirtualBox-5.1.26.tar.bz2 /VirtualBox-5.1.28.tar.bz2 /VirtualBox-5.1.30.tar.bz2 +/VirtualBox-5.2.4.tar.bz2 diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch index ad226cb..e7c19e7 100644 --- a/VirtualBox-5.0.18-xserver_guest.patch +++ b/VirtualBox-5.0.18-xserver_guest.patch @@ -27,71 +27,8 @@ VBoxGuestR3LibXFree86 for use with old servers where the C library is not available and becasue fail to build when we unbundle all X11 sources, files like xf86_ansic.h doesn't exist anymore. ---- ./Config.kmk.orig 2016-10-12 02:27:19.650378571 +0100 -+++ ./Config.kmk 2016-10-12 02:29:40.308912309 +0100 -@@ -2362,6 +2362,7 @@ ifdef VBOX_WITH_CROGL - endif - - if1of ($(KBUILD_TARGET), freebsd linux solaris) -+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS - # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2 - VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2 - VBOX_MESA_INCS = \ -@@ -2372,6 +2373,7 @@ ifdef VBOX_WITH_CROGL - $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common - endif -+ endif - - VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/ - VBOX_DARWIN_OPENGL_HEADERS = gl.h glu.h ---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-10-15 16:06:41.137161024 +0100 -+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-10-15 16:09:48.477540551 +0100 -@@ -67,6 +67,7 @@ endif - VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET), linux solaris freebsd) -+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS - VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -@@ -81,6 +82,7 @@ if1of ($(KBUILD_TARGET), linux solaris f - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ - $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ endif - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - -@@ -213,11 +215,15 @@ VBoxOGL_LIBS.win += \ - $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB) - - if1of ($(KBUILD_TARGET), linux solaris freebsd) -- VBoxOGL_LIBS += \ -+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS -+ VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext -+ else -+ VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ - $(PATH_STAGE_LIB)/libXdamage.so \ - $(PATH_STAGE_LIB)/libXfixes.so \ - $(PATH_STAGE_LIB)/libXext.so -+endif - ifdef VBoxOGL_FAKEDRI - ifeq ($(KBUILD_TARGET), freebsd) - VBoxOGL_LIBS += \ -@@ -709,7 +715,9 @@ $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_ - - VBoxEGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxEGL_SOURCES = egl.c -+ifndef VBOX_USE_SYSTEM_XORG_HEADERS - VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7 -+endif - VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED) - VBoxEGL_SONAME.linux = libEGL.so.1 - ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100 -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100 +--- ./src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100 ++++ ./src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100 @@ -40,9 +40,11 @@ LIBRARIES += \ VBoxGuestR3LibShared ifndef VBOX_ONLY_VALIDATIONKIT @@ -104,12 +41,12 @@ xf86_ansic.h doesn't exist anymore. if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) LIBRARIES += \ VBoxGuestR3LibXOrg ---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100 -+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 -@@ -384,7 +384,6 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS - vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS)) +--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2018-01-16 04:16:19.503619778 +0000 ++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2018-01-16 04:16:44.913900197 +0000 +@@ -406,7 +406,6 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS vboxvideo_drv_system_INCS += \ $(PATH_ROOT)/src/VBox/Runtime/include \ + $(VBOX_GRAPHICS_INCS) \ - /usr/include/x11 \ /usr/include/xorg \ /usr/include/pixman-1 diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch index 60bd4b6..16d59a7 100644 --- a/VirtualBox-5.1.0-add-Mageia-support.patch +++ b/VirtualBox-5.1.0-add-Mageia-support.patch @@ -1,6 +1,6 @@ -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/include/VBox/ostypes.h VirtualBox-5.1.24.new/include/VBox/ostypes.h ---- VirtualBox-5.1.24/include/VBox/ostypes.h 2017-07-17 16:56:45.000000000 +0100 -+++ VirtualBox-5.1.24.new/include/VBox/ostypes.h 2017-07-18 14:00:46.446879822 +0100 +diff -rup VirtualBox-5.2.4.orig/include/VBox/ostypes.h VirtualBox-5.2.4/include/VBox/ostypes.h +--- VirtualBox-5.2.4.orig/include/VBox/ostypes.h 2017-12-19 09:21:46.000000000 +0000 ++++ VirtualBox-5.2.4/include/VBox/ostypes.h 2018-01-16 01:33:36.323052771 +0000 @@ -107,6 +107,8 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_Xandros_x64 = 0x5D100, VBOXOSTYPE_Oracle = 0x5E000, @@ -10,10 +10,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/include/VBox/ostypes.h VirtualBo VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-5.1.24.new/src/VBox/Additions/linux/installer/vboxadd-x11.sh ---- VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2017-07-17 16:58:31.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2017-07-18 14:00:46.626881845 +0100 -@@ -136,8 +136,14 @@ install_x11_startup_app() { +diff -rup VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh +--- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2017-12-19 09:22:03.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-01-16 01:33:36.545055031 +0000 +@@ -94,8 +94,14 @@ install_x11_startup_app() { x11_autostart="/etc/xdg/autostart" kde_autostart="/usr/share/autostart" redhat_dir=/etc/X11/Xsession.d @@ -28,9 +28,9 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Additions/linux/install if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ] then install -m 0644 $app_src "$mandriva_dir/$app_dest" -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp ---- VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2017-07-17 17:09:24.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2017-07-18 14:00:46.763883384 +0100 +diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp +--- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2017-12-19 09:27:42.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-01-16 01:33:36.598055571 +0000 @@ -315,6 +315,8 @@ UIIconPoolGeneral::UIIconPoolGeneral() m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png"); m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png"); @@ -40,10 +40,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/sr m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png"); m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png"); m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ---- VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-07-17 17:09:41.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-07-18 14:00:46.791883698 +0100 -@@ -136,8 +136,10 @@ static const osTypePattern gs_OSTypePatt +diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +--- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-12-19 09:27:51.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-01-16 01:33:36.647056070 +0000 +@@ -138,8 +138,10 @@ static const osTypePattern gs_OSTypePatt { QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" }, { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, { QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" }, @@ -56,11 +56,11 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/sr { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" }, { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc ---- VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-07-17 17:09:41.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-07-18 14:00:46.797883765 +0100 -@@ -250,6 +250,8 @@ - <file alias="os_linux_other.png">images/os_linux_other.png</file> +diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc +--- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-12-19 09:27:33.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2018-01-16 01:33:36.653056131 +0000 +@@ -290,6 +290,8 @@ + <file alias="os_linux26_64.png">images/os_linux26_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> + <file alias="os_mageia.png">images/os_mageia.png</file> @@ -68,9 +68,9 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Frontends/VirtualBox/Vi <file alias="os_mandriva.png">images/os_mandriva.png</file> <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> <file alias="os_netbsd.png">images/os_netbsd.png</file> -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Installer/linux/distributions_rpm VirtualBox-5.1.24.new/src/VBox/Installer/linux/distributions_rpm ---- VirtualBox-5.1.24/src/VBox/Installer/linux/distributions_rpm 2017-07-17 17:10:06.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Installer/linux/distributions_rpm 2017-07-18 14:00:46.952885506 +0100 +diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm +--- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm 2017-12-19 09:28:05.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm 2018-01-16 01:33:36.768057301 +0000 @@ -5,6 +5,16 @@ openSUSE114 = OPENSUSE_11_4 openSUSE113 = OPENSUSE_11_3 sles11.0 = SLES_11_0 @@ -88,10 +88,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Installer/linux/distrib mdv2011.0 = MANDRIVA_2011_0 fedora26 = FEDORA_26 fedora25 = FEDORA_25 -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-5.1.24.new/src/VBox/Installer/linux/VBoxSysInfo.sh ---- VirtualBox-5.1.24/src/VBox/Installer/linux/VBoxSysInfo.sh 2017-07-17 17:10:06.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Installer/linux/VBoxSysInfo.sh 2017-07-18 14:00:46.963885630 +0100 -@@ -43,6 +43,11 @@ get_linux_info () { +diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh +--- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2017-12-19 09:28:04.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh 2018-01-16 01:33:36.786057485 +0000 +@@ -44,6 +44,11 @@ get_linux_info () { # Debian-based system release=`cat /etc/debian_version` print_linux_info "Debian" $release @@ -103,9 +103,9 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Installer/linux/VBoxSys elif [ -r /etc/mandriva-release ] then # Mandriva-based system -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-5.1.24.new/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h ---- VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2017-07-17 17:10:08.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2017-07-18 14:00:47.087887023 +0100 +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h +--- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2017-12-19 09:28:07.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-01-16 01:33:36.851058146 +0000 @@ -921,7 +921,9 @@ enum CIMOSType CIMOSType_CIMOS_Linux_2_6_x = 99, CIMOSType_CIMOS_Linux_2_6_x_64 = 100, @@ -117,9 +117,9 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_ }; /* End of enum CIMOSType Declaration */ -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-5.1.24.new/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h ---- VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2017-07-17 17:10:08.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2017-07-18 14:00:47.097887136 +0100 +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h +--- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2017-12-19 09:28:07.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-01-16 01:33:36.867058309 +0000 @@ -1371,7 +1371,9 @@ enum CIMOSType CIMOSType_CIMOS_Linux_2_6_x = 99, CIMOSType_CIMOS_Linux_2_6_x_64 = 100, @@ -131,10 +131,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/cbinding/VBoxCAPI_ }; /* End of enum CIMOSType Declaration */ -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/include/ovfreader.h VirtualBox-5.1.24.new/src/VBox/Main/include/ovfreader.h ---- VirtualBox-5.1.24/src/VBox/Main/include/ovfreader.h 2017-07-17 17:10:13.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/include/ovfreader.h 2017-07-18 14:00:47.109887271 +0100 -@@ -174,8 +174,10 @@ enum CIMOSType_T +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h +--- VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h 2017-12-19 09:28:09.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h 2018-01-16 01:33:36.875058391 +0000 +@@ -175,8 +175,10 @@ enum CIMOSType_T CIMOSType_CIMOS_CentOS_64 = 107, CIMOSType_CIMOS_OracleEnterpriseLinux = 108, CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, @@ -146,9 +146,9 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/include/ovfreader. }; enum OVFVersion_T -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-all/Global.cpp VirtualBox-5.1.24.new/src/VBox/Main/src-all/Global.cpp ---- VirtualBox-5.1.24/src/VBox/Main/src-all/Global.cpp 2017-07-17 17:10:15.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/src-all/Global.cpp 2017-07-18 14:00:47.128887484 +0100 +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp +--- VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp 2017-12-19 09:28:09.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp 2018-01-16 01:33:36.883058472 +0000 @@ -250,6 +250,17 @@ const Global::OSType Global::sOSTypes[] 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, @@ -167,10 +167,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-all/Global.cpp { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-5.1.24.new/src/VBox/Main/src-server/ApplianceImpl.cpp ---- VirtualBox-5.1.24/src/VBox/Main/src-server/ApplianceImpl.cpp 2017-07-17 17:10:18.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/src-server/ApplianceImpl.cpp 2017-07-18 14:00:47.148887709 +0100 -@@ -163,6 +163,8 @@ g_osTypes[] = +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp +--- VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2017-12-19 09:28:10.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp 2018-01-16 01:33:36.901058655 +0000 +@@ -165,6 +165,8 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux }, { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux }, { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 }, @@ -179,7 +179,7 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-server/Applian { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, -@@ -226,6 +228,7 @@ static const osTypePattern g_osTypesPatt +@@ -228,6 +230,7 @@ static const osTypePattern g_osTypesPatt {"SUSE", VBOXOSTYPE_OpenSUSE}, {"Novell", VBOXOSTYPE_OpenSUSE}, {"Red Hat", VBOXOSTYPE_RedHat}, @@ -187,7 +187,7 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-server/Applian {"Mandriva", VBOXOSTYPE_Mandriva}, {"Ubuntu", VBOXOSTYPE_Ubuntu}, {"Debian", VBOXOSTYPE_Debian}, -@@ -255,6 +258,7 @@ static const osTypePattern g_osTypesPatt +@@ -257,6 +260,7 @@ static const osTypePattern g_osTypesPatt {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, {"Novell", VBOXOSTYPE_OpenSUSE_x64}, {"Red Hat", VBOXOSTYPE_RedHat_x64}, @@ -195,10 +195,10 @@ diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/src-server/Applian {"Mandriva", VBOXOSTYPE_Mandriva_x64}, {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, {"Debian", VBOXOSTYPE_Debian_x64}, -diff -rup -x '*orig' '-x*rej' VirtualBox-5.1.24/src/VBox/Main/xml/Settings.cpp VirtualBox-5.1.24.new/src/VBox/Main/xml/Settings.cpp ---- VirtualBox-5.1.24/src/VBox/Main/xml/Settings.cpp 2017-07-17 17:10:25.000000000 +0100 -+++ VirtualBox-5.1.24.new/src/VBox/Main/xml/Settings.cpp 2017-07-18 14:00:47.168887934 +0100 -@@ -4993,6 +4993,7 @@ const struct { +diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp +--- VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp 2017-12-19 09:28:13.000000000 +0000 ++++ VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp 2018-01-16 01:33:36.914058788 +0000 +@@ -5075,6 +5075,7 @@ const struct { { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, diff --git a/VirtualBox-OSE-4.0.2-aiobug.patch b/VirtualBox-OSE-4.0.2-aiobug.patch index 51c9913..852abd6 100644 --- a/VirtualBox-OSE-4.0.2-aiobug.patch +++ b/VirtualBox-OSE-4.0.2-aiobug.patch @@ -7,22 +7,22 @@ Subject: [PATCH] Disable the aio bug detection src/VBox/Main/src-client/ConsoleImpl2.cpp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---- ./src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2016-12-20 15:36:24.000000000 +0000 -+++ ./src/VBox/Main/src-client/ConsoleImpl2.cpp 2016-12-21 03:04:13.283475098 +0000 -@@ -4095,6 +4095,8 @@ int Console::i_configMediumAttachment(co - mfSnapshotFolderSizeWarningShown = true; - } +--- ./src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2017-12-19 09:28:09.000000000 +0000 ++++ ./src/VBox/Main/src-client/ConsoleImpl2.cpp 2018-01-15 19:26:06.266469662 +0000 +@@ -4052,6 +4052,8 @@ int Console::i_checkMediumLocation(IMedi + mfSnapshotFolderSizeWarningShown = true; + } +// In el6 we have a backported patch to address this +#if 0 #ifdef RT_OS_LINUX - /* - * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located -@@ -4172,6 +4174,7 @@ int Console::i_configMediumAttachment(co - fUseHostIOCache = true; - } + /* + * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located +@@ -4129,6 +4131,7 @@ int Console::i_checkMediumLocation(IMedi + *pfUseHostIOCache = true; + } #endif +#endif - } - } + } + #undef H diff --git a/VirtualBox.spec b/VirtualBox.spec index de43a7f..0d932ab 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -31,9 +31,9 @@ %bcond_with vboxvideo_drv Name: VirtualBox -Version: 5.1.30 +Version: 5.2.4 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -114,8 +114,6 @@ BuildRequires: makeself BuildRequires: libstdc++-static(x86-32) libgcc(x86-32) BuildRequires: libstdc++-static(x86-64) BuildRequires: glibc-devel(x86-32) -# Quick fix for https://pagure.io/releng/issue/6958 and https://bugzilla.redhat.com/show_bug.cgi?id=1484849 -BuildRequires: nss-softokn-freebl(x86-32) %else BuildRequires: libstdc++-static %endif @@ -272,7 +270,7 @@ rm -r src/libs/zlib-1.2.8/ %if ! %{with vboxvideo_drv} %patch24 -p1 -b .xserver_guest_xorg19 %endif -%patch26 -p1 -b .nobundles +#patch26 -p1 -b .nobundles #patch27 -p1 -b .gcc %if 0%{?fedora} > 20 %patch28 -p1 -b .gsoap2 @@ -324,6 +322,14 @@ kmk %{_smp_mflags} \ VBOX_WITH_SYSFS_BY_DEFAULT=1 \ VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ + VBOX_USE_SYSTEM_GL_HEADERS=1 \ + VBOX_NO_LEGACY_XORG_X11=1 \ + SDK_VBOX_LIBPNG_INCS=/usr/include/libpng16 \ + SDK_VBOX_LIBXML2_INCS=/usr/include/libxml2 \ + SDK_VBOX_OPENSSL_INCS= \ + SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ + SDK_VBOX_ZLIB_INCS= \ + %if %{with docs} VBOX_WITH_DOCS=1 \ # doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml @@ -761,6 +767,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Mon Jan 15 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.4-1 +- Update VBox to 5.2.4 + * Wed Nov 08 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.30-2 - Restore kmk configurations VBOX_PATH_APP_PRIVATE and VBOX_PATH_APP_DOCS rfbz(#4701) diff --git a/sources b/sources index 9a6184e..22e3107 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dadcb625f72b8b36a374a52526c682a VirtualBox-5.1.30.tar.bz2 +39ff35df4e3a0a9d7598c4e69a2fb2a3 VirtualBox-5.2.4.tar.bz2