[VirtualBox] Rebase 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
by Sérgio M. Basto
commit 600f34653176b66e85e9969d83f61ed0a6c3ac5b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 17 21:21:52 2019 +0100
Rebase 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
...AutoMount-Change-Linux-mount-code-to-use-.patch | 128 +++++++++++++++++++++
VirtualBox.spec | 7 +-
2 files changed, 134 insertions(+), 1 deletion(-)
---
diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
new file mode 100644
index 0000000..aea6a09
--- /dev/null
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -0,0 +1,128 @@
+From 369dd2ee3c82c4417fee04aeec933c74fd198e78 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Tue, 23 Jan 2018 15:09:20 +0100
+Subject: [PATCH resend] VBoxServiceAutoMount: Change Linux mount code to use
+ an options string
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ .../common/VBoxService/VBoxServiceAutoMount.cpp | 62 +++-------------------
+ 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 2019-04-16 11:09:11.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2019-04-17 21:12:19.605885561 +0100
+@@ -40,6 +40,7 @@
+ #include <iprt/ctype.h>
+ #include <iprt/dir.h>
+ #include <iprt/mem.h>
++#include <iprt/param.h>
+ #include <iprt/path.h>
+ #include <iprt/semaphore.h>
+ #include <iprt/sort.h>
+@@ -114,6 +115,9 @@ RT_C_DECLS_END
+ # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
+ #endif
+
++#ifndef MAX_MNTOPT_STR
++#define MAX_MNTOPT_STR PAGE_SIZE
++#endif
+
+ /*********************************************************************************************************************************
+ * Structures and Typedefs *
+@@ -400,13 +404,13 @@ static int vbsvcAutoMountSharedFolderOld
+ int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
+ if (RT_SUCCESS(rc))
+ {
++ 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
+ int fFlags = 0;
+ 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",
+- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
+ int r = mount(pszShareName,
+ pszMountPoint,
+ fFlags | MS_OPTIONSTR,
+@@ -424,34 +428,11 @@ static int vbsvcAutoMountSharedFolderOld
+ # 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;
+- mntinf.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
+- 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.cMaxIoPages = Opts.cMaxIoPages;
+- mntinf.szTag[0] = '\0';
+-
+- strcpy(mntinf.name, pszShareName);
+- strcpy(mntinf.nls_name, "\0");
+-
+ int r = mount(pszShareName,
+ pszMountPoint,
+ "vboxsf",
+ fFlags,
+- &mntinf);
++ szOptBuf);
+ if (r == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+@@ -484,34 +465,6 @@ static int vbsvcAutoMountSharedFolderOld
+ }
+ else /* r == -1, we got some error in errno. */
+ {
+- if (errno == EPROTO)
+- {
+- VGSvcVerbose(3, "vbsvcAutoMountWorker: Messed up share name, re-trying ...\n");
+-
+- /** @todo r=bird: What on earth is going on here????? Why can't you
+- * strcpy(mntinf.name, pszShareName) to fix it again? */
+-
+- /* Sometimes the mount utility messes up the share name. Try to
+- * un-mangle it again. */
+- char szCWD[RTPATH_MAX];
+- size_t cchCWD;
+- if (!getcwd(szCWD, sizeof(szCWD)))
+- {
+- VGSvcError("vbsvcAutoMountWorker: Failed to get the current working directory\n");
+- szCWD[0] = '\0';
+- }
+- cchCWD = strlen(szCWD);
+- if (!strncmp(pszMountPoint, szCWD, cchCWD))
+- {
+- while (pszMountPoint[cchCWD] == '/')
+- ++cchCWD;
+- /* We checked before that we have enough space */
+- strcpy(mntinf.name, pszMountPoint + cchCWD);
+- }
+- r = mount(mntinf.name, pszMountPoint, "vboxsf", fFlags, &mntinf);
+- }
+- if (r == -1) /* Was there some error from one of the tries above? */
+- {
+ switch (errno)
+ {
+ /* If we get EINVAL here, the system already has mounted the Shared Folder to another
+@@ -530,7 +483,6 @@ static int vbsvcAutoMountSharedFolderOld
+ rc = RTErrConvertFromErrno(errno);
+ break;
+ }
+- }
+ }
+ # endif
+ }
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a74bb38..8702af0 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,7 +34,7 @@
Name: VirtualBox
Version: 6.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -74,6 +74,7 @@ Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
+Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -299,6 +300,7 @@ rm -r src/libs/zlib-1.2.8/
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
+%patch61 -p1 -b .automount
%build
./configure --disable-kmods \
@@ -804,6 +806,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Apr 17 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-2
+- Rebase 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+
* Wed Apr 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.6-1
- Update to 6.0.6
5 years
[VirtualBox-kmod/f29: 2/2] Merge branch 'master' into f29
by Vasiliy Glazov
commit d4c8a623e7bf659f3af2528d3e68fdd0fa443235
Merge: f366c26 27fe036
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 17:27:03 2019 +0300
Merge branch 'master' into f29
.gitignore | 1 +
...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ---
VirtualBox-kmod.spec | 13 ++--
efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch | 86 ----------------------
sources | 2 +-
5 files changed, 8 insertions(+), 106 deletions(-)
---
5 years
[VirtualBox/f29: 7/7] Correct spec.
by Vasiliy Glazov
commit 068a5880d0faeb2f9374605c73c6bae875e662e8
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 15:10:47 2019 +0300
Correct spec.
VirtualBox.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 754d69b..a74bb38 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,6 +34,7 @@
Name: VirtualBox
Version: 6.0.6
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
5 years
[VirtualBox/f29: 6/7] Merge branch 'master' into f29
by Vasiliy Glazov
commit 8bc5efe3254807e90180d002e9577029684683d5
Merge: 60aec8b 9a84a2c
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 15:09:39 2019 +0300
Merge branch 'master' into f29
.gitignore | 1 +
...AutoMount-Change-Linux-mount-code-to-use-.patch | 131 ---------------------
...strings.patch => VirtualBox-6.0.6-strings.patch | 98 ++++++++-------
VirtualBox.spec | 10 +-
sources | 2 +-
5 files changed, 61 insertions(+), 181 deletions(-)
---
diff --cc VirtualBox.spec
index 855e468,a74bb38..754d69b
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@@ -33,8 -33,8 +33,7 @@@
%endif
Name: VirtualBox
- Version: 6.0.4
- Release: 2%{?dist}
+ Version: 6.0.6
-Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
5 years
[VirtualBox/f29] (7 commits) ...Correct spec.
by Vasiliy Glazov
Summary of changes:
b2f1f87... Fix build of webservice (*)
ce36f17... Rebase and squash el7 (*)
b573668... Merge branch 'master' into el7 (*)
18cd6ac... Update to 6.0.6. (*)
9a84a2c... Update added updated strings patch. (*)
8bc5efe... Merge branch 'master' into f29
068a588... Correct spec.
(*) This commit already existed in another branch; no separate mail sent
5 years
[VirtualBox-kmod] Update to 6.0.6.
by Vasiliy Glazov
commit 27fe036b85402fd1de975513e24d47ec903b83c0
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 13:49:26 2019 +0300
Update to 6.0.6.
.gitignore | 1 +
...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ---
VirtualBox-kmod.spec | 13 ++--
efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch | 86 ----------------------
sources | 2 +-
5 files changed, 8 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f308ff..c0925a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/master.zip
/fb36032.zip
/2f85f96.zip
+/8dd4b8b.zip
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index a7158c9..a1ec6a1 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -11,7 +11,7 @@
# newvboxsf
# globals for https://github.com/jwrdegoede/vboxsf/archive/fb360320b7d5c2dc74cb958c9b27...
-%global commit1 2f85f96e02c36e8f25abfc5c1f78fafc2ba82988
+%global commit1 8dd4b8bd5cfe6ddae8fe7056dff790013b985d22
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Allow only root to access vboxdrv regardless of the file mode
@@ -44,8 +44,8 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 6.0.4
-Release: 4%{?dist}
+Version: 6.0.6
+Release: 1%{?dist}
#Release: 1%%{?dist}
Summary: Kernel module for VirtualBox
@@ -55,8 +55,6 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip
-Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
-Patch2: efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
@@ -81,8 +79,6 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-%patch1 -p2 -b .kernel_5.0
-%patch2 -p1 -b .kernel_5.1
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
@@ -147,6 +143,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Apr 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.6-1
+- Update to 6.0.6
+
* Wed Mar 27 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.4-4
- Update of new vboxsf
diff --git a/sources b/sources
index 3ebf236..31b5d6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a659aa95226ec878f1bad8d913f9635a 2f85f96.zip
+31ac8f4bb7b6f68f86eec0bd75c707c9 8dd4b8b.zip
5 years