Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2017-03-01 23:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox" Wed Mar 1 23:40:04 2017 rev:129 rq:461358 version:5.1.14 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-02-10 09:44:59.960040107 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2017-03-01 23:40:08.506851865 +0100 @@ -1,0 +2,28 @@ +Tue Feb 28 21:06:30 UTC 2017 - [email protected] + +- Do not proivde libGL.so.1 and libEGL.so.1 symbols into the rpm + database. + +------------------------------------------------------------------- +Sun Feb 26 20:17:02 UTC 2017 - [email protected] + +- The fix for 3D acceleration only works for Gmome desktops. KDE desktops fail. Accordingly, + 3D acceleration must still be disabled "out-of-the-box". File /etc/init.d/vboxadd contains + comments on the modifications needed to turn 3D acceleration on, thus Gnome users may turn + it on selectively. + +------------------------------------------------------------------- +Fri Feb 24 03:34:35 UTC 2017 - [email protected] + +- Fix 3D acceleration as reported in bsc #1024934. The steps needed are as follows: + - Remove file "vbox_prevent_wrong_SONAME.patch" - the original SONAME values are needed for + libGL.so.1 and libEGL.so.1 to be replaced by VBoxOGL.so and VBoxEGL.so, respectively. + - Package VBoxEGL.so + +------------------------------------------------------------------- +Thu Feb 23 12:37:09 CET 2017 - [email protected] + +- Require insserv and fillup by the packages who call it in the + pre/post install sections + +------------------------------------------------------------------- Old: ---- vbox_prevent_wrong_SONAME.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.GVPtTB/_old 2017-03-01 23:40:13.130199859 +0100 +++ /var/tmp/diff_new_pack.GVPtTB/_new 2017-03-01 23:40:13.138198730 +0100 @@ -16,6 +16,9 @@ # +# Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp +%global __provides_exclude ^libE?GL.so.1.*$ + %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox @@ -83,8 +86,6 @@ Patch108: virtualbox-snpritnf-buffer-overflow.patch # Patch to add code to explain USB Passthru Patch109: vbox-usb-warning.diff -# Prevent Guest Additions from creating wrong SONAME -Patch111: vbox_prevent_wrong_SONAME.patch # Fix change in kernel API for ttm_bo_move_memcpy() Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags @@ -164,6 +165,8 @@ Requires(post): sysvinit(syslog) Requires(pre): permissions Requires(pre): pwdutils +Requires(pre): %insserv_prereq +Requires(pre): %fillup_prereq Recommends: %{name}-gui = %{version} #rename from ose version: Provides: %{name}-ose = %{version} @@ -209,6 +212,7 @@ Group: System/Emulators/PC Requires: %{name} = %{version} Provides: %{name}-gui = %{version} +Requires(pre): %insserv_prereq %description websrv websrv GUI part for %{name}. @@ -254,6 +258,7 @@ #rename from "ose" version: Provides: %{name}-ose-guest-tools = %{version} Obsoletes: %{name}-ose-guest-tools < %{version} +Requires(pre): %insserv_prereq %description guest-tools VirtualBox guest addition tools. @@ -329,7 +334,6 @@ %patch107 -p1 %patch108 -p1 %patch109 -p1 -%patch111 -p1 %patch112 -p1 %patch113 -p1 %patch116 -p1 @@ -504,6 +508,9 @@ # VBoxOGL* libs for guest-x11 subpackage install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ %{buildroot}%{_libdir} +# VBoxEGL* libs for guest-x11 subpackage +install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \ + %{buildroot}%{_libdir} # make link for dri lib ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) @@ -756,6 +763,7 @@ %{_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 @@ -819,6 +827,7 @@ %dir %{_libdir}/dri/ %{_bindir}/VBoxClient %{_libdir}/VBoxOGL*.so +%{_libdir}/VBoxEGL*.so %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %{_libdir}/dri/vboxvideo_dri.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.GVPtTB/_old 2017-03-01 23:40:13.282178426 +0100 +++ /var/tmp/diff_new_pack.GVPtTB/_new 2017-03-01 23:40:13.286177862 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh @@ -23,9 +23,12 @@ # Provides: vboxadd # Required-Start: @@ -73,7 +73,7 @@ fail "modprobe vboxguest failed" } } -@@ -217,7 +200,7 @@ start() +@@ -217,14 +200,14 @@ start() } # Put the X.Org driver in place. This is harmless if it is not needed. @@ -82,7 +82,32 @@ # Install the guest OpenGL drivers. For now we don't support # multi-architecture installations rm -f /etc/ld.so.conf.d/00vboxvideo.conf -@@ -378,7 +361,7 @@ extra_setup() + if /usr/bin/VBoxClient --check3d 2>/dev/null; then + mkdir -p /var/lib/VBoxGuestAdditions/lib +- ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1 +- ln -sf "${INSTALL_DIR}/lib/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1 ++ ln -sf "/usr/lib64/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1 ++ ln -sf "/usr/lib64/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1 + # SELinux for the OpenGL libraries, so that gdm can load them during the + # acceleration support check. This prevents an "Oh no, something has gone + # wrong!" error when starting EL7 guests. +@@ -237,6 +220,15 @@ start() + chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libEGL.so.1" + fi + echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf ++ # The above code will enable 3D acceleration for Gnome VM desktops. For Plasma 5 (KDE) ++ # VM's almost everything breaks. For that reason, acceleration MUST be disabled here. ++ # Gnome users that want this feature should delete the two 'rm' commands that follow. ++ # You will need to repeat this modification EVERY time the VirtualBox package is ++ # reinstalled ++ # Any KDE user that deletes the two 'rm' commands MUST know how to recover your sustem ++ # from a mode 3 boot. YOU HAVE BEEN WARNED. ++ rm /var/lib/VBoxGuestAdditions/lib/* ++ rm /etc/ld.so.conf.d/00vboxvideo.conf + fi + ldconfig + +@@ -382,7 +374,7 @@ extra_setup() ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin # And an rc file to re-build the kernel modules and re-set-up the X server. ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd @@ -91,7 +116,7 @@ # And a post-installation script for rebuilding modules when a new kernel # is installed. mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d -@@ -411,49 +394,13 @@ EOF +@@ -415,49 +407,13 @@ EOF # setup_script setup() { @@ -143,7 +168,7 @@ # Delete old versions of VBox modules. cleanup_modules depmod -@@ -464,12 +411,12 @@ cleanup() +@@ -468,12 +424,12 @@ cleanup() done # Clean-up X11-related bits
