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-03-29 13:09:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Fri Mar 29 13:09:24 2024 rev:273 rq:1163382 version:7.0.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2024-03-13
22:17:45.986479177 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.1905/virtualbox.changes
2024-03-29 13:09:55.636857946 +0100
@@ -1,0 +2,13 @@
+Thu Mar 28 17:26:16 UTC 2024 - Larry Finger <larry.fin...@gmail.com>
+
+- The location of vboxconfig is wrong. Add file fixes_for_vboxconfig.patch
+ to fix.
+ Some errors in vboxdrv.sh are fixed.
+
+-------------------------------------------------------------------
+Wed Mar 27 23:42:34 UTC 2024 - Larry Finger <larry.fin...@gmail.com>
+
+- Further fixes for builds on Leap 15.6. Fixes boo#1221496.
+ Adds file fixes_for_leap15.6.patch
+
+-------------------------------------------------------------------
New:
----
fixes_for_leap15.6.patch
fixes_for_vboxconfig.patch
BETA DEBUG BEGIN:
New:- Further fixes for builds on Leap 15.6. Fixes boo#1221496.
Adds file fixes_for_leap15.6.patch
New:
- The location of vboxconfig is wrong. Add file fixes_for_vboxconfig.patch
to fix.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.WyCJn1/_old 2024-03-29 13:09:58.556965277 +0100
+++ /var/tmp/diff_new_pack.WyCJn1/_new 2024-03-29 13:09:58.556965277 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox
+# spec file
#
# Copyright (c) 2024 SUSE LLC
#
@@ -159,9 +159,10 @@
Patch39: fix_sdl_build.patch
# Fixes for openSUSE Leap 15.X
Patch40: fixes_for_leap.patch
-# Fix for set_pte() warning
-#Patch41: fix_pte_warning.patch
+# Fixes for Leap 15.6
+Patch41: fixes_for_leap15.6.patch
Patch42: kernel-6.8.patch
+Patch43: fixes_for_vboxconfig.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs}
@@ -179,6 +180,7 @@
BuildRequires: nasm
BuildRequires: pam-devel
BuildRequires: yasm
+BuildRequires: zlib-devel
ExclusiveArch: x86_64
%if 0%{?sle_version} != 120300
Source2: VirtualBox.appdata.xml
@@ -474,8 +476,11 @@
%patch -P 38 -p1
%patch -P 39 -p1
%patch -P 40 -p1
-#%patch -P 41 -p1
+%if 0%{?sle_version} == 150600 && 0%{?is_opensuse}
+%patch -P 41 -p1
+%endif
%patch -P 42 -p1
+%patch -P 43 -p1
### Documents for virtualbox main package ###
%if %{main_package}
++++++ fixes_for_leap15.6.patch ++++++
Index: VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -1292,9 +1292,6 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
IPRT_LINUX_SAVE_EFL_AC();
const int cPages = cb >> PAGE_SHIFT;
struct task_struct *pTask = rtR0ProcessToLinuxTask(R0Process);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
- struct vm_area_struct **papVMAs;
-# endif
PRTR0MEMOBJLNX pMemLnx;
int rc = VERR_NO_MEMORY;
int const fWrite = fAccess & RTMEM_PROT_WRITE ? 1 : 0;
@@ -1318,11 +1315,6 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
return VERR_NO_MEMORY;
}
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
- papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
- if (papVMAs)
- {
-# endif
LNX_MM_DOWN_READ(pTask->mm);
/*
@@ -1342,9 +1334,6 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access.
*/
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) &&
!RTLNX_SUSE_MAJ_PREREQ(15, 6)
- , papVMAs /* vmas */
-# endif
);
/*
* Actually this should not happen at the moment as call this function
@@ -1367,12 +1356,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access.
*/
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
- , papVMAs /* vmas */
-# endif
-# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
- , NULL /* locked */
-# endif
+ , NULL, NULL
);
#else /* GET_USER_PAGES_API < KERNEL_VERSION(4, 6, 0) */
rc = get_user_pages(pTask, /* Task for fault
accounting. */
@@ -1389,9 +1373,6 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access.
*/
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && && !defined(OPENSUSE_156)
- , papVMAs /* vmas */
-# endif
);
#endif /* GET_USER_PAGES_API < KERNEL_VERSION(4, 6, 0) */
if (rc == cPages)
@@ -1415,21 +1396,10 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
while (rc-- > 0)
{
flush_dcache_page(pMemLnx->apPages[rc]);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
-# if RTLNX_VER_MIN(6,3,0)
- vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
-# else
- papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
-# endif
-# endif
}
LNX_MM_UP_READ(pTask->mm);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
- RTMemFree(papVMAs);
-# endif
-
pMemLnx->Core.u.Lock.R0Process = R0Process;
pMemLnx->cPages = cPages;
Assert(!pMemLnx->fMappedToRing0);
@@ -1457,11 +1427,6 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
rc = VERR_LOCK_FAILED;
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
- RTMemFree(papVMAs);
- }
-# endif
-
rtR0MemObjDelete(&pMemLnx->Core);
IPRT_LINUX_RESTORE_EFL_AC();
return rc;
Index: VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/regops.c
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -270,11 +270,7 @@ static ssize_t vbsf_iov_iter_get_pages(s
size_t cPagesLocked;
down_read(&pTask->mm->mmap_sem);
-#if defined(OPENSUSE_156)
cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages);
-#else
- cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages,
iter->v_write, 1 /*force*/, papPages, NULL);
-#endif
up_read(&pTask->mm->mmap_sem);
if (cPagesLocked == cPages) {
size_t cbRet = (cPages << PAGE_SHIFT) - offPg0;
++++++ fixes_for_vboxconfig.patch ++++++
Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
@@ -92,19 +92,19 @@
<translation type="vanished">VirtualBox Linux branduolio modulis
(vboxdrv) arba nÄra įkeltas, arba nepakanka leidimų dirbti su /dev/vboxdrv.
IÅ¡ naujo įdiekite branduolio modulį root teisÄmis įvykdydami
<br/><br/><font color=blue>'/sbin/rcvboxdrv
setup'</font><br/><br/>. Jei įmanoma pirma turite
įsidiegti DKMS paketÄ
. Å is paketas seka Linux branduolio pakeitimus ir, jei
reikia, perkompiliuoja vboxdrv branduolio modulį.</translation>
</message>
<message>
- <source>The VirtualBox Linux kernel driver (vboxdrv) is either not
loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the
kernel module by executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>as
root.</source>
- <translation type="vanished">VirtualBox Linux branduolio tvarkyklÄ
(vboxdrv) neįkelta arba /dev/vboxdrv turi bÄdų su leidimais. IÅ¡ naujo
įdiekite branduolio modulį įvykdydami <br/><br/> <font
color=blue>/sbin/vboxconfig</font><br/><br/>
administratoriaus (root) teisÄmis.</translation>
+ <source>The VirtualBox Linux kernel driver (vboxdrv) is either not
loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the
kernel module by executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>as
root.</source>
+ <translation type="vanished">VirtualBox Linux branduolio tvarkyklÄ
(vboxdrv) neįkelta arba /dev/vboxdrv turi bÄdų su leidimais. IÅ¡ naujo
įdiekite branduolio modulį įvykdydami <br/><br/> <font
color=blue>/usr/sbin/vboxconfig</font><br/><br/>
administratoriaus (root) teisÄmis.</translation>
</message>
<message>
- <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you do not mix the OSE version and the PUEL
version of VirtualBox.</source>
- <translation type="vanished">VirtualBox branduolio modulis neatitinka
VirtualBox versijos. PanaÅ¡u, kad VirtualBox diegimas nebuvo sÄkmingas.
Pataisyti gali pavykti įvykdžius<br/><br/> <font
color=blue>/sbin/vboxconfig</font><br/><br/>
Įsitikinkite, ar nemaišote VirtualBox OSE ir PUEL versijų.</translation>
+ <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you do not mix the OSE version and the PUEL
version of VirtualBox.</source>
+ <translation type="vanished">VirtualBox branduolio modulis
neatitinka VirtualBox versijos. Panašu, kad VirtualBox diegimas nebuvo
sÄkmingas. Pataisyti gali pavykti įvykdžius<br/><br/> <font
color=blue>/usr/sbin/vboxconfig</font><br/><br/>
Įsitikinkite, ar nemaišote VirtualBox OSE ir PUEL versijų.</translation>
</message>
<message>
- <source>The VirtualBox Linux kernel driver is either not loaded or not
set up correctly. Please try setting it up again by
executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>as
root.<br/><br/>If your system has EFI Secure Boot enabled you may
also need to sign the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci)
before you can load them. Please see your Linux system's documentation for
more information.</source>
+ <source>The VirtualBox Linux kernel driver is either not loaded or
not set up correctly. Please try setting it up again by
executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>as
root.<br/><br/>If your system has EFI Secure Boot enabled you may
also need to sign the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci)
before you can load them. Please see your Linux system's documentation for
more information.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you are not mixing builds of VirtualBox from
different sources.</source>
+ <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you are not mixing builds of VirtualBox from
different sources.</source>
<translation type="unfinished"></translation>
</message>
</context>
Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
@@ -148,20 +148,20 @@
<translation type="obsolete">Kare Boyutu: %1x%2, Kare Oranı: %3fps,
Bit Oranı: %4kbps</translation>
</message>
<message>
- <source>The VirtualBox Linux kernel driver (vboxdrv) is either not
loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the
kernel module by executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>as
root.</source>
- <translation type="vanished">VirtualBox Linux çekirdek sürücüsü
(vboxdrv) ya yüklenmedi ya da /dev/vboxdrv ile ilgili izin sorunu var. Lütfen
root kullanıcısı olarak <br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırarak çekirdek modülünü yeniden
yükleyin.</translation>
+ <source>The VirtualBox Linux kernel driver (vboxdrv) is either not
loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the
kernel module by executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>as
root.</source>
+ <translation type="vanished">VirtualBox Linux çekirdek sürücüsü
(vboxdrv) ya yüklenmedi ya da /dev/vboxdrv ile ilgili izin sorunu var. Lütfen
root kullanıcısı olarak <br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırarak çekirdek modülünü yeniden
yükleyin.</translation>
</message>
<message>
- <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you do not mix the OSE version and the PUEL
version of VirtualBox.</source>
- <translation type="vanished">VirtualBox çekirdek modülleri
VirtualBox'ın bu sürümüyle uyuÅmuyor. VirtualBox'ın kurulumu
görünüÅe göre baÅarılı olmadı. <br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırmak bunu düzeltebilir. VirtualBox'ın OSE ve PUEL
sürümlerini karıÅtırmadıÄınızdan emin olun.</translation>
+ <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you do not mix the OSE version and the PUEL
version of VirtualBox.</source>
+ <translation type="vanished">VirtualBox çekirdek modülleri
VirtualBox'ın bu sürümüyle uyuÅmuyor. VirtualBox'ın kurulumu
görünüÅe göre baÅarılı olmadı. <br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırmak bunu düzeltebilir. VirtualBox'ın OSE ve
PUEL sürümlerini karıÅtırmadıÄınızdan emin olun.</translation>
</message>
<message>
- <source>The VirtualBox Linux kernel driver is either not loaded or not
set up correctly. Please try setting it up again by
executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>as
root.<br/><br/>If your system has EFI Secure Boot enabled you may
also need to sign the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci)
before you can load them. Please see your Linux system's documentation for
more information.</source>
- <translation>VirtualBox Linux çekirdek sürücüsü ya yüklenmedi ya
da doÄru olarak ayarlanmadı. Lütfen root kullanıcısı olarak
<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırarak bunu tekrar ayarlamayı deneyin. EÄer
sisteminizde EFI Secure Boot etkinleÅtirildiyse, çekirdek modüllerini
(vboxdrv, vboxnetflt, vboxnetadp, vboxpci) yüklemeden önce ayrıca bunları
imzalamanız gerekebilir. Lütfen daha fazla bilgi için Linux sisteminin
belgelerine bakın.</translation>
+ <source>The VirtualBox Linux kernel driver is either not loaded or not
set up correctly. Please try setting it up again by
executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>as
root.<br/><br/>If your system has EFI Secure Boot enabled you may
also need to sign the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci)
before you can load them. Please see your Linux system's documentation for
more information.</source>
+ <translation>VirtualBox Linux çekirdek sürücüsü ya yüklenmedi ya
da doÄru olarak ayarlanmadı. Lütfen root kullanıcısı olarak
<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırarak bunu tekrar ayarlamayı deneyin. EÄer
sisteminizde EFI Secure Boot etkinleÅtirildiyse, çekirdek modüllerini
(vboxdrv, vboxnetflt, vboxnetadp, vboxpci) yüklemeden önce ayrıca bunları
imzalamanız gerekebilir. Lütfen daha fazla bilgi için Linux sisteminin
belgelerine bakın.</translation>
</message>
<message>
- <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you are not mixing builds of VirtualBox from
different sources.</source>
- <translation>VirtualBox çekirdek modülleri VirtualBox'ın bu
sürümüyle uyuÅmuyor. VirtualBox'ın kurulumu görünüÅe göre
baÅarılı olmadı. <br/><br/> <font
color=blue>'/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırmak bunu düzeltebilir. Farklı kaynaklardan gelen
VirtualBox'ın yapımlarını karıÅtırmadıÄınızdan emin
olun.</translation>
+ <source>The VirtualBox kernel modules do not match this version of
VirtualBox. The installation of VirtualBox was apparently not successful.
Executing<br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>may
correct this. Make sure that you are not mixing builds of VirtualBox from
different sources.</source>
+ <translation>VirtualBox çekirdek modülleri VirtualBox'ın bu
sürümüyle uyuÅmuyor. VirtualBox'ın kurulumu görünüÅe göre
baÅarılı olmadı. <br/><br/> <font
color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>
dosyasını çalıÅtırmak bunu düzeltebilir. Farklı kaynaklardan gelen
VirtualBox'ın yapımlarını karıÅtırmadıÄınızdan emin
olun.</translation>
</message>
</context>
<context>
Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/main.cpp
@@ -99,7 +99,7 @@ QString g_QStrHintLinuxNoMemory = QAppli
QString g_QStrHintLinuxNoDriver = QApplication::tr(
"The VirtualBox Linux kernel driver is either not loaded or not set "
"up correctly. Please try setting it up again by executing<br/><br/>"
- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+ " <font color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>"
"as root.<br/><br/>"
"If your system has EFI Secure Boot enabled you may also need to sign "
"the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
@@ -118,7 +118,7 @@ QString g_QStrHintLinuxWrongDriverVersio
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+ " <font color=blue>'/usr/sbin/vboxconfig'</font><br/><br/>"
"may correct this. Make sure that you are not mixing builds "
"of VirtualBox from different sources."
);
Index: VirtualBox-7.0.14/src/VBox/Installer/linux/VBox.sh
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/VBox.sh
+++ VirtualBox-7.0.14/src/VBox/Installer/linux/VBox.sh
@@ -72,7 +72,7 @@ WARNING: The vboxdrv kernel module is no
available for the current kernel (`uname -r`) or it failed to
load. Please recompile the kernel module and install it by
- sudo /sbin/vboxconfig
+ sudo /usr/sbin/vboxconfig
You will not be able to start VMs until this problem is fixed.
EOF
@@ -80,7 +80,7 @@ elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
WARNING: The character device /dev/vboxdrv does not exist. Try
- sudo /sbin/vboxconfig
+ sudo /usr/sbin/vboxconfig
and if that is not successful, try to re-install the package.
++++++ kernel-6.8.patch ++++++
--- /var/tmp/diff_new_pack.WyCJn1/_old 2024-03-29 13:09:58.672969541 +0100
+++ /var/tmp/diff_new_pack.WyCJn1/_new 2024-03-29 13:09:58.676969688 +0100
@@ -16,8 +16,10 @@
src/VBox/Additions/linux/sharedfolders/vfsmod.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
+Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
+===================================================================
+---
VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
++++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
@@ -1361,7 +1361,7 @@ static int vgdrvLinuxParamLogGrpSet(cons
RTLogGroupSettings(pLogger, pszValue);
}
@@ -45,8 +47,10 @@
return 0;
}
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+Index: VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+===================================================================
+--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ VirtualBox-7.0.14/src/VBox/Additions/linux/sharedfolders/vfsmod.c
@@ -1408,7 +1408,7 @@ static int vbsf_parse_param(struct fs_co
switch (opt) {
case Opt_iocharset:
++++++ vbox-usb-warning.diff ++++++
--- /var/tmp/diff_new_pack.WyCJn1/_old 2024-03-29 13:09:58.724971452 +0100
+++ /var/tmp/diff_new_pack.WyCJn1/_new 2024-03-29 13:09:58.728971599 +0100
@@ -75,4 +75,24 @@
+ return 1;
+}
+
+Index: VirtualBox-7.0.14/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
+===================================================================
+--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
++++ VirtualBox-7.0.14/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
+@@ -47,12 +47,13 @@ case "$do_remove" in
+ exit 0
+ fi
+ case "$group" in "") group="vboxusers";; esac
+- mkdir /dev/vboxusb -m 0750 2>/dev/null
++ mkdir /dev/vboxusb -m 0660 2>/dev/null
+ chown root:$group /dev/vboxusb 2>/dev/null
+- mkdir "$devdir" -m 0750 2>/dev/null
++ mkdir "$devdir" -m 0660 2>/dev/null
+ chown root:$group "$devdir" 2>/dev/null
+ mknod "$devpath" c $1 $2 -m 0660 2>/dev/null
+ chown root:$group "$devpath" 2>/dev/null
++ chmod 0660 "$devpath" 2 > /dev/null
+ ;;
+ 1)
+ rm -f "$devpath"
++++++ vboxdrv.sh ++++++
--- /var/tmp/diff_new_pack.WyCJn1/_old 2024-03-29 13:09:58.800974246 +0100
+++ /var/tmp/diff_new_pack.WyCJn1/_new 2024-03-29 13:09:58.804974393 +0100
@@ -60,6 +60,10 @@
[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
+chmod "${DEVICE_MODE}" /etc/vboxusb/
+chmod "${DEVICE_MODE}" /etc/vboxusb/*
+chmod "${DEVICE_MODE}" /etc/vboxusb/*/*
+
begin_msg()
{
test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
