[VirtualBox-kmod] Add update script helper
by Sérgio M. Basto
commit 02c3429e3363de33b222cc7110c41e97d0c6d34e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 30 00:32:45 2019 +0100
Add update script helper
update_vbox.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
---
diff --git a/update_vbox.sh b/update_vbox.sh
new file mode 100755
index 0000000..d16d1bc
--- /dev/null
+++ b/update_vbox.sh
@@ -0,0 +1,62 @@
+VERSION=6.0.6
+REL=3
+
+if [ -z "$1" ]
+then
+ stage=0
+else
+ stage=$1
+fi
+
+git checkout master
+git pull
+if test $stage -le 0
+then
+echo STAGE 0
+rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" VirtualBox-kmod.spec
+rfpkg ci -c && git show
+#rfpkg srpm && mock -r fedora-27-x86_64-rpmfusion_free --no-clean --rebuild smplayer-17.5.0-1.fc27.src.rpm
+#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
+#git reset HEAD~1
+#git rm kernel-4.10.0-0.rc5.lnkops.v2.patch
+echo Press enter to continue; read dummy;
+rfpkg push && rfpkg build --nowait
+#koji-rpmfusion watch-task
+fi
+
+if test $stage -le 1
+then
+echo STAGE 1
+BRANCH1=f30
+BRANCH2=fc30
+echo Press enter tag-build $BRANCH1 to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+BRANCH1=f29
+BRANCH2=fc29
+echo Press enter tag-build $BRANCH1 to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait) &
+#koji-rpmfusion watch-task
+BRANCH1=f28
+BRANCH2=fc28
+echo Press enter to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to continue; read dummy;
+fi
+
+if test $stage -le 2
+then
+echo STAGE 2
+echo Press enter to continue; read dummy;
+BRANCH1=el7
+BRANCH2=el7
+koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+fi
+echo Finish
5 years, 6 months
[VirtualBox-kmod] Force build with VirtualBox-kmodsrc-6.0.6-3
by Sérgio M. Basto
commit abb0c42a398c030bb59c470d20df20668851a994
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 30 00:27:19 2019 +0100
Force build with VirtualBox-kmodsrc-6.0.6-3
VirtualBox-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 0216302..bafa436 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,13 +39,13 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 2
+%global vboxrel 3
%global vboxreltag %{?vboxrel:-%{vboxrel}}
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
Version: 6.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -143,6 +143,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-3
+- Force build with VirtualBox-kmodsrc-6.0.6-3
+
* Thu Apr 18 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-2
- Update new vboxsf
- Force build with VirtualBox-kmodsrc-6.0.6-2
5 years, 6 months
[VirtualBox-kmod/f28] Add update script herlper
by Sérgio M. Basto
commit e5d2d5e61ffee28591ff28a60f98b7a7f607fdb9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 30 00:32:45 2019 +0100
Add update script herlper
update_vbox.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
---
diff --git a/update_vbox.sh b/update_vbox.sh
new file mode 100755
index 0000000..d16d1bc
--- /dev/null
+++ b/update_vbox.sh
@@ -0,0 +1,62 @@
+VERSION=6.0.6
+REL=3
+
+if [ -z "$1" ]
+then
+ stage=0
+else
+ stage=$1
+fi
+
+git checkout master
+git pull
+if test $stage -le 0
+then
+echo STAGE 0
+rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" VirtualBox-kmod.spec
+rfpkg ci -c && git show
+#rfpkg srpm && mock -r fedora-27-x86_64-rpmfusion_free --no-clean --rebuild smplayer-17.5.0-1.fc27.src.rpm
+#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
+#git reset HEAD~1
+#git rm kernel-4.10.0-0.rc5.lnkops.v2.patch
+echo Press enter to continue; read dummy;
+rfpkg push && rfpkg build --nowait
+#koji-rpmfusion watch-task
+fi
+
+if test $stage -le 1
+then
+echo STAGE 1
+BRANCH1=f30
+BRANCH2=fc30
+echo Press enter tag-build $BRANCH1 to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+BRANCH1=f29
+BRANCH2=fc29
+echo Press enter tag-build $BRANCH1 to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait) &
+#koji-rpmfusion watch-task
+BRANCH1=f28
+BRANCH2=fc28
+echo Press enter to continue; read dummy;
+koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to continue; read dummy;
+fi
+
+if test $stage -le 2
+then
+echo STAGE 2
+echo Press enter to continue; read dummy;
+BRANCH1=el7
+BRANCH2=el7
+koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7
+koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master
+fi
+echo Finish
5 years, 6 months
[VirtualBox-kmod/f28] Force build with VirtualBox-kmodsrc-6.0.6-3
by Sérgio M. Basto
commit 917fa1294d47e21483dd68af4ff4d8add0c7198d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 30 00:27:19 2019 +0100
Force build with VirtualBox-kmodsrc-6.0.6-3
VirtualBox-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 0216302..bafa436 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,13 +39,13 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 2
+%global vboxrel 3
%global vboxreltag %{?vboxrel:-%{vboxrel}}
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
Version: 6.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -143,6 +143,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-3
+- Force build with VirtualBox-kmodsrc-6.0.6-3
+
* Thu Apr 18 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-2
- Update new vboxsf
- Force build with VirtualBox-kmodsrc-6.0.6-2
5 years, 6 months
[mlt-freeworld] Don't list all files (for debug)
by Sérgio M. Basto
commit 2e8b789880c093c9de1d8dc5b43e496905588427
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 29 21:31:53 2019 +0100
Don't list all files (for debug)
mlt-freeworld.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index d9c2485..a13cfc2 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -100,8 +100,8 @@ rm -r src/win32/
%install
%make_install
-#before remove it print it to check with main mlt package
-find %{buildroot} | grep -vP "mlt/avformat|libmltavformat.so"
+# Debug before remove, list all files to check with main mlt package
+# find %{buildroot} | grep -vP "mlt/avformat|libmltavformat.so"
# remove all execept avformat (ffmpeg part)
#find %{buildroot} -type f | grep -vP "mlt/avformat|libmltavformat.so" | xargs rm
find %{buildroot} -type f -print0 | grep -vPz "mlt/avformat|libmltavformat.so" | xargs -0 rm
5 years, 6 months
[openshot] Add runtime setuptools dependency
by Frank R Dana
commit c3a2cc561453c6ae035ce9619dd69bdf0a0d7fff
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Apr 29 12:44:08 2019 -0400
Add runtime setuptools dependency
openshot.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/openshot.spec b/openshot.spec
index ae58ac3..7e39cfa 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -30,13 +30,14 @@ BuildRequires: libopenshot >= 0.2.3
BuildRequires: libopenshot-audio >= 0.1.8
BuildRequires: desktop-file-utils
+Requires: python%{python3_pkgversion}-httplib2
Requires: python%{python3_pkgversion}-qt5
Requires: python%{python3_pkgversion}-qt5-webkit
-Requires: python%{python3_pkgversion}-httplib2
Requires: python%{python3_pkgversion}-requests
+Requires: python%{python3_pkgversion}-setuptools
Requires: python%{python3_pkgversion}-simplejson
-Requires: python%{python3_pkgversion}-libopenshot >= 0.2.3
Requires: python%{python3_pkgversion}-zmq
+Requires: python%{python3_pkgversion}-libopenshot >= 0.2.3
Requires: ffmpeg-libs
%if 0%{?fedora}
@@ -146,6 +147,9 @@ fi
%changelog
+* Mon Apr 29 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 2.4.4-3
+- setuptools is also a runtime dependency
+
* Sun Apr 28 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 2.4.4-2
- Declare dependency on requests, simplejson Python modules
5 years, 6 months
[VirtualBox/f29] (12 commits) ...Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with Fedora
by Sérgio M. Basto
Summary of changes:
27d05ba... Revert "Enable Python3 support, move all SDK python files t (*)
9fda705... Revert "git add VirtualBox-6.0.0-noupdate.patch" (*)
5b6b2ab... Revert "VirtualBox 6.0" (*)
a270426... Revert "more updates on script helper" (*)
34bb951... Merge branch 'f29' into f28 (*)
bda1568... Update to 5.2.24. (*)
300e21b... Added patch. (*)
f840593... Rebase and squash f28 (*)
2cf0ca9... Merge branch 'master' into f28 (*)
6c6c8a9... Merge branch 'f29' into f28 (*)
5a1eed4... Merge branch 'f29' into f28 (*)
d63c67b... Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-cod (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[VirtualBox/f30] (17 commits) ...Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with Fedora
by Sérgio M. Basto
Summary of changes:
27d05ba... Revert "Enable Python3 support, move all SDK python files t (*)
9fda705... Revert "git add VirtualBox-6.0.0-noupdate.patch" (*)
5b6b2ab... Revert "VirtualBox 6.0" (*)
a270426... Revert "more updates on script helper" (*)
34bb951... Merge branch 'f29' into f28 (*)
bda1568... Update to 5.2.24. (*)
300e21b... Added patch. (*)
da9f530... Rebase and squash f29 (*)
60aec8b... Merge branch 'master' into f29 (*)
f840593... Rebase and squash f28 (*)
2cf0ca9... Merge branch 'master' into f28 (*)
8bc5efe... Merge branch 'master' into f29 (*)
068a588... Correct spec. (*)
6c6c8a9... Merge branch 'f29' into f28 (*)
1fe80ab... Merge branch 'master' into f29 (*)
5a1eed4... Merge branch 'f29' into f28 (*)
d63c67b... Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-cod (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[VirtualBox] (17 commits) ...Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with Fedora
by Sérgio M. Basto
Summary of changes:
27d05ba... Revert "Enable Python3 support, move all SDK python files t (*)
9fda705... Revert "git add VirtualBox-6.0.0-noupdate.patch" (*)
5b6b2ab... Revert "VirtualBox 6.0" (*)
a270426... Revert "more updates on script helper" (*)
34bb951... Merge branch 'f29' into f28 (*)
bda1568... Update to 5.2.24. (*)
300e21b... Added patch. (*)
da9f530... Rebase and squash f29 (*)
60aec8b... Merge branch 'master' into f29 (*)
f840593... Rebase and squash f28 (*)
2cf0ca9... Merge branch 'master' into f28 (*)
8bc5efe... Merge branch 'master' into f29 (*)
068a588... Correct spec. (*)
6c6c8a9... Merge branch 'f29' into f28 (*)
1fe80ab... Merge branch 'master' into f29 (*)
5a1eed4... Merge branch 'f29' into f28 (*)
d63c67b... Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-cod (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[VirtualBox/f28] Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with Fedora
by Sérgio M. Basto
commit d63c67bad40ea8ca51b8265fe7fc388465684e73
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 29 05:48:12 2019 +0100
Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with
Fedora
...AutoMount-Change-Linux-mount-code-to-use-.patch | 73 ++++++++++++++++++++--
VirtualBox.spec | 6 +-
2 files changed, 72 insertions(+), 7 deletions(-)
---
diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
index aea6a09..6bbabc3 100644
--- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -11,7 +11,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
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
++++ ./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>
@@ -30,7 +30,7 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
/*********************************************************************************************************************************
* Structures and Typedefs *
-@@ -400,13 +404,13 @@ static int vbsvcAutoMountSharedFolderOld
+@@ -400,13 +399,13 @@ static int vbsvcAutoMountSharedFolderOld
int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
if (RT_SUCCESS(rc))
{
@@ -47,10 +47,11 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
int r = mount(pszShareName,
pszMountPoint,
fFlags | MS_OPTIONSTR,
-@@ -424,34 +428,11 @@ static int vbsvcAutoMountSharedFolderOld
+@@ -423,35 +422,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);
@@ -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);
-@@ -484,34 +465,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
-@@ -530,7 +483,6 @@ static int vbsvcAutoMountSharedFolderOld
+@@ -530,7 +477,6 @@ static int vbsvcAutoMountSharedFolderOld
rc = RTErrConvertFromErrno(errno);
break;
}
@@ -126,3 +127,63 @@ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/sr
}
# endif
}
+@@ -1464,51 +1410,21 @@ static int vbsvcAutomounterMountIt(PVBSV
+ }
+
+ # if defined(RT_OS_LINUX)
+- /*
+- * Linux a bit more work...
+- */
+- struct vbsf_mount_info_new MntInfo;
+- RT_ZERO(MntInfo);
+- struct vbsf_mount_opts MntOpts;
+- RT_ZERO(MntOpts);
+- MntInfo.nullchar = '\0';
+- MntInfo.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
+- 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.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;
++ char szOpts[MAX_MNTOPT_STR] = { '\0', };
++ ssize_t cchOpts = RTStrPrintf2(szOpts, sizeof(szOpts),
++ "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000", gidMount);
++ if (cchOpts <= 0)
+ {
+- VGSvcError("vbsvcAutomounterMountIt: Share name '%s' is too long for the MntInfo.name field!\n", pEntry->pszName);
+- return rc;
++ VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd\n", cchOpts);
++ return VERR_BUFFER_OVERFLOW;
+ }
+
+- errno = 0;
+- unsigned long fFlags = MS_NODEV;
+- rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, &MntInfo);
++ rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, szOpts);
+ if (rc == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutomounterMountIt: Successfully mounted '%s' on '%s'\n",
+ pEntry->pszName, pEntry->pszActualMountPoint);
+-
+- errno = 0;
+- rc = vbsfmount_complete(pEntry->pszName, pEntry->pszActualMountPoint, fFlags, &MntOpts);
+- if (rc != 0) /* Ignorable. /etc/mtab is probably a link to /proc/mounts. */
+- VGSvcVerbose(1, "vbsvcAutomounterMountIt: vbsfmount_complete failed: %s (%d/%d)\n",
+- rc == 1 ? "open_memstream" : rc == 2 ? "setmntent" : rc == 3 ? "addmntent" : "unknown", rc, errno);
+ return VINF_SUCCESS;
+ }
+ else if (errno == EINVAL)
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 8702af0..983b155 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,7 +34,7 @@
Name: VirtualBox
Version: 6.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -806,6 +806,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.6-3
+- Sync patch 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use- with
+ Fedora
+
* 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
5 years, 6 months