public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/virtualbox-guest-additions] alext-upd-to-7.2.12: Update Virtualbox Guest Additions to 6.0.6
Date: Sun, 12 Jul 2026 20:57:50 GMT [thread overview]
Message-ID: <178388987031.1.5279168236669387881.rpms-virtualbox-guest-additions-b22ed686b18c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/virtualbox-guest-additions
Branch : alext-upd-to-7.2.12
Commit : b22ed686b18c7e13729e043b6ff12e166a33e5d0
Author : Sérgio M. Basto <sergio@serjux.com>
Date : 2019-04-26T17:57:10+01:00
Stats : +27/-17 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/virtualbox-guest-additions/c/b22ed686b18c7e13729e043b6ff12e166a33e5d0?branch=alext-upd-to-7.2.12
Log:
Update Virtualbox Guest Additions to 6.0.6
---
diff --git a/.gitignore b/.gitignore
index 3697998..5ea5234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/VirtualBox-6.0.0.tar.bz2
/VirtualBox-6.0.2.tar.bz2
/VirtualBox-6.0.4.tar.bz2
+/VirtualBox-6.0.6.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 5af60f9..6bbabc3 100644
--- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -10,8 +10,8 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
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
+--- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2019-04-16 11:09:11.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2019-04-26 17:10:47.178485356 +0100
@@ -40,6 +40,7 @@
#include <iprt/ctype.h>
#include <iprt/dir.h>
@@ -20,7 +20,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
#include <iprt/path.h>
#include <iprt/semaphore.h>
#include <iprt/sort.h>
-@@ -117,6 +118,9 @@ RT_C_DECLS_END
+@@ -114,6 +115,9 @@ RT_C_DECLS_END
# define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
#endif
@@ -30,7 +30,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
/*********************************************************************************************************************************
* Structures and Typedefs *
-@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld
+@@ -400,13 +399,13 @@ static int vbsvcAutoMountSharedFolderOld
int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
if (RT_SUCCESS(rc))
{
@@ -47,7 +47,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
int r = mount(pszShareName,
pszMountPoint,
fFlags | MS_OPTIONSTR,
-@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld
+@@ -423,35 +422,11 @@ static int vbsvcAutoMountSharedFolderOld
# else /* RT_OS_LINUX */
unsigned long fFlags = MS_NODEV;
@@ -69,7 +69,8 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
- mntinf.fmode = Opts.fmode;
- mntinf.dmask = Opts.dmask;
- mntinf.fmask = Opts.fmask;
-- mntinf.tag[0] = '\0';
+- mntinf.cMaxIoPages = Opts.cMaxIoPages;
+- mntinf.szTag[0] = '\0';
-
- strcpy(mntinf.name, pszShareName);
- strcpy(mntinf.nls_name, "\0");
@@ -83,7 +84,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
+@@ -484,34 +459,6 @@ static int vbsvcAutoMountSharedFolderOld
}
else /* r == -1, we got some error in errno. */
{
@@ -118,7 +119,7 @@ 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
+@@ -530,7 +477,6 @@ static int vbsvcAutoMountSharedFolderOld
rc = RTErrConvertFromErrno(errno);
break;
}
@@ -126,7 +127,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
}
# endif
}
-@@ -1417,45 +1417,21 @@ static int vbsvcAutomounterMountIt(PVBSV
+@@ -1464,51 +1410,21 @@ static int vbsvcAutomounterMountIt(PVBSV
}
# if defined(RT_OS_LINUX)
@@ -142,13 +143,19 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
- MntInfo.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
- MntInfo.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
- MntInfo.length = sizeof(MntInfo);
+- MntInfo.ttl = MntOpts.uid = -1 /*default*/;
+- MntInfo.msDirCacheTTL= MntOpts.msDirCacheTTL = -1 /*default*/;
+- MntInfo.msInodeTTL = MntOpts.msInodeTTL = -1 /*default*/;
+- MntInfo.cMaxIoPages = MntOpts.cMaxIoPages = 0 /*default*/;
+- MntInfo.cbDirBuf = MntOpts.cbDirBuf = 0 /*default*/;
+- MntInfo.enmCacheMode = MntOpts.enmCacheMode = kVbsfCacheMode_Default;
- MntInfo.uid = MntOpts.uid = 0;
- MntInfo.gid = MntOpts.gid = gidMount;
- MntInfo.dmode = MntOpts.dmode = 0770;
- MntInfo.fmode = MntOpts.fmode = 0770;
- MntInfo.dmask = MntOpts.dmask = 0000;
- MntInfo.fmask = MntOpts.fmask = 0000;
-- memcpy(MntInfo.tag, g_szTag, sizeof(g_szTag)); AssertCompile(sizeof(MntInfo.tag) >= sizeof(g_szTag));
+- memcpy(MntInfo.szTag, g_szTag, sizeof(g_szTag)); AssertCompile(sizeof(MntInfo.szTag) >= sizeof(g_szTag));
- rc = RTStrCopy(MntInfo.name, sizeof(MntInfo.name), pEntry->pszName);
- if (RT_FAILURE(rc))
+ unsigned long fFlags = MS_NODEV;
@@ -180,6 +187,3 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
return VINF_SUCCESS;
}
else if (errno == EINVAL)
---
-2.14.3
-
diff --git a/sources b/sources
index e96d9c2..db72d42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.0.4.tar.bz2) = c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
+SHA512 (VirtualBox-6.0.6.tar.bz2) = eb71ca94220680ac6cba7af13eb9eef132c21e57b1b27d6bc3c564bba58b000e682d19e36b63660bfa4f4471cd0632d365659ef8c4e3e526931622901a432d1b
diff --git a/update_vbox.sh b/update_vbox.sh
index 8d8e7e8..6e0e345 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.0.4
+VERSION=6.0.6
REL=1
RAWHIDE=31
@@ -12,6 +12,8 @@ fedpkg ci -c && git show
echo Press enter to continue; read dummy;
fedpkg push && fedpkg build --nowait
echo Press enter to continue; read dummy;
+git checkout f30 && git merge master && git push && fedpkg build --nowait; git checkout master
+echo Press enter to continue; read dummy;
git checkout f29 && git merge master && git push && fedpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
git checkout f28 && git merge master && git push && fedpkg build --nowait; git checkout master
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 0a84647..ae3e97f 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,8 +1,8 @@
%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
Name: virtualbox-guest-additions
-Version: 6.0.4
-Release: 2%{?dist}
+Version: 6.0.6
+Release: 1%{?dist}
Summary: VirtualBox Guest Additions
License: GPLv2 or (GPLv2 and CDDL)
URL: https://www.virtualbox.org/wiki/VirtualBox
@@ -192,6 +192,9 @@ getent passwd vboxadd >/dev/null || \
%changelog
+* Fri Apr 26 2019 Sérgio Basto <sergio@serjux.com> - 6.0.6-1
+- Update Virtualbox Guest Additions to 6.0.6
+
* Wed Mar 20 2019 Hans de Goede <hdegoede@redhat.com> - 6.0.4-2
- Fix automounted shares not working on 6.0.x hosts
reply other threads:[~2026-07-12 20:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178388987031.1.5279168236669387881.rpms-virtualbox-guest-additions-b22ed686b18c@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox