Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2017-04-24 09:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox" Mon Apr 24 09:46:19 2017 rev:132 rq:486867 version:5.1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-03-21 22:44:57.265756838 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2017-04-24 09:46:20.932620418 +0200 @@ -1,0 +2,11 @@ +Sat Apr 8 23:10:36 UTC 2017 - [email protected] + +- Add File "vbox_fix_42.3_api.patch" to handle the get_user_pages() API change in Leap 42.3. + +------------------------------------------------------------------- +Tue Mar 28 14:53:52 UTC 2017 - [email protected] + +- Package VBoxVNC.so. This extension is already being built, just not packaged. + This feature is requested in bsc #1024671. + +------------------------------------------------------------------- New: ---- vbox_fix_42.3_api.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.YWclEb/_old 2017-04-24 09:46:24.000186547 +0200 +++ /var/tmp/diff_new_pack.YWclEb/_new 2017-04-24 09:46:24.004185981 +0200 @@ -90,6 +90,8 @@ Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags Patch113: vbox_remove_smp_mflags.patch +# Fix change in API for get_user_pages() +Patch114: vbox_fix_42.3_api.patch # Fix for missing include needed for server 1.19 Patch116: Fix_for_server_1.19.patch # @@ -333,6 +335,9 @@ %patch109 -p1 %patch112 -p1 %patch113 -p1 +%if 0%{?sle_version} == 120300 +%patch114 -p1 +%endif %patch116 -p1 #copy user manual @@ -459,6 +464,8 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/vbox install -d -m 755 %{buildroot}%{_udevrulesdir} install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d +install -m 755 out/linux.*/release/bin/ExtensionPacks/VNC/linux.*/VBoxVNC.so %{buildroot}%{_vbox_instdir}/VBoxVNC.so +install -m 755 out/linux.*/release/bin/ExtensionPacks/VNC/linux.*/VBoxVNCMain.so %{buildroot}%{_vbox_instdir}/VBoxVNCMain.so #################################################################################### echo "entering virtualbox-kmp-guest and virtualbox-kmp-host install section" @@ -743,6 +750,7 @@ %{_vbox_instdir}/VBoxDD2.so %{_vbox_instdir}/VBoxDD.so %{_vbox_instdir}/VBoxDDU.so +%{_vbox_instdir}/VBoxVNC*.so %{_vbox_instdir}/VBoxGuestControlSvc.so %{_vbox_instdir}/VBoxGuestPropSvc.so %{_vbox_instdir}/VBoxHeadless.so @@ -759,7 +767,6 @@ %{_vbox_instdir}/VBoxSharedCrOpenGL.so %{_vbox_instdir}/VBoxSharedFolders.so %{_vbox_instdir}/VBoxVMM.so -#%{_vbox_instdir}/VBoxVNC.so %{_vbox_instdir}/VBoxXPCOMC.so %{_vbox_instdir}/VBoxXPCOM.so %{_vbox_instdir}/VBoxDD2RC.rc ++++++ vbox_fix_42.3_api.patch ++++++ Index: VirtualBox-5.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c =================================================================== --- VirtualBox-5.1.18.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +++ VirtualBox-5.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c @@ -1084,18 +1079,14 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser # endif ); #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */ - rc = get_user_pages(pTask, /* Task for fault accounting. */ - pTask->mm, /* Whose pages. */ - R3Ptr, /* Where from. */ + /* The following is modified for Leap 42.3 having the + * get_user_pages() API from kernel 4.10 + */ + rc = get_user_pages(R3Ptr, /* Where from. */ cPages, /* How many pages. */ -# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) fWrite ? FOLL_WRITE | /* Write to memory. */ FOLL_FORCE /* force write access. */ : 0, /* Write to memory. */ -# else - fWrite, /* Write to memory. */ - fWrite, /* force write access. */ -# endif &pMemLnx->apPages[0], /* Page array. */ papVMAs); /* vmas */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */
