diff --git a/.gitignore b/.gitignore index de4d12c..1765838 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /VirtualBox-5.2.18.tar.bz2 /VirtualBox-5.2.20.tar.bz2 /VirtualBox-5.2.22.tar.bz2 +/VirtualBox-6.0.0.tar.bz2 diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch index 625d554..63447ad 100644 --- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch +++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch @@ -10,19 +10,18 @@ Signed-off-by: Hans de Goede 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 -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 +--- ./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 #include #include +#include #include - #include #include -@@ -77,6 +78,9 @@ RT_C_DECLS_END - # endif + #include +@@ -117,6 +118,9 @@ RT_C_DECLS_END + # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH #endif +#ifndef MAX_MNTOPT_STR @@ -30,31 +29,32 @@ index aa15d8b1..551edd4a 100644 +#endif /********************************************************************************************************************************* - * 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)) + * Structures and Typedefs * +@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld + int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts); + if (RT_SUCCESS(rc)) { --#ifdef RT_OS_SOLARIS - char szOptBuf[MAX_MNTOPT_STR] = { '\0', }; ++ char szOptBuf[MAX_MNTOPT_STR] = { '\0', }; + RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o", -+ pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask); -+#ifdef RT_OS_SOLARIS ++ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask); + # ifdef RT_OS_SOLARIS int fFlags = 0; - if (pOpts->ronly) + if (Opts.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", -- pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask); +- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask); int r = mount(pszShareName, pszMountPoint, fFlags | MS_OPTIONSTR, -@@ -320,32 +324,11 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM +@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld - #elif defined(RT_OS_LINUX) + # else /* 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,13 +62,14 @@ index aa15d8b1..551edd4a 100644 - mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2; - mntinf.length = sizeof(mntinf); - -- 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; +- 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'; - - strcpy(mntinf.name, pszShareName); - strcpy(mntinf.nls_name, "\0"); @@ -82,7 +83,7 @@ index aa15d8b1..551edd4a 100644 if (r == 0) { VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint); -@@ -378,34 +361,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM +@@ -481,34 +462,6 @@ static int vbsvcAutoMountSharedFolderOld } else /* r == -1, we got some error in errno. */ { @@ -117,14 +118,14 @@ index aa15d8b1..551edd4a 100644 switch (errno) { /* If we get EINVAL here, the system already has mounted the Shared Folder to another -@@ -424,7 +379,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM +@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld rc = RTErrConvertFromErrno(errno); break; } - } } - #else - # error "PORTME" + # endif + } -- 2.14.3 diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch deleted file mode 100644 index 18178b3..0000000 --- a/VirtualBox-5.0.18-xserver_guest.patch +++ /dev/null @@ -1,43 +0,0 @@ -Copyright (c) 2016 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. - -Using also VBOX_USE_SYSTEM_XORG_HEADERS to build guest additions parts, -just compile with X11 system source and we may remove all bundle X11 source code. - -when we use VBOX_USE_SYSTEM_XORG_HEADERS, we don't need compile the very old -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. - ---- ./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 diff --git a/sources b/sources index fddf9e3..cfb5c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (VirtualBox-5.2.22.tar.bz2) = 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722 +SHA512 (VirtualBox-6.0.0.tar.bz2) = fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561 diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec index 39553cb..d19ab1a 100644 --- a/virtualbox-guest-additions.spec +++ b/virtualbox-guest-additions.spec @@ -1,7 +1,7 @@ %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions Name: virtualbox-guest-additions -Version: 5.2.22 +Version: 6.0.0 Release: 1%{?dist} Summary: VirtualBox Guest Additions License: GPLv2 or (GPLv2 and CDDL) @@ -13,8 +13,6 @@ Source2: 96-vbox.preset Source3: VirtualBox-60-vboxguest.rules Source4: VBoxOGLRun.sh -# Small compile fix -Patch1: VirtualBox-5.0.18-xserver_guest.patch # 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 @@ -198,6 +196,9 @@ getent passwd vboxadd >/dev/null || \ %changelog +* 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