From d38ec1eab08fd9eb98b917e4a61372fc8a9bdcee Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Mar 07 2019 02:52:15 +0000 Subject: Update Virtualbox Guest Additions to 6.0.4 --- diff --git a/.gitignore b/.gitignore index de91acf..3697998 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ /VirtualBox-5.2.18.tar.bz2 /VirtualBox-5.2.20.tar.bz2 /VirtualBox-5.2.22.tar.bz2 -/VirtualBox-5.2.24.tar.bz2 +/VirtualBox-6.0.0.tar.bz2 +/VirtualBox-6.0.2.tar.bz2 +/VirtualBox-6.0.4.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/sources b/sources index 3e32ca1..e96d9c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (VirtualBox-5.2.24.tar.bz2) = 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410 +SHA512 (VirtualBox-6.0.4.tar.bz2) = c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb diff --git a/update_vbox.sh b/update_vbox.sh index f8fef83..8d8e7e8 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,9 +1,9 @@ -VERSION=5.2.22 +VERSION=6.0.4 REL=1 -RAWHIDE=30 +RAWHIDE=31 git pull -rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to $VERSION, bugfix version" virtualbox-guest-additions.spec +rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to $VERSION" virtualbox-guest-additions.spec spectool -g virtualbox-guest-additions.spec fedpkg new-sources ./VirtualBox-$VERSION.tar.bz2 fedpkg srpm && copr-cli build sergiomb/vboxfor23 virtualbox-guest-additions-$VERSION-$REL.fc$RAWHIDE.src.rpm diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec index 8d7f705..1eccc7f 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.24 +Version: 6.0.4 Release: 1%{?dist} Summary: VirtualBox Guest Additions License: GPLv2 or (GPLv2 and CDDL) @@ -196,8 +196,21 @@ getent passwd vboxadd >/dev/null || \ %changelog -* Tue Jan 22 2019 Hans de Goede - 5.2.24-1 -- Update Virtualbox Guest Additions to 5.2.24, security fix version +* Thu Mar 07 2019 Sérgio Basto - 6.0.4-1 +- Update Virtualbox Guest Additions to 6.0.4 + +* Sun Feb 03 2019 Fedora Release Engineering - 6.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Hans de Goede - 6.0.2-1 +- Update Virtualbox Guest Additions to 6.0.2, security fix version + +* Mon Jan 14 2019 Björn Esser - 6.0.0-2 +- Rebuilt for libcrypt.so.2 (#1666033) +- Add a patch to fix build on Fedora 30 + +* 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