Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2023-10-29 19:39:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Sun Oct 29 19:39:17 2023 rev:266 rq:1120634 version:7.0.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2023-10-23
23:40:22.826256009 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.17445/virtualbox.changes
2023-10-29 19:39:19.945989496 +0100
@@ -1,0 +2,5 @@
+Thu Oct 26 18:10:45 UTC 2023 - Larry Finger <larry.fin...@gmail.com>
+
+- Update file "fixes_for_leap.patch" to cover API change in Leap 15.6 kernel.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fixes_for_leap.patch ++++++
--- /var/tmp/diff_new_pack.bsvYci/_old 2023-10-29 19:39:21.946062258 +0100
+++ /var/tmp/diff_new_pack.bsvYci/_new 2023-10-29 19:39:21.950062404 +0100
@@ -2,7 +2,7 @@
===================================================================
---
VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -89,6 +89,21 @@
+@@ -89,6 +89,17 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@@ -13,13 +13,9 @@
+# define OPENSUSE_155
+# endif
+
-+#if !defined(skb_gso_segment)
-+#if defined(CONFIG_SUSE_VERSION) && (CONFIG_SUSE_VERSION == 15)
-+//#include <config/net/mpls/gso.h>
-+#else
++#if RTLNX_SUSE_MAJ_PREREQ(15, 6)
+#include <net/gso.h>
+#endif
-+#endif
+
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
@@ -55,6 +51,22 @@
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM |
DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */
+@@ -389,13 +393,13 @@ static struct drm_driver driver = {
+ #elif RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
+ .dumb_destroy = drm_gem_dumb_destroy,
+ #endif
+-#if RTLNX_VER_MAX(6,6,0)
++#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+ .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+ #endif
+ .gem_prime_import = drm_gem_prime_import,
+ .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
+-#if RTLNX_VER_MAX(6,6,0)
++#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
+ .gem_prime_mmap = vbox_gem_prime_mmap,
+ #endif
+
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
@@ -425,6 +437,15 @@
#include <VBoxVideo.h>
+@@ -196,7 +197,7 @@ static struct fb_ops vboxfb_ops = {
+ .owner = THIS_MODULE,
+ .fb_check_var = drm_fb_helper_check_var,
+ .fb_set_par = drm_fb_helper_set_par,
+-#if RTLNX_VER_MIN(6,5,0)
++#if RTLNX_VER_MIN(6,5,0) || RTLNX_SUSE_MAJ_PREREQ(15, 6)
+ .fb_read = fb_sys_read,
+ .fb_write = fb_sys_write,
+ .fb_fillrect = sys_fillrect,
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -450,4 +471,26 @@
# define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len)
#else /* < 5.17.0 */
# define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len)
+Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+===================================================================
+--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -1342,7 +1342,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+ fWrite, /* force write
access. */
+ # endif
+ &pMemLnx->apPages[0] /* Page array. */
+-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) &&
!RTLNX_SUSE_MAJ_PREREQ(15, 6)
+ , papVMAs /* vmas */
+ # endif
+ );
+@@ -1389,7 +1389,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+ fWrite, /* force write
access. */
+ # endif
+ &pMemLnx->apPages[0] /* Page array. */
+-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) &&
!RTLNX_SUSE_MAJ_PREREQ(15, 6)
+ , papVMAs /* vmas */
+ # endif
+ );
