[VirtualBox/f28] Revert "VirtualBox 6.0"

commit 5b6b2ab05c36fd89c084a7cc7c0e345b0927110d Author: Vasiliy Glazov <v.glazov(a)javad.com&gt; Date: Fri Jan 18 09:27:58 2019 +0300 Revert "VirtualBox 6.0" This reverts commit c40c42287ea5a119a533b80388c734a198d396ed. .gitignore | 2 - ...AutoMount-Change-Linux-mount-code-to-use-.patch | 63 +++++++------- VirtualBox-5.0.18-xserver_guest.patch | 54 ++++++++++++ VirtualBox-5.1.0-add-Mageia-support.patch | 99 ++++++++++++---------- VirtualBox-OSE-4.1.4-noupdate.patch | 22 +++++ VirtualBox.spec | 75 +++++++--------- sources | 3 +- 7 files changed, 196 insertions(+), 122 deletions(-) --- diff --git a/.gitignore b/.gitignore index 09fb549..d50a20c 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,3 @@ VirtualBox-5.0.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 -/UserManual.pdf diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch index 63447ad..625d554 100644 --- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch +++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch @@ -10,18 +10,19 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com&gt; 1 file changed, 8 insertions(+), 54 deletions(-) diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp ---- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2018-11-25 02:36:31.829306539 +0000 -+++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-11-25 02:41:41.632973288 +0000 -@@ -40,6 +40,7 @@ - #include <iprt/ctype.h> +index aa15d8b1..551edd4a 100644 +--- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp ++++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp +@@ -39,6 +39,7 @@ + #include <iprt/assert.h> #include <iprt/dir.h> #include <iprt/mem.h> +#include <iprt/param.h> #include <iprt/path.h> + #include <iprt/string.h> #include <iprt/semaphore.h> - #include <iprt/sort.h> -@@ -117,6 +118,9 @@ RT_C_DECLS_END - # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH +@@ -77,6 +78,9 @@ RT_C_DECLS_END + # endif #endif +#ifndef MAX_MNTOPT_STR @@ -29,32 +30,31 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr +#endif /********************************************************************************************************************************* - * Structures and Typedefs * -@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld - int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts); - if (RT_SUCCESS(rc)) + * Global Variables * +@@ -297,13 +301,13 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM + rc = vbsvcAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts); + if (!fSkip && RT_SUCCESS(rc)) { -+ char szOptBuf[MAX_MNTOPT_STR] = { '\0', }; +-#ifdef RT_OS_SOLARIS + char szOptBuf[MAX_MNTOPT_STR] = { '\0', }; + RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o", -+ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask); - # ifdef RT_OS_SOLARIS ++ pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask); ++#ifdef RT_OS_SOLARIS int fFlags = 0; - if (Opts.ronly) + if (pOpts->ronly) fFlags |= MS_RDONLY; -- char szOptBuf[MAX_MNTOPT_STR] = { '\0', }; - RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o", -- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask); +- pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask); int r = mount(pszShareName, pszMountPoint, fFlags | MS_OPTIONSTR, -@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld +@@ -320,32 +324,11 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM - # else /* RT_OS_LINUX */ + #elif defined(RT_OS_LINUX) unsigned long fFlags = MS_NODEV; - - /*const char *szOptions = { "rw" }; - ??? */ - struct vbsf_mount_info_new mntinf; -- RT_ZERO(mntinf); - - mntinf.nullchar = '\0'; - mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0; @@ -62,14 +62,13 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr - mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2; - mntinf.length = sizeof(mntinf); - -- mntinf.uid = Opts.uid; -- mntinf.gid = Opts.gid; -- mntinf.ttl = Opts.ttl; -- mntinf.dmode = Opts.dmode; -- mntinf.fmode = Opts.fmode; -- mntinf.dmask = Opts.dmask; -- mntinf.fmask = Opts.fmask; -- mntinf.tag[0] = '\0'; +- mntinf.uid = pOpts->uid; +- mntinf.gid = pOpts->gid; +- mntinf.ttl = pOpts->ttl; +- mntinf.dmode = pOpts->dmode; +- mntinf.fmode = pOpts->fmode; +- mntinf.dmask = pOpts->dmask; +- mntinf.fmask = pOpts->fmask; - - strcpy(mntinf.name, pszShareName); - strcpy(mntinf.nls_name, "\0"); @@ -83,7 +82,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr if (r == 0) { VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint); -@@ -481,34 +462,6 @@ static int vbsvcAutoMountSharedFolderOld +@@ -378,34 +361,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM } else /* r == -1, we got some error in errno. */ { @@ -118,14 +117,14 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr switch (errno) { /* If we get EINVAL here, the system already has mounted the Shared Folder to another -@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld +@@ -424,7 +379,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM rc = RTErrConvertFromErrno(errno); break; } - } } - # endif - } + #else + # error "PORTME" -- 2.14.3 diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch new file mode 100644 index 0000000..bf846ab --- /dev/null +++ b/VirtualBox-5.0.18-xserver_guest.patch @@ -0,0 +1,54 @@ +Copyright (c) 2018 Sérgio Basto + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The MIT License is to allow be in included in VirtualBox source code. + +We don't need compile the very old VBoxGuestR3LibXFree86, latest XFree86/X windows +server was release is dated of 2007 and because fail to build when +we unbundle all X11 sources, files like xf86_ansic.h no longer doesn't exist. +The question is if we use VBOX_USE_SYSTEM_XORG_HEADERS or +VBOX_USE_SYSTEM_GL_HEADERS or VBOX_NO_LEGACY_XORG_X11 + +/usr/include/x11 never existed we only have /usr/include/X11 (with capital X), +IIRC was I that introduce this typo (when we added VBOX_USE_SYSTEM_XORG_HEADERS) + +--- ./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 + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) ++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS + LIBRARIES += \ + VBoxGuestR3LibXFree86 + endif ++ endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + LIBRARIES += \ + VBoxGuestR3LibXOrg +--- ./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 + vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES) diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch index 0b01e8b..9e9682b 100644 --- a/VirtualBox-5.1.0-add-Mageia-support.patch +++ b/VirtualBox-5.1.0-add-Mageia-support.patch @@ -1,6 +1,7 @@ ---- ./include/VBox/ostypes.h.orig 2018-12-01 15:08:30.394341093 +0000 -+++ ./include/VBox/ostypes.h 2018-12-01 15:08:50.805529628 +0000 -@@ -108,6 +108,8 @@ typedef enum VBOXOSTYPE +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, VBOXOSTYPE_Oracle_x64 = 0x5E100, @@ -9,8 +10,9 @@ VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, ---- ./src/VBox/Additions/linux/installer/vboxadd-x11.sh.orig 2018-12-01 15:08:30.395341102 +0000 -+++ ./src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-12-01 15:08:50.806529637 +0000 +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" @@ -26,9 +28,10 @@ if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ] then install -m 0644 $app_src "$mandriva_dir/$app_dest" ---- ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2018-12-01 15:08:30.395341102 +0000 -+++ ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-12-01 15:08:50.806529637 +0000 -@@ -331,6 +331,8 @@ UIIconPoolGeneral::UIIconPoolGeneral() +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"); m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png"); @@ -37,9 +40,10 @@ m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png"); m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png"); m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); ---- ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.orig 2018-12-01 15:08:30.396341111 +0000 -+++ ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-12-01 15:08:50.807529646 +0000 -@@ -143,8 +143,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" }, @@ -52,20 +56,22 @@ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" }, { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, ---- ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.orig 2018-12-01 15:08:30.397341121 +0000 -+++ ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2018-12-01 15:08:50.807529646 +0000 -@@ -57,6 +57,8 @@ - <file alias="os_linux.png">images/os_linux.png</file> - <file alias="os_macosx_64.png">images/os_macosx_64.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_mageia_64.png">images/os_mageia_64.png</file> + <file alias="os_macosx_64.png">images/os_macosx_64.png</file> + <file alias="os_mageia.png">images/os_mageia.png</file> - <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> ++ <file alias="os_mageia_64.png">images/os_mageia_64.png</file> <file alias="os_mandriva.png">images/os_mandriva.png</file> - <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file> ---- ./src/VBox/Installer/linux/distributions_rpm.orig 2018-12-01 15:08:30.397341121 +0000 -+++ ./src/VBox/Installer/linux/distributions_rpm 2018-12-01 15:08:50.808529655 +0000 -@@ -6,6 +6,16 @@ openSUSE114 = OPENSUSE_11_4 + <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> + <file alias="os_netbsd.png">images/os_netbsd.png</file> +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 sles10.1 = SLES_10_1 @@ -82,8 +88,9 @@ mdv2011.0 = MANDRIVA_2011_0 fedora29 = FEDORA_29 fedora26 = FEDORA_26 ---- ./src/VBox/Installer/linux/VBoxSysInfo.sh.orig 2018-12-01 15:08:30.397341121 +0000 -+++ ./src/VBox/Installer/linux/VBoxSysInfo.sh 2018-12-01 15:08:50.808529655 +0000 +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` @@ -96,8 +103,9 @@ elif [ -r /etc/mandriva-release ] then # Mandriva-based system ---- ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h.orig 2018-12-01 15:08:30.399341139 +0000 -+++ ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-12-01 15:08:50.809529665 +0000 +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, @@ -109,8 +117,9 @@ }; /* End of enum CIMOSType Declaration */ ---- ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h.orig 2018-12-01 15:08:30.400341148 +0000 -+++ ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-12-01 15:08:50.810529674 +0000 +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, @@ -122,8 +131,9 @@ }; /* End of enum CIMOSType Declaration */ ---- ./src/VBox/Main/include/ovfreader.h.orig 2018-12-01 15:08:30.401341158 +0000 -+++ ./src/VBox/Main/include/ovfreader.h 2018-12-01 15:08:50.811529683 +0000 +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, @@ -136,10 +146,11 @@ }; enum OVFVersion_T ---- ./src/VBox/Main/src-all/Global.cpp.orig 2018-12-01 15:08:30.401341158 +0000 -+++ ./src/VBox/Main/src-all/Global.cpp 2018-12-01 15:08:50.811529683 +0000 -@@ -251,6 +251,17 @@ const Global::OSType Global::sOSTypes[] - 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +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 }, + { "Linux", "Linux", "Mageia", "Mageia (32-bit)", @@ -155,10 +166,11 @@ + { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, - 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ---- ./src/VBox/Main/src-server/ApplianceImpl.cpp.orig 2018-12-01 15:08:30.402341167 +0000 -+++ ./src/VBox/Main/src-server/ApplianceImpl.cpp 2018-12-01 15:08:50.812529693 +0000 -@@ -132,6 +132,8 @@ static struct + 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +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 }, @@ -167,7 +179,7 @@ { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, -@@ -195,6 +197,7 @@ static const osTypePattern g_aOsTypesPat +@@ -228,6 +230,7 @@ static const osTypePattern g_osTypesPatt {"SUSE", VBOXOSTYPE_OpenSUSE}, {"Novell", VBOXOSTYPE_OpenSUSE}, {"Red Hat", VBOXOSTYPE_RedHat}, @@ -175,7 +187,7 @@ {"Mandriva", VBOXOSTYPE_Mandriva}, {"Ubuntu", VBOXOSTYPE_Ubuntu}, {"Debian", VBOXOSTYPE_Debian}, -@@ -224,6 +227,7 @@ static const osTypePattern g_aOsTypesPat +@@ -257,6 +260,7 @@ static const osTypePattern g_osTypesPatt {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, {"Novell", VBOXOSTYPE_OpenSUSE_x64}, {"Red Hat", VBOXOSTYPE_RedHat_x64}, @@ -183,9 +195,10 @@ {"Mandriva", VBOXOSTYPE_Mandriva_x64}, {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, {"Debian", VBOXOSTYPE_Debian_x64}, ---- ./src/VBox/Main/xml/Settings.cpp.orig 2018-12-01 15:08:30.403341176 +0000 -+++ ./src/VBox/Main/xml/Settings.cpp 2018-12-01 15:08:50.814529711 +0000 -@@ -5387,6 +5387,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.1.4-noupdate.patch b/VirtualBox-OSE-4.1.4-noupdate.patch new file mode 100644 index 0000000..ec31011 --- /dev/null +++ b/VirtualBox-OSE-4.1.4-noupdate.patch @@ -0,0 +1,22 @@ +From 631f2a6aa525f51fa38a3b59550d80e452181e5f Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel <lkundrak(a)v3.sk&gt; +Date: Wed, 28 Apr 2010 11:53:40 +0200 +Subject: [PATCH 1/4] Disable automatic check for updates + +Our OS provides superior way of dealing with updates (PackageKit). +Let's not bug the user with updates that are not yet packaged. +--- + .../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +--- 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 +@@ -163,7 +163,7 @@ + if (m_dayList.isEmpty()) + populate(); + PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0])); +- m_periodIndex = index == PeriodUndefined ? Period1Day : index; ++ m_periodIndex = index == PeriodUndefined ? PeriodNever : index; + } + + /* Parse 'date' value: */ diff --git a/VirtualBox.spec b/VirtualBox.spec index bb05c83..4f502bf 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -13,19 +13,22 @@ # major version number, while the kernel module abi is not guaranteed # to be stable. This is so that we force the module update in sync with # userspace. -#global prerel RC1 -%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} +#global prerel 106108 +%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')} %ifarch x86_64 %bcond_without webservice %else %bcond_with webservice %endif -# Now we use upstream pdf -%bcond_with docs +# el7 doesn't have all texlive requirements +%if 0%{?rhel} + %bcond_with docs +%else + %bcond_without docs +%endif %bcond_without vnc %bcond_with legacy_vboxvideo_drv - %if 0%{?fedora} > 27 %bcond_with guest_additions %else @@ -33,8 +36,9 @@ %endif Name: VirtualBox -Version: 6.0.0 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 5.2.22 +#Release: 1%%{?prerel:.%%{prerel}}%%{?dist} +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -47,7 +51,6 @@ Requires: %{name}-server%{?isa} = %{version} Obsoletes: %{name}-qt Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtua... -Source1: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/UserMa... Source3: VirtualBox-60-vboxdrv.rules Source4: VirtualBox.modules Source5: VirtualBox-60-vboxguest.rules @@ -58,9 +61,10 @@ Source9: VBoxOGLRun.sh Source10: vboxweb.service Source20: os_mageia.png Source21: os_mageia_64.png -Patch1: VirtualBox-6.0.0-noupdate.patch +Patch1: VirtualBox-OSE-4.1.4-noupdate.patch Patch2: VirtualBox-5.1.0-strings.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch +Patch23: VirtualBox-5.0.18-xserver_guest.patch Patch27: VirtualBox-gcc.patch # from Debian Patch28: 02-gsoap-build-fix.patch @@ -244,7 +248,7 @@ which is generated during the build of main package. %prep -%setup -q -n %{name}-%{version}%{?prereltag} +%setup -q # add Mageia images cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/ @@ -270,16 +274,19 @@ rm -r src/libs/zlib-1.2.8/ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch18 -p1 -b .aiobug +%patch23 -p1 -b .xserver_guest #patch27 -p1 -b .gcc %if 0%{?fedora} > 20 %patch28 -p1 -b .gsoap2 %endif -# mageia support not ready for 6.0 -#patch50 -p1 -b .mageia-support +%patch50 -p1 -b .mageia-support %patch51 -p1 -b .revert-VBox.sh %patch60 -p1 -b .xclient %patch61 -p1 -b .automount -#patch70 -p1 -b .kernel_4.20.patch +%patch70 -p1 -b .kernel_4.20.patch + +# CRLF->LF +sed -i 's/\r//' COPYING %build ./configure --disable-kmods \ @@ -293,10 +300,6 @@ rm -r src/libs/zlib-1.2.8/ --disable-docs \ %endif -%if !%{with docs} -cp %{SOURCE1} UserManual.pdf -%endif - #--enable-vde #--build-headless --build-libxml2 #--disable-java @@ -324,6 +327,7 @@ kmk %{_smp_mflags} \ VBOX_WITH_EXTPACK_VBOXDTRACE= \ VBOX_WITH_VBOX_IMG=1 \ 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 \ %{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \ @@ -333,12 +337,12 @@ kmk %{_smp_mflags} \ SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ SDK_VBOX_ZLIB_INCS="" \ %{?with_docs: VBOX_WITH_DOCS=1 } \ - VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ - VBOX_WITH_UPDATE_REQUEST= \ + VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ + VBOX_WITH_UPDATE_REQUEST=0 \ VBOX_BUILD_PUBLISHER=%{publisher} -# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ - +# VBOX_PATH_DOCBOOK_DTD=/usr/share/sgml/docbook/xml-dtd-4.5/ \ +# VBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-stylesheets/ \ # doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml # VBOX_WITH_DOCS_TRANSLATIONS=1 \ # we can't build CHM DOCS we need hhc.exe which is not in source and we need @@ -413,8 +417,6 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/vboxshell.py \ obj/bin/vbox-img \ obj/bin/VBoxDTrace \ - obj/bin/VBoxBugReport \ - obj/bin/VirtualBoxVM \ %if %{with webservice} obj/bin/vboxwebsrv \ obj/bin/webtest \ @@ -443,9 +445,6 @@ ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv %endif ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img -#ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER% - - # Components, preserve symlinks cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/ @@ -568,14 +567,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop # mv ExtensionPacks/VNC $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks #fi #set_selinux_permissions /usr/lib/virtualbox /usr/share/virtualbox +#for i in rdesktop-vrdp.tar.gz rdesktop-vrdp-keymaps; do +# mv $i $RPM_BUILD_ROOT/usr/share/virtualbox; done +#mv rdesktop-vrdp $RPM_BUILD_ROOT/usr/bin +# # vboxautostart-service -install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps -install -D obj/bin/rdesktop-vrdp-keymaps/* %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps -install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz -install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp - - %pre # Group for USB devices getent group vboxusers >/dev/null || groupadd -r vboxusers @@ -668,8 +665,6 @@ getent passwd vboxadd >/dev/null || \ %doc doc/*cpp doc/VMM %if %{with docs} %doc obj/bin/UserManual*.pdf -%else -%doc UserManual.pdf %endif %license COPYING* %{_bindir}/VBoxManage @@ -690,9 +685,9 @@ getent passwd vboxadd >/dev/null || \ %{_bindir}/vboxautostart %{_bindir}/vbox-img %{_bindir}/VBoxTunctl -%{_bindir}/rdesktop-vrdp %dir %{_libdir}/virtualbox %{_libdir}/virtualbox/*.[^p]* +%exclude %{_libdir}/virtualbox/VirtualBox.so %exclude %{_libdir}/virtualbox/VBoxDbg.so %exclude %{_libdir}/virtualbox/VBoxPython2_7.so %{_libdir}/virtualbox/components @@ -706,10 +701,8 @@ getent passwd vboxadd >/dev/null || \ %{_libdir}/virtualbox/SUPUninstall %{_libdir}/virtualbox/VBoxAutostart %{_libdir}/virtualbox/VBoxVMMPreload -%{_libdir}/virtualbox/VBoxBugReport %{_libdir}/virtualbox/VBoxDTrace %{_libdir}/virtualbox/vbox-img -%{_libdir}/virtualbox/rdesktop-vrdp-keymaps # This permissions have to be here, before generator of debuginfo need # permissions to read this files %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT @@ -718,8 +711,7 @@ getent passwd vboxadd >/dev/null || \ %attr(4511,root,root) %{_libdir}/virtualbox/VBoxSDL %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl -%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM -%{_libdir}/virtualbox/VirtualBox +%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBox %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/mimetypes/*.png %{_datadir}/icons/hicolor/scalable/mimetypes/virtualbox.svg @@ -734,6 +726,7 @@ getent passwd vboxadd >/dev/null || \ %{_bindir}/VirtualBox %{_bindir}/virtualbox %{_libdir}/virtualbox/VBoxTestOGL +%{_libdir}/virtualbox/VirtualBox.so %{_libdir}/virtualbox/VBoxDbg.so %{_libdir}/virtualbox/nls %{_datadir}/pixmaps/*.png @@ -784,10 +777,6 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog -* Sun Dec 30 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.0-1 -- VirtualBox 6.0 -- Patch23 was applied upstream. - * Fri Nov 09 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.22-1 - Update VBox to 5.2.22 - Reenable noupdate.patch diff --git a/sources b/sources index 7715016..343ea52 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -7008d8ea52e62f50cd9990152326d8d7 VirtualBox-6.0.0.tar.bz2 -3fc65d20a1722d0a3143fdcc444ce7df UserManual.pdf +c9c2f162ac5f99d28d8c0ca43b19ed01 VirtualBox-5.2.22.tar.bz2