Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2024-04-25 20:47:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Thu Apr 25 20:47:48 2024 rev:276 rq:1170065 version:7.0.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2024-04-21
20:26:06.071323767 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.1880/virtualbox.changes
2024-04-25 20:47:56.607350729 +0200
@@ -1,0 +2,7 @@
+Wed Apr 24 14:53:24 UTC 2024 - Larry Finger <larry.fin...@gmail.com>
+
+- Provide a temporary fix to the problem of wrong timestamp for files
+ in a shared folder since kernel 6.6. File "fix_shared_folder_time.patch"
+ is added. This change fixes boo#1220524.
+
+-------------------------------------------------------------------
New:
----
fix_shared_folder_time.patch
BETA DEBUG BEGIN:
New:- Provide a temporary fix to the problem of wrong timestamp for files
in a shared folder since kernel 6.6. File "fix_shared_folder_time.patch"
is added. This change fixes boo#1220524.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.vZkSFl/_old 2024-04-25 20:47:59.911472052 +0200
+++ /var/tmp/diff_new_pack.vZkSFl/_new 2024-04-25 20:47:59.911472052 +0200
@@ -165,6 +165,7 @@
Patch43: fixes_for_vboxconfig.patch
Patch44: kernel-6.9.patch
Patch45: libxml21206.patch
+Patch46: fix_shared_folder_time.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs}
@@ -485,6 +486,7 @@
%patch -P 43 -p1
%patch -P 44 -p1
%patch -P 45 -p1
+%patch -P 46 -p1
### Documents for virtualbox main package ###
%if %{main_package}
@@ -551,6 +553,7 @@
cat >> vbox-guest-tools.conf << EOF
g vboxguest - - - -
+g vboxsf - - - -
%if 0%{?suse_version} <= 1500
g vboxvideo - - - -
%endif
@@ -1104,10 +1107,10 @@
# build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp
-# guest modules : vboxguest,vboxvideo
+# guest modules : vboxguest,vboxsf,vboxvideo
echo "build kernel modules"
for vbox_module in kmp_host/vbox{drv,netflt,netadp} \
- kmp_additions/vbox{guest,video}; do
+ kmp_additions/vbox{guest,sf,video}; do
#get the module name from path
module_name=$(basename "$vbox_module")
@@ -1133,8 +1136,9 @@
$PWD/modules_build_dir/$flavor/$module_name
SYMBOLS="$PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers"
fi
- # copy vboxguest (for guest) module symbols which are used by
vboxvideo km's:
- if [ "$module_name" = "vboxvideo" ] ; then
+ # copy vboxguest (for guest) module symbols which are used by vboxsf
and vboxvideo km's:
+ if [ "$module_name" = "vboxsf" -o \
+ "$module_name" = "vboxvideo" ] ; then
cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
$PWD/modules_build_dir/$flavor/$module_name
SYMBOLS="$PWD/modules_build_dir/$flavor/vboxguest/Module.symvers"
@@ -1149,7 +1153,7 @@
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=extra
#to install modules we use here similar steps like in build phase, go through
all the modules :
-for module_name in vbox{drv,netflt,netadp,guest,video}
+for module_name in vbox{drv,netflt,netadp,guest,sf,video}
do
#and through all flavors
for flavor in %{flavors_to_build}; do
++++++ fix_shared_folder_time.patch ++++++
Index: VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/utils.c
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/sharedfolders/utils.c
+++ VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/utils.c
@@ -297,10 +297,14 @@ DECLINLINE(int) sf_file_mode_to_linux(ui
*/
static void vbsf_update_inode_timestamps(struct inode *pInode, PSHFLFSOBJINFO
pObjInfo)
{
+/* Oracle has a bad fix for i_atime, etc missing from struct inode. The fix
+ * below produces the correct results, but is not correct either as it
references
+ * variables such as __i_atime that are supposed to be hidden. Larry Finger
+ */
#if RTLNX_VER_MIN(6,6,0)
- struct timespec64 ts;
- vbsf_time_to_linux(&ts, &pObjInfo->ChangeTime);
- inode_set_ctime_to_ts(pInode, ts);
+ vbsf_time_to_linux(&pInode->__i_atime, &pObjInfo->AccessTime);
+ vbsf_time_to_linux(&pInode->__i_ctime, &pObjInfo->ChangeTime);
+ vbsf_time_to_linux(&pInode->__i_mtime, &pObjInfo->ModificationTime);
#else
vbsf_time_to_linux(&pInode->i_atime, &pObjInfo->AccessTime);
vbsf_time_to_linux(&pInode->i_ctime, &pObjInfo->ChangeTime);
++++++ virtualbox-kmp-files ++++++
--- /var/tmp/diff_new_pack.vZkSFl/_old 2024-04-25 20:48:00.375489091 +0200
+++ /var/tmp/diff_new_pack.vZkSFl/_new 2024-04-25 20:48:00.379489237 +0200
@@ -5,5 +5,6 @@
%{kernel_module_directory}/%2-%1/extra/vboxnetadp.ko
%{kernel_module_directory}/%2-%1/extra/vboxnetflt.ko
%{kernel_module_directory}/%2-%1/extra/vboxguest.ko
+%{kernel_module_directory}/%2-%1/extra/vboxsf.ko
%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko
