Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2019-03-01 16:45:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Fri Mar 1 16:45:46 2019 rev:173 rq:677822 version:6.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2019-01-21
11:07:17.330741472 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.28833/virtualbox.changes
2019-03-01 16:46:08.597828250 +0100
@@ -2 +2,135 @@
-Wed Jan 16 18:32:24 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+Wed Feb 20 16:31:23 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Remove requires on libvncserver for virtualbox-vnc.
+
+-------------------------------------------------------------------
+Thu Jan 31 19:31:20 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Add changes requested by Security - new file "security_fixes.patch"
+ File UserManual.pdf is resent to clear error in build.
+
+-------------------------------------------------------------------
+Tue Jan 29 15:15:53 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Part of the API changes for kernel 5.0 are not fixed upstream. Add file
"fixes_for_5.0" back in.
+
+-------------------------------------------------------------------
+Mon Jan 28 20:29:22 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Version bump to 6.0.4 (released January 28 2019 by Oracle)
+
+Files "fixes_for_5.0" and "fixes_for_gcc9" are deleted - the code was fixed
upstream.
+
+This is a maintenance release. The following items were fixed and/or added:
+
+Virtualization core: support Shanghai/Zhaoxin CPUs.
+User interface: handle command line arguments to VirtualBox correctly (bugs
#18206 and #18197)
+User interface: improvements to machine manager window, virtual optical disk
creator, storage selector window and log viewer window
+User interface: various small fixes and improvements
+Audio: implemented time scheduling for the AC'97 device emulation to keep
audio and video in sync
+Graphics: basic support for VMSVGA graphics device in virtual machines using
EFI
+Network: fix occasional NATNet crashes (bug #13899)
+Network: worked around problems in certain PCnet drivers on old operating
systems
+Serial: fixed connecting to pseudo terminals on POSIX hosts (6.0.0 regression;
bug #18319)
+Linux hosts and guests: fix for building kernel modules against Linux 5.0.
Thank you Kyle Laker
+
+
+-------------------------------------------------------------------
+Fri Jan 25 02:17:17 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Converted vboxwebsrv to a systemd service. Previously, this was started
through init.d. bsc#1116050
+ Files "vboxweb-service.service" and "vboxweb-service.sh" are added.
+ File "vbox-vboxweb-init-script.diff" is removed.
+
+ File "fixes_for_4.20.patch" is removed - the code was fixed upstream.
+ File "fix_lib_search.patch" is added to fix the build of VBox0GL.
+ File "fixes_for_5.0.patch" is added to compensate for API changes in kernel
5.0.
+ File "virtualbox-system-x.patch" is removed.
+ File "fixes_for_Leap15.1.patch" is added to fix build errors on Leap
15<F5>.1.
+
+- Version bump to 6.0.2 (released January 15 2019 by Oracle)
+
+This is a maintenance release. The following items were fixed and/or added:
+
+User interface: fixed creation of desktop shortcuts for starting virtual
machines (bug #18207)
+User interface: allow the first run window to selecting host drives (bug
#18230)
+User interface: fixed attaching empty host optical drives (bug #18223)
+User interface: implemented a new virtual optical disk creation window
+USB: modified Linux backends to reset USB devices (previously, most guest
attempts to reset USB devices were ignored)
+PCnet: fixed a regression which caused some PCnet PCI guest drivers to not
detect the emulated hardware (bug #18286)
+Linux hosts: fixed conflict between Debian and Oracle build desktop files (bug
#18264)
+Linux and MacOS hosts: VirtualBoxVM command not accessible (bug #18257)
+Windows guests: multiple monitor fixes with VBoxSVGA graphics
+Windows guests: black screen with VBoxSVGA graphics when 3D is disabled (bug
#18205)
+Linux guests: fixed building drivers on SLES 12.4 (bug #18213)
+Linux guests: fixed building shared folder driver with older kernels (bug
#18238)
+OS/2 shared folders: fixed write regression introduced in 6.0.0 GA
+
+-------------------------------------------------------------------
+Thu Jan 17 20:22:24 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+-Version bump to 6.0.0 (released December 18 2018 by Oracle)
+
+This is a major update. The following major new features were added:
+
+Implemented support for exporting a virtual machine to Oracle Cloud
Infrastructure
+User interface: greatly improved HiDPI and scaling support, including better
detection and per-machine configuration
+Major rework of user interface with simpler and more powerful application and
virtual machine set-up
+User interface: a new file manager enabling user to control the guest file
system and copy files between host and guest.
+Graphics: major update of 3D graphics support for Windows guests, and VMSVGA
3D graphics device emulation on Linux and Solaris guests
+Added support for surround speaker setups (as used by Windows 10 Build 1809)
+Added utility vboximg-mount on Apple hosts to access the content of guest
disks on the host
+Added support for using Hyper-V as the fallback execution core on Windows
host, to avoid inability to run VMs at the price of reduced performance
+
+In addition, the following items were fixed and/or added:
+
+Execution core: fixed single-stepping in certain circumstances (bug #17316)
+User interface: video and audio recording can now be separately enabled
+Audio/Video recording fixes and improvements
+Audio: better support for attaching and detaching remote desktop connections
+Serial port emulation fixes
+Serial ports: allow changing the serial port attachment while a machine is
running (bug #6115)
+Networking: Added a workaround for older guests which do not enable bus
mastering for the virtio PCI device
+Networking: fixed wrong RCODE from DNS AAAA query with --natdnshostresolver1
(bug #18171)
+iSCSI: In cases where there is no ambiguity, the LUN of an iSCSI target is
automatically determined, for targets with non-zero LUNs
+Transparently resize disk images when merging if possible
+VBoxManage: support for DHCP options
+Fixed VNC/RDP (bug 18153)
+Guest Control: various new interfaces and features (see SDK documentation)
+Linux hosts: support Linux 4.20 (thank you Larry Finger)
+Shared folders: performance improvements
+Guest Additions: improved shared folder auto-mounting
+Windows Guest Additions: fix incorrect tablet co-ordinate handling with recent
Windows 10 builds
+Linux Additions: fix for building vboxvideo on EL 7.6 standard kernel,
contributed by Robert Conde (bug #18093)
+Linux guests: support Linux 4.20 (thank you Larry Finger)
+Linux guests: support VMSVGA in the Linux and X11 Additions
+MacOS Guest Additions: initial support
+OS/2 Guest Additions: initial shared folder support
+BIOS fixes
+ACPI: Up to four custom ACPI tables can now be configured for a VM
+
+-------------------------------------------------------------------
+Tue Jan 16 00:59:52 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
+
+- Version bump to 5.2.24 (released January 15 2019 by Oracle)
+
+This is a maintenance release. The following items were fixed and/or added:
+
+Linux Additions: fix for building vboxvideo on EL 7.6 standard kernel,
contributed by Robert Conde (bug #18093)
+USB: fixed a problem causing failures attaching SuperSpeed devices which
report USB version 3.1 (rather than 3.0) on Windows hosts
+Audio: added support for surround speaker setups used by Windows 10 Build 1809
+Linux hosts: fixed conflict between Debian and Oracle build desktop files (bug
#18264)
+Linux guests: fixed building drivers on SLES 12.4 (bug #18213)
+Linux guests: fixed building shared folder driver with older kernels (bug
#18238)
+
+Patch "fixes_for_5.0.patch" is added to handle API changes for kernel 5.0.
+
+Contains fixes for: CVE-2019-2500, CVE-2019-2524, CVE-2019-2552,
CVE-2018-3309, CVE-2019-2520
+ CVE-2019-2521, CVE-2019-2522, CVE-2019-2523,
CVE-2019-2526, CVE-2019-2548
+ CVE-2018-11763, CVE-2019-2511, CVE-2019-2508,
CVE-2019-2509, CVE-2019-2527
+ CVE-2019-2450, CVE-2019-2451, CVE-2019-2555,
CVE-2019-2554, CVE-2019-2556
+ CVE-2018-11784, CVE-2018-0734, CVE-2019-2525,
CVE-2019-2446, CVE-2019-2448
+ CVE-2019-2501, CVE-2019-2504, CVE-2019-2505,
CVE-2019-2506, and CVE-2019-2553a bsc#1122212.
+
+-------------------------------------------------------------------
+Wed Jan 15 18:32:24 UTC 2019 - Larry Finger <larry.fin...@gmail.com>
Old:
----
VirtualBox-5.2.22-patched.tar.bz2
fixes_for_4.20.patch
fixes_for_gcc9
vbox-vboxweb-init-script.diff
virtualbox-system-x.patch
New:
----
VirtualBox-6.0.4-patched.tar.bz2
fix_lib_search.patch
fixes_for_5.0.patch
fixes_for_Leap15.1.patch
security_fixes.patch
vboxweb-service.service
vboxweb-service.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.065827314 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.069827312 +0100
@@ -37,10 +37,10 @@
%global __provides_exclude ^libE?GL.so.1.*$
%define _vbox_instdir %{_libexecdir}/virtualbox
-%define _udevrulesdir %{_sysconfdir}/udev/rules.d
+%define _udevrulesdir /usr/lib/udev/rules.d
Name: virtualbox
-# ********* If the VB version exceeds 5.2.x, notify the libvirt maintainer!!
-Version: 5.2.22
+# ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!!
+Version: 6.0.4
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0-or-later
@@ -49,7 +49,7 @@
#
# so you don't need to repack virtualbox by hand, just add new release of
VirtualBox-x.x.x.tar.bz2 and line below with
# script virtualbox-patch-source.sh will do the job :)
-# WARNING: This is not a comment, but the real command to repack souce
+# WARNING: This is not a comment, but the real command to repack source
#%%(bash %%{_sourcedir}/virtualbox-patch-source.sh
VirtualBox-%%{version}.tar.bz2)
Source0: VirtualBox-%{version}-patched.tar.bz2
Source1: UserManual.pdf
@@ -69,17 +69,15 @@
Source18: fix_usb_rules.sh
Source19: vboxdrv.sh
Source20: README.autostart
+Source21: vboxweb-service.service
+Source22: vboxweb-service.sh
Source98: %{name}-rpmlintrc
Source99: %{name}-patch-source.sh
#rework init scripts to fit suse needs
Patch1: vbox-vboxdrv-init-script.diff
Patch2: vbox-vboxadd-init-script.diff
-Patch3: vbox-vboxweb-init-script.diff
-#PATCH-FIX-OPENSUSE: Use system X libraries and do not build local things
-Patch4: virtualbox-system-x.patch
#fix build : "Error 4001 - String must be entirely alphanumeric"
#with renaming we probably break some macosx functionality however ths is just
quick fix
-#file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds
#see thread :
http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
Patch6: vbox-smc-napa.diff
#fix build of Python and dev package on openSUSE 11.3
@@ -89,11 +87,13 @@
#fix failed linking process during build - this patch is just quick workaround
Patch10: vbox-gsoapssl-deps.diff
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is
displayed, when user
-#try to start VirtualBox and is not memeber of vboxusers group
+#try to start VirtualBox and is not member of vboxusers group
Patch99: vbox-permissions_warning.diff
#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes
build-compare happier
Patch100: vbox-no-build-dates.diff
Patch101: vbox-default-os-type.diff
+# Disable the distributed versions of vboxdrv.sh and vboxadd.sh for security
reasons.
+Patch102: security_fixes.patch
#disable update in vbox gui
Patch103: vbox-disable-updates.diff
#use pie/fPIE for setuid binaries (bnc#743143)
@@ -120,19 +120,19 @@
Patch118: internal-headers.patch
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
Patch120: fixes_for_python.patch
-# Remove vboxvideo from build
-Patch121: remove_vbox_video_build.patch
# Fix build for Qt 5.11
Patch122: fixes_for_Qt5.11.patch
# Switch to Python 3.4+
Patch123: switch_to_python3.4+.patch
Patch124: fix_32_bit_builds.patch
-# Fix API changes for kernel 4.20+
-Patch125: fixes_for_4.20.patch
-# Fix changes for gcc9
-Patch126: fixes_for_gcc9
-# Fix API changes for kernel 5.0+
-#Patch127: fixes_for_5.0.patch
+# Use build parameters to control video driver problems
+Patch125: remove_vbox_video_build.patch
+# Fix for API changes in late v5.0
+Patch126: fixes_for_5.0.patch
+# fix library search
+Patch128: fix_lib_search.patch
+# Fixes for modified kernel in Leap 15.1
+Patch129: fixes_for_Leap15.1.patch
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@@ -212,7 +212,6 @@
Requires(pre): net-tools-deprecated
%endif
Requires(pre): pwdutils
-Requires(pre): %insserv_prereq
Requires(pre): %fillup_prereq
Recommends: %{name}-gui = %{version}
#rename from ose version:
@@ -234,8 +233,6 @@
# with us, but with different owner.
Conflicts: i4l-vbox
-%posttrans
-
%description
VirtualBox is a hosted hypervisor for x86 computers. It supports the
creation and management of guest virtual machines running versions
@@ -259,7 +256,7 @@
Obsoletes: %{name}-ose-qt < %{version}
%description qt
-Qt GUI part for %{name}.
+This package contains the code for the GUI used to control VMs.
#########################################
%package websrv
@@ -267,20 +264,20 @@
Group: System/Emulators/PC
Requires: %{name} = %{version}
Provides: %{name}-gui = %{version}
-Requires(pre): %insserv_prereq
+Obsoletes: %{name}-vboxwebsrv
%description websrv
-websrv GUI part for %{name}.
+The VirtualBox web server is used to control headless VMs using a browser.
#########################################
%package host-KMP
Summary: Host kernel module for VirtualBox
Group: System/Emulators/PC
-%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %%{SOURCE7}
-n %%{name}-host -f %%{SOURCE5} -x kdump um xen pae xenpae pv
+%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7}
-n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv
Requires: %{kernel_module_package_buildreqs}
%description host-KMP
-This package contains the kernel-module for VirtualBox.
+This package contains the kernel-modules that VirtualBox uses to create
virtual machines.
##########################################
%package guest-KMP
@@ -290,7 +287,7 @@
Requires: %{kernel_module_package_buildreqs}
%description guest-KMP
-This package contains the kernel-module for VirtualBox.
+This package contains the VB kernel-modules for Linux guest virtual machines.
##########################################
%package guest-x11
@@ -303,7 +300,6 @@
Obsoletes: xorg-x11-driver-virtualbox-ose < %{version}
%description guest-x11
-VirtualBox
This package contains X11 guest utilities and X11 guest mouse and video drivers
###########################################
@@ -315,7 +311,6 @@
#rename from "ose" version:
Provides: %{name}-ose-guest-tools = %{version}
Obsoletes: %{name}-ose-guest-tools < %{version}
-Requires(pre): %insserv_prereq
%if ! 0%{?suse_version} > 1325
Requires(pre): net-tools-deprecated
%endif
@@ -368,13 +363,14 @@
%description host-source
Source files for %{name} host kernel modules
These can be built for custom kernels using
-cd %{_prefix}/src/kernel-modules/virtualbox ; make ; make install
+sudo /sbin/vboxconfig
%package guest-source
Summary: Source files for %{name} guest kernel modules
-#Requires: %{name} = %{version}
Group: Development/Sources
Requires: gcc
+Requires: kernel-devel
+Requires: libelf-devel
Requires: make
BuildArch: noarch
@@ -399,7 +395,6 @@
Summary: VNC desktop sharing
Group: System/Emulators/PC
Requires: %{name} = %{version}
-Requires: libvncserver0
%description vnc
Virtual Network Computing (VNC) is a graphical desktop sharing system that
uses the Remote Frame Buffer
@@ -411,8 +406,6 @@
%setup -q -n VirtualBox-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
@@ -420,6 +413,7 @@
%patch99 -p1
%patch100 -p1
%patch101 -p1
+%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
@@ -433,13 +427,13 @@
%patch116 -p1
%patch118 -p1
%patch120 -p1
-%patch121 -p1
%patch122 -p1
%patch123 -p1
%patch124 -p1
%patch125 -p1
%patch126 -p1
-#%patch127 -p1
+%patch128 -p1
+%patch129 -p1
#copy user manual
cp %{SOURCE1} UserManual.pdf
@@ -515,10 +509,10 @@
#
# build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci
-# guest modules : vboxguest,vboxsf,vboxvideo
+# guest modules : vboxguest,vboxsf
echo "build kernel modules"
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
- out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
+ out/linux.*/release/bin/additions/src/vbox{guest,sf}; do
#get the module name from path
module_name=$(basename "$vbox_module")
@@ -545,11 +539,6 @@
cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
$PWD/modules_build_dir/$flavor/$module_name
fi
- # copy vboxguest (for guest) module symbols which are used by vboxvideo
km:
- if [ "$module_name" = "vboxvideo" ]; then
- cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
- $PWD/modules_build_dir/$flavor/$module_name
- fi
# build the module for the specific flavor
make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor
%{?linux_make_arch} modules \
M=$PWD/modules_build_dir/$flavor/$module_name
@@ -561,6 +550,7 @@
echo "create directory structure"
#################################
install -d -m 755 %{buildroot}/sbin
+install -d -m 755 %{buildroot}/lib
install -d -m 755 %{buildroot}%{_bindir}
install -d -m 755 %{buildroot}%{_sbindir}
install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls
@@ -572,7 +562,6 @@
install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input
install -d -m 755 %{buildroot}%{_sysconfdir}/default
-install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
install -d %{buildroot}%{_unitdir}
install -d %{buildroot}%{_unitdir}/multi-user.target.wants
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
@@ -588,11 +577,10 @@
export INITRD_IN_POSTTRANS=1
export KMP_NEEDS_MKINITRD=0
#to install modules we use here similar steps like in build phase, go through
all the modules :
-for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video}
+for module_name in vbox{drv,netflt,pci,netadp,guest,sf}
do
#and through the all flavors
for flavor in %{flavors_to_build}; do
- #to install modules use Makefile from
%{_prefix}/src/linux-obj/%_target_cpu/$flavor and builds from
$PWD/modules_build_dir/$flavor/$module_name
make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install
M=$PWD/modules_build_dir/$flavor/$module_name
done
done
@@ -617,8 +605,6 @@
pushd out/linux.*/release/bin/additions/
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
install -m 755 VBoxClient %{buildroot}%{_bindir}
-# xorg drivers for video
-#install -m 755 vboxvideo_drv_system.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
popd
# VBoxOGL* libs for guest-x11 subpackage
install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
@@ -626,15 +612,13 @@
# 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)
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
##############################################
echo "entering virtualbox(-qt) install section"
##############################################
-# copy the main files to %{_vbox_instdir}
+# copy the main files to %%{_vbox_instdir}
pushd out/linux.*/release/bin
install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
@@ -662,7 +646,8 @@
install -m 755 VBoxUSB_DevRules
%{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
-install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
+install -m 755 VirtualBox
%{buildroot}%{_vbox_instdir}/VirtualBox6
+install -m 755 VirtualBoxVM %{buildroot}%{_vbox_instdir}
install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
install -m 644 *.so %{buildroot}%{_vbox_instdir}
@@ -689,9 +674,6 @@
install -m 644 %{SOURCE4}
%{buildroot}%{_sysconfdir}/default/virtualbox
#install wrapper script
install -m 644 %{SOURCE9}
%{buildroot}%{_bindir}/VirtualBox
-# modify and install the vboxdrv init script
-#sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \
-#
src/VBox/Installer/linux/vboxdrv.sh
# Service files to load kernel modules on boot
install -m 0644 %{SOURCE14}
%{buildroot}%{_unitdir}/vboxdrv.service
@@ -701,7 +683,8 @@
install -m 0755 %{SOURCE17}
%{buildroot}/sbin/vboxguestconfig
install -m 0755 %{SOURCE18}
%{buildroot}/sbin/vbox-fix-usb-rules.sh
install -m 0755 %{SOURCE19}
%{buildroot}%{_vbox_instdir}/vboxdrv.sh
-
+install -m 0644 %{SOURCE21}
%{buildroot}%{_unitdir}/vboxweb-service.service
+install -m 0755 %{SOURCE22}
%{buildroot}%{_vbox_instdir}/vboxweb-service.sh
# Init script to start virtual boxes during boot
ln -sf %{_unitdir}/vboxdrv.service
%{buildroot}%{_unitdir}/multi-user.target.wants/vboxdrv.service
ln -sf %{_unitdir}/vboxadd-service.service
%{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service
@@ -750,9 +733,6 @@
install -m 755 webtest %{buildroot}%{_vbox_instdir}
popd
-sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g"
src/VBox/Installer/linux/vboxweb-service.sh
-install -m 744 src/VBox/Installer/linux/vboxweb-service.sh
%{buildroot}%{_sysconfdir}/init.d/vboxweb-service
-ln -s %{_sysconfdir}/init.d/vboxweb-service
%{buildroot}%{_sbindir}/rcvboxweb-service
#
######################################################
echo "entering virtualbox-guest-desktop-icons install section"
@@ -789,7 +769,10 @@
# Add groups for seamless mode and shared folders:
getent group vboxguest >/dev/null || groupadd -r vboxguest
getent group vboxsf >/dev/null || groupadd -r vboxsf
-%service_add_pre vboxadd.service
+%service_add_pre vboxadd-service.service
+
+%pre websrv
+%service_add_pre vboxweb-service.service
#######################################################
# scriptlets - post
@@ -817,7 +800,7 @@
}
%post qt
-%set_permissions %{_vbox_instdir}/VirtualBox
+%set_permissions %{_vbox_instdir}/VirtualBoxVM
%set_permissions %{_vbox_instdir}/VBoxSDL
%verifyscript
@@ -827,13 +810,14 @@
%verify_permissions -e %{_vbox_instdir}/VBoxHeadless
%verifyscript qt
-%verify_permissions -e %{_vbox_instdir}/VirtualBox
+%verify_permissions -e %{_vbox_instdir}/VirtualBoxVM
%verify_permissions -e %{_vbox_instdir}/VBoxSDL
%post guest-tools
%service_add_post vboxadd-service.service
%post websrv
+%service_add_post vboxweb-service.service
%post vnc
EXTPACK="/usr/share/virtualbox/extensions/VNC-%{version}.vbox-extpack"
@@ -857,6 +841,7 @@
%preun websrv
%stop_on_removal vboxweb-service
+%service_del_preun vboxweb-service.service
exit 0
#######################################################
@@ -866,7 +851,6 @@
%postun
/sbin/ldconfig
%restart_on_update vboxdrv
-%insserv_cleanup
# immediately restarting virtualbox may not work. As such wait for the next
reboot to restart
export DISABLE_RESTART_ON_UPDATE=yes
%service_del_postun vboxdrv.service
@@ -874,12 +858,11 @@
%postun guest-tools
%restart_on_update vboxadd
%restart_on_update vboxadd-service
-%insserv_cleanup
%service_del_postun vboxadd-service.service
%postun websrv
%restart_on_update vboxweb-service
-%insserv_cleanup
+%service_del_postun vboxweb-service.service
#
#######################################################
@@ -913,7 +896,6 @@
%{_vbox_instdir}/VBoxVMM.so
%{_vbox_instdir}/VBoxXPCOMC.so
%{_vbox_instdir}/VBoxXPCOM.so
-%{_vbox_instdir}/VBoxDD2RC.rc
%{_vbox_instdir}/VBoxDDRC.rc
%{_vbox_instdir}/VMMRC.rc
%{_vbox_instdir}/VBox*.r0
@@ -945,7 +927,7 @@
%{_sbindir}/rcvboxdrv
/sbin/vboxconfig
%{_vbox_instdir}/VBoxCreateUSBNode.sh
-%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
+%verify(not mode) %attr(4755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
@@ -958,7 +940,8 @@
%defattr(-, root, root)
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBox
+%attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6
+%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL
#wrapper script is in bindir
%attr(0755,root,root) %{_bindir}/VirtualBox
@@ -968,7 +951,9 @@
%{_vbox_instdir}/VBoxTestOGL
#qm's translations
%{_datadir}/virtualbox/nls
-%{_vbox_instdir}/VirtualBox.so
+%{_vbox_instdir}/VBoxGlobal.so
+%{_vbox_instdir}/VBoxSVGA3D.so
+%{_vbox_instdir}/VirtualBoxVM.so
%{_vbox_instdir}/VBoxDbg.so
%{_bindir}/VBoxSDL
%{_vbox_instdir}/VBoxSDL.so
@@ -1040,10 +1025,10 @@
%files websrv
%defattr(-,root, root)
-%{_vbox_instdir}/vboxwebsrv
+%{_unitdir}/vboxweb-service.service
+%{_vbox_instdir}/vboxweb-service.sh
%{_vbox_instdir}/webtest
-%{_sysconfdir}/init.d/vboxweb-service
-%{_sbindir}/rcvboxweb-service
+%{_vbox_instdir}/vboxwebsrv
%files guest-desktop-icons
%defattr(-,root, root)
++++++ Fix_for_server_1.19.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.093827303 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.093827303 +0100
@@ -1,8 +1,8 @@
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-@@ -1237,7 +1237,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+@@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
#endif
/* Register block and wake-up handlers for getting new screen size hints.
*/
@@ -14,11 +14,11 @@
/* software cursor */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
-@@ -36,6 +36,10 @@
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
+@@ -39,6 +39,10 @@
#include "cursorstr.h"
#include "servermd.h"
@@ -29,11 +29,11 @@
#include "vboxvideo.h"
#ifdef XORG_7X
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
-@@ -36,6 +36,10 @@
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
+@@ -35,6 +35,10 @@
* Michael Thayer <michael.tha...@oracle.com>
*/
++++++ UserManual.pdf ++++++
(binary differes)
++++++ VirtualBox-5.2.22-patched.tar.bz2 -> VirtualBox-6.0.4-patched.tar.bz2
++++++
/work/SRC/openSUSE:Factory/virtualbox/VirtualBox-5.2.22-patched.tar.bz2
/work/SRC/openSUSE:Factory/.virtualbox.new.28833/VirtualBox-6.0.4-patched.tar.bz2
differ: char 11, line 1
++++++ fix_32_bit_builds.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.145827283 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.145827283 +0100
@@ -1,10 +1,10 @@
-Index: VirtualBox-5.2.20/src/VBox/Additions/linux/sharedfolders/utils.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/linux/sharedfolders/utils.c
===================================================================
---- VirtualBox-5.2.20.orig/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ VirtualBox-5.2.20/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -49,11 +49,11 @@ static void sf_timespec_from_ftime(RTTIM
- int64_t t = 1000000000 * *time;
- RTTimeSpecSetNano(ts, t);
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/linux/sharedfolders/utils.c
++++ VirtualBox-6.0.2/src/VBox/Additions/linux/sharedfolders/utils.c
+@@ -63,11 +63,11 @@ static void sf_timespec_from_ftime(RTTIM
+ int64_t t = 1000000000 * *time;
+ RTTimeSpecSetNano(ts, t);
}
-#else /* >= 2.6.0 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
@@ -17,4 +17,4 @@
+static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
#endif
{
- int64_t t = RTTimeSpecGetNano(ts);
+ int64_t t = RTTimeSpecGetNano(ts);
++++++ fix_lib_search.patch ++++++
Index: VirtualBox-6.0.2/configure
===================================================================
--- VirtualBox-6.0.2.orig/configure
+++ VirtualBox-6.0.2/configure
@@ -1538,14 +1538,14 @@ EOF
INCQT5="$q/include $q/include/QtCore"
FLGQT5="-DQT_SHARED"
I_INCQT5=`prefix_I "$INCQT5"`
- LIBQT5="-L$q/lib -lQt5CoreVBox"
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5CoreVBox"
TOOLQT5="$q"
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5
nofatal &&
test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
foundqt5=2 # internal
break;
fi
- LIBQT5="-L$q/lib -lQt5Core"
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5Core"
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5
nofatal &&
test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
foundqt5=1 # no pkg-config, Qt directory
Index: VirtualBox-6.0.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ VirtualBox-6.0.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -217,15 +217,7 @@ VBoxOGL_LIBS.win += \
$(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- ifdef VBOX_USE_SYSTEM_GL_HEADERS
VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
- else
- VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
- endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
++++++ fixes_for_4.20.patch -> fixes_for_5.0.patch ++++++
--- /work/SRC/openSUSE:Factory/virtualbox/fixes_for_4.20.patch 2018-12-03
10:05:56.967954152 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.28833/fixes_for_5.0.patch
2019-03-01 16:46:06.105829195 +0100
@@ -1,145 +1,15 @@
-Index:
VirtualBox-5.2.22/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+Index: VirtualBox-5.2.24/src/VBox/Additions/linux/sharedfolders/vfsmod.c
===================================================================
----
VirtualBox-5.2.22.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-+++ VirtualBox-5.2.22/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-@@ -84,8 +84,11 @@ static long VBoxNetAdpLinuxIOCtlUnlocked
- #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
-
- static void vboxNetAdpEthGetDrvinfo(struct net_device *dev, struct
ethtool_drvinfo *info);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct
ethtool_link_ksettings *link_ksettings);
-+#else
- static int vboxNetAdpEthGetSettings(struct net_device *dev, struct
ethtool_cmd *cmd);
--
-+#endif
-
-
/*********************************************************************************************************************************
- * Global Variables
*
-@@ -129,7 +132,11 @@ static struct miscdevice g_CtlDev =
- static const struct ethtool_ops gEthToolOpsVBoxNetAdp =
- {
- .get_drvinfo = vboxNetAdpEthGetDrvinfo,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+ .get_link_ksettings = vboxNetAdpEthGetSettings,
-+#else
- .get_settings = vboxNetAdpEthGetSettings,
-+#endif
- .get_link = ethtool_op_get_link,
- };
-
-@@ -200,8 +207,18 @@ static void vboxNetAdpEthGetDrvinfo(stru
- "N/A");
- }
-
--
- /* ethtool_ops::get_settings */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct
ethtool_link_ksettings *link_ksettings)
-+{
-+ link_ksettings->link_modes.supported[0] = 0;
-+ ethtool_link_ksettings_zero_link_mode(link_ksettings, advertising);
-+ link_ksettings->base.speed = SPEED_10;
-+ link_ksettings->base.duplex = DUPLEX_FULL;
-+ link_ksettings->base.port = PORT_TP;
-+ link_ksettings->base.phy_address = 0;
-+ link_ksettings->base.autoneg = AUTONEG_DISABLE;
-+#else
- static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct
ethtool_cmd *cmd)
- {
- cmd->supported = 0;
-@@ -218,6 +235,7 @@ static int vboxNetAdpEthGetSettings(stru
- cmd->autoneg = AUTONEG_DISABLE;
- cmd->maxtxpkt = 0;
- cmd->maxrxpkt = 0;
-+#endif
- return 0;
- }
-
-Index: VirtualBox-5.2.22/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-===================================================================
---- VirtualBox-5.2.22.orig/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-+++ VirtualBox-5.2.22/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-@@ -171,11 +171,19 @@ RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPE
- {
- IPRT_LINUX_SAVE_EFL_AC();
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+ struct timespec64 Ts;
-+ ktime_get_real_ts64(&Ts);
-+#else
- struct timespec Ts;
- ktime_get_real_ts(&Ts);
-+#endif
- IPRT_LINUX_RESTORE_EFL_AC();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+ return RTTimeSpecSetTimespec64(pTime, &Ts);
-+#else
- return RTTimeSpecSetTimespec(pTime, &Ts);
--
-+#endif
- #else /* < 2.6.16 */
- struct timeval Tv;
- do_gettimeofday(&Tv);
-Index: VirtualBox-5.2.22/include/iprt/time.h
-===================================================================
---- VirtualBox-5.2.22.orig/include/iprt/time.h
-+++ VirtualBox-5.2.22/include/iprt/time.h
-@@ -54,7 +54,6 @@ typedef struct RTTIMESPEC
- int64_t i64NanosecondsRelativeToUnixEpoch;
- } RTTIMESPEC;
-
--
- /** @name RTTIMESPEC methods
- * @{ */
-
-@@ -388,6 +387,7 @@ DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTim
- {
- return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec),
pTimeval->tv_usec);
- }
-+
- #endif /* various ways of detecting struct timeval */
-
-
-@@ -427,6 +427,25 @@ DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTim
- {
- return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimespec->tv_sec),
pTimespec->tv_nsec);
- }
-+
-+#ifndef _LINUX_TIME64_H
-+/* With kernel 4.20+, the second argument of time routines change from
-+ * struct timespec to struct timespec64. This file is built twice, once
-+ * in user mode, and once in kernel mode. In user mode, the struct is
-+ * undefined, thus the following definition is provided. The guard macro
-+ * from the kernels include/linux/time64.h is _LINUX_TIME64_H, thus
-+ * the definition of that macro determines whether the struct is defined.
-+ */
-+struct timespec64 {
-+ long long tv_sec; /* seconds */
-+ long tv_nsec; /* nanoseconds */
-+};
-+#endif
-+
-+DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const
struct timespec64 *pTimeval)
-+{
-+ return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec),
1000 * pTimeval->tv_nsec);
-+}
- #endif /* various ways of detecting struct timespec */
-
-
-Index: VirtualBox-5.2.22/src/VBox/Additions/linux/drm/vbox_fb.c
-===================================================================
---- VirtualBox-5.2.22.orig/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ VirtualBox-5.2.22/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -297,8 +297,12 @@ static int vboxfb_create(struct drm_fb_h
- * The last flag forces a mode set on VT switches even if the kernel
- * does not think it is needed.
- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+ info->flags = FBINFO_DEFAULT | FBINFO_MISC_ALWAYS_SETPAR;
-+#else
- info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT |
- FBINFO_MISC_ALWAYS_SETPAR;
+--- VirtualBox-5.2.24.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ VirtualBox-5.2.24/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+@@ -37,6 +37,9 @@
+ # include <linux/mount.h>
+ #endif
+ #include <linux/seq_file.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++#include <uapi/linux/mount.h>
+#endif
- info->fbops = &vboxfb_ops;
- ret = fb_alloc_cmap(&info->cmap, 256, 0);
+ MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
+ MODULE_AUTHOR(VBOX_VENDOR);
+
++++++ fixes_for_Leap15.1.patch ++++++
Index: VirtualBox-5.2.24/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-5.2.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-5.2.24/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -264,12 +264,6 @@ static struct drm_driver driver = {
.lastclose = vbox_driver_lastclose,
.master_set = vbox_master_set,
.master_drop = vbox_master_drop,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75)
- .set_busid = drm_pci_set_busid,
-# endif
-#endif
-
.fops = &vbox_fops,
.irq_handler = vbox_irq_handler,
.name = DRIVER_NAME,
++++++ fixes_for_Qt5.11.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.185827268 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.185827268 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+Index: VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
===================================================================
---- VirtualBox-5.2.14.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-+++ VirtualBox-5.2.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+--- VirtualBox-6.0.2.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
++++ VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
@@ -83,6 +83,7 @@
#include <QtWidgets/qgraphicsitem.h>
#include <QtWidgets/qgraphicslayoutitem.h>
@@ -10,15 +10,15 @@
#include <QtCore/QMetaType>
#include <QtGui/qevent.h>
#include <QtGui/qtouchdevice.h>
-Index:
VirtualBox-5.2.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+Index:
VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
===================================================================
----
VirtualBox-5.2.14.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-+++
VirtualBox-5.2.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-@@ -22,6 +22,7 @@
+---
VirtualBox-6.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
++++
VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+@@ -18,6 +18,7 @@
/* Qt includes: */
- # include <QButtonGroup>
- # include <QRegExpValidator>
+ #include <QButtonGroup>
+ #include <QRegExpValidator>
+#include <QButtonGroup>
/* GUI includes: */
- # include "QIWidgetValidator.h"
+ #include "QIWidgetValidator.h"
++++++ internal-headers.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.201827262 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.205827261 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
@@ -12,11 +12,11 @@
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
vboxvideo_15_DEFS := \
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
_XORG_SERVER_H_ _DIX_CONFIG_H_
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
-@@ -36,10 +36,6 @@
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
+@@ -35,10 +35,6 @@
* Michael Thayer <michael.tha...@oracle.com>
*/
@@ -27,11 +27,11 @@
#include "misc.h"
#include "xf86DDC.h"
#include "xf86Crtc.h"
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
-@@ -36,10 +36,6 @@
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
+@@ -39,10 +39,6 @@
#include "cursorstr.h"
#include "servermd.h"
@@ -42,13 +42,13 @@
#include "vboxvideo.h"
#ifdef XORG_7X
-Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
++++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
@@ -42,8 +42,8 @@
- #ifndef _VBOXVIDEO_H_
- #define _VBOXVIDEO_H_
+ # pragma once
+ #endif
-#include <VBoxVideoGuest.h>
-#include <VBoxVideo.h>
++++++ modify_for_4_8_bo_move.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.217827256 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.221827255 +0100
@@ -1,10 +1,10 @@
-Index: VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+Index: VirtualBox-6.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-+++ VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+--- VirtualBox-6.0.2.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
++++ VirtualBox-6.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@
#include <iprt/assert.h>
- #include <iprt/err.h>
+ #include <iprt/errcore.h>
#include "r0drv/alloc-r0drv.h"
-
+#include <linux/kmemleak.h>
++++++ remove_vbox_video_build.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.229827252 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.229827252 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.4/Makefile.kmk
+Index: VirtualBox-5.2.24/Makefile.kmk
===================================================================
---- VirtualBox-5.2.4.orig/Makefile.kmk
-+++ VirtualBox-5.2.4/Makefile.kmk
+--- VirtualBox-5.2.24.orig/Makefile.kmk
++++ VirtualBox-5.2.24/Makefile.kmk
@@ -701,7 +701,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
src/VBox/Additions/x11/vboxmouse \
src/VBox/Additions/x11/vboxmouse/xorg70 \
@@ -10,11 +10,11 @@
src/VBox/NetworkServices \
src/VBox/NetworkServices/DHCP \
src/VBox/NetworkServices/NAT \
-Index: VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-5.2.24/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
---- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
+--- VirtualBox-5.2.24.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ VirtualBox-5.2.24/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -398,7 +398,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@@ -24,10 +24,10 @@
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-Index: VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk
+Index: VirtualBox-5.2.24/src/VBox/Additions/x11/Makefile.kmk
===================================================================
---- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/Makefile.kmk
-+++ VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-5.2.24.orig/src/VBox/Additions/x11/Makefile.kmk
++++ VirtualBox-5.2.24/src/VBox/Additions/x11/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
++++++ security_fixes.patch ++++++
# This patch file is to warn future maintainers of VirtualBox on openSUSE
# platforms that the distributed versions of vboxadd.sh and vboxdrv.sh
# contain security holes. If you need to use these scripts in the future,
# please consult the Security Group at openSUSE.
#
# January 31, 2019 - Larry Finger
#
Index: VirtualBox-6.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-6.0.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-6.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -560,6 +560,9 @@ dmnstatus()
fi
}
+echo "This script has insecurities. It must never be used in openSUSE without
consultine Security."
+exit 1
+
case "$2" in quiet)
QUIET=yes;;
esac
Index: VirtualBox-6.0.4/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- VirtualBox-6.0.4.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-6.0.4/src/VBox/Installer/linux/vboxdrv.sh
@@ -37,6 +37,9 @@ DEVICE=/dev/vboxdrv
MODPROBE=/sbin/modprobe
SCRIPTNAME=vboxdrv.sh
+echo "This script has insecurities. It must never be used in openSUSE without
consultine Security."
+exit 1
+
# The below is GNU-specific. See VBox.sh for the longer Solaris/OS X version.
TARGET=`readlink -e -- "${0}"` || exit 1
SCRIPT_DIR="${TARGET%/[!/]*}"
++++++ switch_to_python3.4+.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.257827241 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.257827241 +0100
@@ -1,8 +1,8 @@
-Index: b/configure
+Index: VirtualBox-6.0.2/configure
===================================================================
---- a/configure
-+++ b/configure
-@@ -1963,17 +1963,17 @@ extern "C" int main(void)
+--- VirtualBox-6.0.2.orig/configure
++++ VirtualBox-6.0.2/configure
+@@ -1969,17 +1969,17 @@ extern "C" int main(void)
{
Py_Initialize();
printf("found version %s", PY_VERSION);
@@ -23,11 +23,11 @@
for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
-Index: b/src/VBox/Installer/linux/routines.sh
+Index: VirtualBox-6.0.2/src/VBox/Installer/linux/routines.sh
===================================================================
---- a/src/VBox/Installer/linux/routines.sh
-+++ b/src/VBox/Installer/linux/routines.sh
-@@ -375,8 +375,8 @@ terminate_proc() {
+--- VirtualBox-6.0.2.orig/src/VBox/Installer/linux/routines.sh
++++ VirtualBox-6.0.2/src/VBox/Installer/linux/routines.sh
+@@ -391,8 +391,8 @@ terminate_proc() {
maybe_run_python_bindings_installer() {
VBOX_INSTALL_PATH="${1}"
@@ -38,11 +38,11 @@
if sys.version_info >= (2, 6):
print \"test\"' 2> /dev/null`" != "test" ]; then
echo 1>&2 "Python 2.6 or later not available, skipping bindings
installation."
-Index: b/src/bldprogs/scm.cpp
+Index: VirtualBox-6.0.2/src/bldprogs/scm.cpp
===================================================================
---- a/src/bldprogs/scm.cpp
-+++ b/src/bldprogs/scm.cpp
-@@ -2033,7 +2033,7 @@ static int scmProcessFileInner(PSCMRWSTA
+--- VirtualBox-6.0.2.orig/src/bldprogs/scm.cpp
++++ VirtualBox-6.0.2/src/bldprogs/scm.cpp
+@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst,
"/usr/bin/python", 15) == 0)
|| (cchFirst >= 19 && strncmp(pchFirst,
"/usr/bin/env python", 19) == 0) )
@@ -51,10 +51,10 @@
else if ( (cchFirst >= 13 && strncmp(pchFirst,
"/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst,
"/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl";
-Index: b/src/libs/libxml2-2.9.4/configure
+Index: VirtualBox-6.0.2/src/libs/libxml2-2.9.4/configure
===================================================================
---- a/src/libs/libxml2-2.9.4/configure
-+++ b/src/libs/libxml2-2.9.4/configure
+--- VirtualBox-6.0.2.orig/src/libs/libxml2-2.9.4/configure
++++ VirtualBox-6.0.2/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS=
pythondir=
@@ -79,11 +79,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then :
-Index: b/src/VBox/ValidationKit/testboxscript/setup.sh
+Index: VirtualBox-6.0.2/src/VBox/ValidationKit/testboxscript/setup.sh
===================================================================
---- a/src/VBox/ValidationKit/testboxscript/setup.sh
-+++ b/src/VBox/ValidationKit/testboxscript/setup.sh
-@@ -644,7 +644,7 @@ import sys;\
+--- VirtualBox-6.0.2.orig/src/VBox/ValidationKit/testboxscript/setup.sh
++++ VirtualBox-6.0.2/src/VBox/ValidationKit/testboxscript/setup.sh
+@@ -652,7 +652,7 @@ import sys;\
x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or
(sys.version_info[1] == 5 and sys.version_info[2] >= 1));\
sys.exit(not x);\
";
@@ -92,10 +92,10 @@
do
python=`which ${python} 2> /dev/null`
if [ -n "${python}" -a -x "${python}" ]; then
-Index: b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+Index: VirtualBox-6.0.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
---- a/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-+++ b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+--- VirtualBox-6.0.2.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
++++ VirtualBox-6.0.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -20,7 +20,7 @@
%define %PYTHON% 1
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
@@ -105,7 +105,7 @@
Summary: Oracle VM VirtualBox
Name: %NAME%
-@@ -82,7 +82,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
+@@ -89,7 +89,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
%if %{?with_python:1}%{!?with_python:0}
(export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
cd ./sdk/installer && \
@@ -114,10 +114,10 @@
%endif
rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
-Index: b/src/libs/libxml2-2.9.4/libxml.spec.in
+Index: VirtualBox-6.0.2/src/libs/libxml2-2.9.4/libxml.spec.in
===================================================================
---- a/src/libs/libxml2-2.9.4/libxml.spec.in
-+++ b/src/libs/libxml2-2.9.4/libxml.spec.in
+--- VirtualBox-6.0.2.orig/src/libs/libxml2-2.9.4/libxml.spec.in
++++ VirtualBox-6.0.2/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
make install DESTDIR=%{buildroot}
@@ -133,10 +133,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-Index: b/src/libs/libxml2-2.9.4/libxml2.spec
+Index: VirtualBox-6.0.2/src/libs/libxml2-2.9.4/libxml2.spec
===================================================================
---- a/src/libs/libxml2-2.9.4/libxml2.spec
-+++ b/src/libs/libxml2-2.9.4/libxml2.spec
+--- VirtualBox-6.0.2.orig/src/libs/libxml2-2.9.4/libxml2.spec
++++ VirtualBox-6.0.2/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3}
@@ -146,26 +146,23 @@
make install DESTDIR=%{buildroot}
%endif # with_python3
-Index: b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+Index: VirtualBox-6.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
---- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-@@ -439,8 +439,10 @@ char *PyTraceback_AsString(PyObject *exc
+--- VirtualBox-6.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ VirtualBox-6.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2
char *tempResult = PyString_AsString(obResult);
--#else
+#elif PY_MINOR_VERSION <= 6
- char *tempResult = PyUnicode_AsUTF8(obResult);
-+#else
-+ const char *tempResult = PyUnicode_AsUTF8(obResult);
- #endif
- result = (char *)PyMem_Malloc(strlen(tempResult)+1);
- if (result==NULL)
-Index: b/src/libs/xpcom18a4/python/src/PyGBase.cpp
++ char *tempResult = PyUnicode_AsUTF8(obResult);
+ #else
+ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
+ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
+Index: VirtualBox-6.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
---- a/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ b/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-6.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
++++ VirtualBox-6.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid )
++++++ vbox-default-os-type.diff ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.265827239 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.265827239 +0100
@@ -1,16 +1,16 @@
-Index:
VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+Index:
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
----
VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-+++
VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-@@ -327,15 +327,15 @@ void UINameAndSystemEditor::sltFamilyCha
+---
VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
++++
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+@@ -251,15 +251,15 @@ void UINameAndSystemEditor::sltFamilyCha
if (iIndexWin7 != -1)
m_pComboType->setCurrentIndex(iIndexWin7);
}
-- /* Or select Ubuntu item for Linux family as default: */
+- /* Or select Oracle Linux item for Linux family as default: */
+ /* Or select openSUSE item for Linux family as default: */
- else if (strFamilyId == "Linux")
+ else if (m_strFamilyId == "Linux")
{
-- QString strDefaultID = "Ubuntu";
+- QString strDefaultID = "Oracle";
+ QString strDefaultID = "openSUSE";
if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
strDefaultID += "_64";
++++++ vbox-disable-updates.diff ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.281827232 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.281827232 +0100
@@ -1,7 +1,7 @@
-Index:
VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+Index:
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
===================================================================
----
VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
-+++
VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+---
VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
++++
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -110,8 +110,8 @@ void UIGlobalSettingsUpdate::getFromCach
/* Get old update data from the cache: */
const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base();
@@ -13,11 +13,20 @@
if (m_pCheckBoxUpdate->isChecked())
{
m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex);
-Index:
VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+Index:
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
----
VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++
VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -103,16 +103,6 @@ UISettingsDialogGlobal::UISettingsDialog
+---
VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++
VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -91,8 +91,6 @@ void UISettingsDialogGlobal::retranslate
+ m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
+
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+- /* Update page: */
+- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
+ #endif
+
+ /* Language page: */
+@@ -208,16 +206,6 @@ void UISettingsDialogGlobal::prepare()
iPageIndex, "#input", pSettingsPage);
break;
}
@@ -34,12 +43,3 @@
/* Language page: */
case GlobalSettingsPageType_Language:
{
-@@ -248,8 +238,6 @@ void UISettingsDialogGlobal::retranslate
- m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
-
- #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-- /* Update page: */
-- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
- /* Language page: */
++++++ vbox-no-build-dates.diff ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.297827226 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.301827224 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+Index: VirtualBox-6.0.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
-+++ VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+--- VirtualBox-6.0.0.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
++++ VirtualBox-6.0.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@@ -11,10 +11,10 @@
for (;;)
{
-Index: VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp
+Index: VirtualBox-6.0.0/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Runtime/common/string/uniread.cpp
-+++ VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp
+--- VirtualBox-6.0.0.orig/src/VBox/Runtime/common/string/uniread.cpp
++++ VirtualBox-6.0.0/src/VBox/Runtime/common/string/uniread.cpp
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
@@ -24,10 +24,10 @@
" */\n"
"\n"
"/*\n"
-Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
---- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
-+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -50,10 +50,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
---- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
-+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@@ -73,10 +73,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
---- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
-+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -99,10 +99,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
---- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
-+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -125,11 +125,11 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index:
VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
+Index:
VirtualBox-6.0.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
===================================================================
----
VirtualBox-5.2.0.orig/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
-+++
VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
-@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
+---
VirtualBox-6.0.0.orig/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
++++
VirtualBox-6.0.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
+@@ -147,7 +147,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
VBOX_VERSION_STRING, RTBldCfgRevision(),
VBOX_BUILD_TARGET,
@@ -138,11 +138,11 @@
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c
+Index: VirtualBox-6.0.0/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Devices/PC/BIOS/bios.c
-+++ VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c
-@@ -159,7 +159,7 @@ void set_mode(uint8_t mode);
+--- VirtualBox-6.0.0.orig/src/VBox/Devices/PC/BIOS/bios.c
++++ VirtualBox-6.0.0/src/VBox/Devices/PC/BIOS/bios.c
+@@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
#define BX_APPNAME "VirtualBox"
@@ -151,10 +151,10 @@
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
-Index: VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+Index: VirtualBox-6.0.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
---- VirtualBox-5.2.0.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
-+++ VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+--- VirtualBox-6.0.0.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
++++ VirtualBox-6.0.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -242,7 +242,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release
log\n"
"Log opened %s\n",
@@ -164,3 +164,235 @@
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+Index: VirtualBox-6.0.0/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
+ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
+ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
+ # Tar it up.
+- tar -cvf - -C $(VBoxBusMouseIns_0_OUTDIR)/Stage/ . | gzip -9c > $@
++ tar -cvf - -C $(VBoxBusMouseIns_0_OUTDIR)/Stage/ . | gzip -9nc > $@
+ # Clean up
+ $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
+
+Index: VirtualBox-6.0.0/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
+ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
+ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
+ # Tar it up.
+- tar -cvf - -C $(VBoxSkeletonIns_0_OUTDIR)/Stage/ . | gzip -9c > $@
++ tar -cvf - -C $(VBoxSkeletonIns_0_OUTDIR)/Stage/ . | gzip -9nc > $@
+ # Clean up
+ $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
+
+Index: VirtualBox-6.0.0/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+@@ -342,7 +342,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
+ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
+ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
+ # Tar it up.
+- tar -cvf - -C $(VBoxDTraceIns_0_OUTDIR)/Stage/ . | gzip -9c > $@
++ tar -cvf - -C $(VBoxDTraceIns_0_OUTDIR)/Stage/ . | gzip -9nc > $@
+ # Clean up
+ $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
+
+Index: VirtualBox-6.0.0/src/VBox/ExtPacks/VNC/Makefile.kmk
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/ExtPacks/VNC/Makefile.kmk
+@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
+ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
+ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
+ # Tar it up.
+- tar -cvf - -C $(VBoxVNCIns_0_OUTDIR)/Stage/ . | gzip -9c > $@
++ tar -cvf - -C $(VBoxVNCIns_0_OUTDIR)/Stage/ . | gzip -9nc > $@
+ # Clean up
+ $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
+
+Index: VirtualBox-6.0.0/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
++++ VirtualBox-6.0.0/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+@@ -316,7 +316,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
+ }
+ VGDrvCommonInitLoggers();
+
+- LogFunc(("Driver built: %s %s\n", __DATE__, __TIME__));
++ LogFunc(("Driver built: %s %s\n", "no date", "no time"));
+
+ /*
+ * Check if the NT version is supported and initialize g_enmVGDrvNtVer.
+Index:
VirtualBox-6.0.0/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+===================================================================
+---
VirtualBox-6.0.0.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
++++ VirtualBox-6.0.0/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
+ "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release
log\n"
+ "Log opened %s\n",
+ RTBldCfgVersion(), RTBldCfgRevisionStr(), g_iVerbosity,
VBOX_BUILD_TARGET,
+- __DATE__, __TIME__, szTmp);
++ "no date", "no time", szTmp);
+
+ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
+ if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+Index: VirtualBox-6.0.0/src/VBox/Additions/solaris/Mouse/vboxms.c
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
++++ VirtualBox-6.0.0/src/VBox/Additions/solaris/Mouse/vboxms.c
+@@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt
+ int _init(void)
+ {
+ int rc;
+- LogRelFlow((DEVICE_NAME ": built on " __DATE__ " at " __TIME__ "\n"));
++ LogRelFlow((DEVICE_NAME ": built on " "no date" " at " "no time" "\n"));
+ mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
+ /*
+ * Prevent module autounloading.
+Index:
VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h
+===================================================================
+---
VirtualBox-6.0.0.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h
++++
VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h
+@@ -102,7 +102,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
+ //
+ #define UTILITY_MAJOR_VERSION 0
+ #define UTILITY_MINOR_VERSION 1
+-#define UTILITY_DATE __DATE__
++#define UTILITY_DATE "no date"
+
+ //
+ // The maximum number of arguments accepted from the command line.
+Index:
VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+===================================================================
+---
VirtualBox-6.0.0.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
++++
VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+@@ -170,7 +170,7 @@ Returns:
+ UTILITY_MAJOR_VERSION,
+ UTILITY_MINOR_VERSION,
+ __BUILD_VERSION,
+- __DATE__
++ "no date"
+ );
+
+ //
+Index: VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
++++ VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
+ static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
+ {
+ RT_NOREF1(pDriverObject);
+- LogRel(("VBoxUsb::DriverUnload. Built Date (%s) Time (%s)\n", __DATE__,
__TIME__));
++ LogRel(("VBoxUsb::DriverUnload. Built Date (%s) Time (%s)\n", "no date",
"no time"));
+ VBoxDrvToolStrFree(&g_VBoxUsbGlobals.RegPath);
+
+ vboxUsbRtGlobalsTerm();
+@@ -274,7 +274,7 @@ RT_C_DECLS_END
+
+ NTSTATUS DriverEntry(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING
pRegistryPath)
+ {
+- LogRel(("VBoxUsb::DriverEntry. Built Date (%s) Time (%s)\n", __DATE__,
__TIME__));
++ LogRel(("VBoxUsb::DriverEntry. Built Date (%s) Time (%s)\n", "no date",
"no time"));
+
+ NTSTATUS Status = vboxUsbRtGlobalsInit();
+ Assert(Status == STATUS_SUCCESS);
+Index: VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
++++ VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+@@ -1936,7 +1936,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
+ RTLogDestinations(0, "debugger");
+ #endif
+
+- LOGREL(("Built %s %s", __DATE__, __TIME__));
++ LOGREL(("Built %s %s", "no date", "no time"));
+
+ memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
+ #ifdef VBOX_USB3PORT
+Index: VirtualBox-6.0.0/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
++++ VirtualBox-6.0.0/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
+ #endif
+ "Log opened %s\n",
+ g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
+- RTBldCfgTargetDotArch(), __DATE__, __TIME__, szTmp);
++ RTBldCfgTargetDotArch(), "no date", "no time", szTmp);
+
+ pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
+ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+===================================================================
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+@@ -141,7 +141,7 @@ int main(int argc, char **argv)
+ {
+ PRIntn tab = 0;
+ const PRVersionInfo *info = DummyLibVersion();
+- const char *buildDate = __DATE__, *buildTime = __TIME__;
++ const char *buildDate = "no date", *buildTime = "no time";
+
+ printf("Depend.c build time is %s %s\n", buildDate, buildTime);
+
+Index:
VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+===================================================================
+---
VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
++++
VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+@@ -458,7 +458,7 @@ int
+ main()
+ {
+
+- cout << "String performance profiling. Compiled " __DATE__ " " __TIME__
<< endl;
++ cout << "String performance profiling. Compiled nodate no time" << endl;
+ #ifdef TEST_STD_STRING
+ cout << "Testing std::string." << endl;
+ #else
+Index:
VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+===================================================================
+---
VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
++++
VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+@@ -425,7 +425,7 @@ int
+ main()
+ {
+ int tests_failed = 0;
+- cout << "String unit tests. Compiled " __DATE__ " " __TIME__ << endl;
++ cout << "String unit tests. Compiled no date no time" << endl;
+
+ #if 0
+ {
+Index: VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
++++ VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+@@ -102,7 +102,7 @@ class test_message
+ public:
+ test_message()
+ {
+- printf("BEGIN unit tests for |nsCOMPtr|, compiled " __DATE__ "\n");
++ printf("BEGIN unit tests for |nsCOMPtr|, compiled no date\n");
+ }
+
+ ~test_message()
+Index:
VirtualBox-6.0.0/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+===================================================================
+---
VirtualBox-6.0.0.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
++++ VirtualBox-6.0.0/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+@@ -29,9 +29,8 @@
+
+ #include "build_id.h"
+
+-#ifndef NT_GNU_BUILD_ID
++#undef NT_GNU_BUILD_ID
+ #define NT_GNU_BUILD_ID 3
+-#endif
+
+ #ifndef ElfW
+ #define ElfW(type) Elf_##type
++++++ vbox-vboxadd-init-script.diff ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.321827217 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.321827217 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.22/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-6.0.0/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
---- VirtualBox-5.2.22.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-5.2.22/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-6.0.0.orig/src/VBox/Additions/linux/installer/vboxadd.sh
++++ VirtualBox-6.0.0/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -26,11 +26,14 @@
# Provides: vboxadd
# Required-Start:
@@ -18,7 +18,7 @@
### END INIT INFO
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
-@@ -139,18 +142,9 @@ module_build_log()
+@@ -141,18 +144,9 @@ module_build_log()
dev=/dev/vboxguest
userdev=/dev/vboxuser
@@ -37,7 +37,7 @@
running_vboxguest()
{
lsmod | grep -q "vboxguest[^_-]"
-@@ -193,12 +187,6 @@ do_vboxguest_non_udev()
+@@ -195,12 +189,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
@@ -50,7 +50,7 @@
if [ ! -c $userdev ]; then
maj=10
-@@ -209,12 +197,6 @@ do_vboxguest_non_udev()
+@@ -211,12 +199,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor
$min"
}
@@ -63,54 +63,29 @@
fi
fi
}
-@@ -224,9 +206,8 @@ start()
+@@ -224,10 +206,9 @@ do_vboxguest_non_udev()
+ start()
+ {
begin "Starting."
- # If we got this far assume that the slow set-up has been done.
- QUICKSETUP=start
- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
-- uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
+- setup --quick
++ setup --quick
+ test -d /sys &&
- ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
-+ uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
+ ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
no_udev=1
running_vboxguest || {
rm -f $dev || {
-@@ -239,7 +220,7 @@ start()
-
- $MODPROBE vboxguest >/dev/null 2>&1 || {
- setup
-- $MODPROBE vboxguest >/dev/null 2>&1 ||
-+ $MODPROBE vboxguest >/dev/null 2>&1 || {
- fail "modprobe vboxguest failed"
+@@ -236,7 +217,7 @@ start()
+ rm -f $userdev || {
+ fail "Cannot remove $userdev"
}
+- $MODPROBE vboxguest >/dev/null 2>&1 ||
++ $MODPROBE vboxguest >/dev/null 2>&1 || {
+ fail "modprobe vboxguest failed"
case "$no_udev" in 1)
-@@ -284,7 +265,8 @@ start()
- fi
- if test -n "${setup_gl}"; then
- mkdir -p /var/lib/VBoxGuestAdditions/lib
-- ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so"
/var/lib/VBoxGuestAdditions/lib/libGL.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.
-@@ -295,6 +277,15 @@ start()
- chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.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
-
-@@ -488,9 +479,9 @@ create_udev_rule()
+ sleep .5;;
+@@ -434,9 +415,9 @@ create_udev_rule()
echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\",
OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
fi
}
@@ -123,7 +98,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
-@@ -521,20 +512,13 @@ shared_folder_setup()
+@@ -467,20 +448,13 @@ shared_folder_setup()
## @todo It would be nicer if the kernel module just parsed parameters
# itself instead of needing a separate binary to do that.
ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
@@ -146,7 +121,7 @@
export BUILD_TYPE
export USERNAME
-@@ -551,16 +535,33 @@ setup()
+@@ -517,16 +491,33 @@ setup()
shared_folder_setup
if running_vboxguest || running_vboxadd; then
info "Running kernel modules will not be replaced until the system is
restarted"
@@ -185,7 +160,7 @@
depmod
# Remove old module sources
-@@ -570,13 +571,14 @@ cleanup()
+@@ -536,12 +527,13 @@ cleanup()
fi
# Clean-up X11-related bits
@@ -193,7 +168,6 @@
+ #/sbin/rcvboxadd-x11 cleanup
# Remove other files
- rm /sbin/mount.vboxsf 2>/dev/null
- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
- rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
- rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
@@ -202,12 +176,12 @@
+ rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+ rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
fi
+ rm /sbin/mount.vboxsf 2>/dev/null
rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
- }
-Index: VirtualBox-5.2.22/src/VBox/Additions/linux/installer/vboxadd-service.sh
+Index: VirtualBox-6.0.0/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
----
VirtualBox-5.2.22.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
-+++ VirtualBox-5.2.22/src/VBox/Additions/linux/installer/vboxadd-service.sh
+--- VirtualBox-6.0.0.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
++++ VirtualBox-6.0.0/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -26,7 +26,7 @@
# Provides: vboxadd-service
# Required-Start: vboxadd
@@ -217,10 +191,10 @@
# Default-Stop: 0 1 6
# X-Conflicts-With: systemd-timesyncd.service
# Description: VirtualBox Additions Service
-Index: VirtualBox-5.2.22/src/VBox/Installer/linux/vboxautostart-service.sh
+Index: VirtualBox-6.0.0/src/VBox/Installer/linux/vboxautostart-service.sh
===================================================================
---- VirtualBox-5.2.22.orig/src/VBox/Installer/linux/vboxautostart-service.sh
-+++ VirtualBox-5.2.22/src/VBox/Installer/linux/vboxautostart-service.sh
+--- VirtualBox-6.0.0.orig/src/VBox/Installer/linux/vboxautostart-service.sh
++++ VirtualBox-6.0.0/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -23,7 +23,7 @@
# Provides: vboxautostart-service
# Required-Start: vboxdrv
@@ -230,10 +204,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox autostart service
### END INIT INFO
-Index: VirtualBox-5.2.22/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+Index: VirtualBox-6.0.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh
===================================================================
---- VirtualBox-5.2.22.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
-+++ VirtualBox-5.2.22/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+--- VirtualBox-6.0.0.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
++++ VirtualBox-6.0.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -23,7 +23,7 @@
# Provides: vboxballoonctrl-service
# Required-Start: vboxdrv
@@ -243,10 +217,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox watchdog daemon
### END INIT INFO
-Index:
VirtualBox-5.2.22/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+Index:
VirtualBox-6.0.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
===================================================================
----
VirtualBox-5.2.22.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
-+++
VirtualBox-5.2.22/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+---
VirtualBox-6.0.0.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
++++
VirtualBox-6.0.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -31,7 +31,7 @@
# Provides: testboxscript-service
# Required-Start: $network
@@ -256,10 +230,10 @@
# Default-Stop: 0 1 6
# Description: TestBoxScript service
### END INIT INFO
-Index:
VirtualBox-5.2.22/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+Index:
VirtualBox-6.0.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
===================================================================
----
VirtualBox-5.2.22.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
-+++
VirtualBox-5.2.22/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+---
VirtualBox-6.0.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
++++
VirtualBox-6.0.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -31,7 +31,7 @@
# Provides: vboxtxs
# Required-Start: $network
@@ -269,10 +243,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox Test Execution Service
### END INIT INFO
-Index:
VirtualBox-5.2.22/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+Index:
VirtualBox-6.0.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
===================================================================
----
VirtualBox-5.2.22.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
-+++
VirtualBox-5.2.22/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+---
VirtualBox-6.0.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
++++ VirtualBox-6.0.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -31,7 +31,7 @@
# Provides: vboxtxs
# Required-Start: $network
++++++ vbox-vboxdrv-init-script.diff ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.333827212 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.333827212 +0100
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.2.14/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-6.0.0/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
---- VirtualBox-5.2.14.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-5.2.14/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-6.0.0.orig/src/VBox/Installer/linux/vboxdrv.sh
++++ VirtualBox-6.0.0/src/VBox/Installer/linux/vboxdrv.sh
@@ -19,11 +19,12 @@
#
### BEGIN INIT INFO
@@ -33,7 +33,7 @@
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out
why"
fi
-@@ -420,47 +414,8 @@ cleanup()
+@@ -421,48 +415,8 @@ cleanup()
# setup_script
setup()
{
@@ -77,6 +77,7 @@
- fi
- rm -f /etc/vbox/module_not_compiled
- depmod -a
+- sync
- succ_msg "VirtualBox kernel modules built"
+# Try to build the host kernel modules in case prepackaging has failed
+ /sbin/vboxconfig
++++++ vboxdrv.sh ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.377827195 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.377827195 +0100
@@ -450,3 +450,4 @@
esac
exit 0
+
++++++ vboxweb-service.service ++++++
[Unit]
SourcePath=/usr/lib/virtualbox/vboxweb-service.sh
Description=
Before=runlevel2.target runlevel3.target runlevel4.target runlevel5.target
shutdown.target
After=vboxdrv.service
Conflicts=shutdown.target
[Service]
Type=forking
Restart=no
TimeoutSec=5min
IgnoreSIGPIPE=no
KillMode=process
GuessMainPID=no
RemainAfterExit=yes
ExecStart=/usr/lib/virtualbox/vboxweb-service.sh start
ExecStop=/usr/lib/virtualbox/vboxweb-service.sh stop
[Install]
WantedBy=multi-user.target
++++++ vboxweb-service.sh ++++++
#!/bin/sh
# $Id: vboxweb-service.sh 127855 2019-01-01 01:45:53Z bird $
## @file
# VirtualBox web service API daemon init script.
#
#
# Copyright (C) 2006-2019 Oracle Corporation
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
# General Public License (GPL) as published by the Free Software
# Foundation, in version 2 as it comes in the "COPYING" file of the
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
#
# chkconfig: 345 35 65
# description: VirtualBox web service API
#
### BEGIN INIT INFO
# Provides: vboxweb-service
# Required-Start: vboxdrv
# Required-Stop: vboxdrv
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Description: VirtualBox web service API
### END INIT INFO
PATH=$PATH:/bin:/sbin:/usr/sbin
SCRIPTNAME=vboxweb-service.sh
[ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
if [ -n "$INSTALL_DIR" ]; then
binary="$INSTALL_DIR/vboxwebsrv"
vboxmanage="$INSTALL_DIR/VBoxManage"
else
binary="/usr/lib/virtualbox/vboxwebsrv"
vboxmanage="/usr/lib/virtualbox/VBoxManage"
fi
# silently exit if the package was uninstalled but not purged,
# applies to Debian packages only (but shouldn't hurt elsewhere)
[ ! -f /etc/debian_release -o -x $binary ] || exit 0
[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
PIDFILE="/var/run/${SCRIPTNAME}"
# Preamble for Gentoo
if [ "`which $0`" = "/sbin/rc" ]; then
shift
fi
begin_msg()
{
test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
logger -t "${SCRIPTNAME}" "${1}."
}
succ_msg()
{
logger -t "${SCRIPTNAME}" "${1}."
}
fail_msg()
{
echo "${SCRIPTNAME}: failed: ${1}." >&2
logger -t "${SCRIPTNAME}" "failed: ${1}."
}
start_daemon() {
usr="$1"
shift
su - $usr -c "$*"
}
killproc() {
killall $1
rm -f $PIDFILE
}
if which start-stop-daemon >/dev/null 2>&1; then
start_daemon() {
usr="$1"
shift
bin="$1"
shift
start-stop-daemon --background --chuid $usr --start --exec $bin -- $@
}
killproc() {
start-stop-daemon --stop --exec $@
}
fi
vboxdrvrunning() {
lsmod | grep vboxdrv
}
check_single_user() {
if [ -n "$2" ]; then
fail_msg "VBOXWEB_USER must not contain multiple users!"
exit 1
fi
}
start() {
if ! test -f $PIDFILE; then
[ -z "$VBOXWEB_USER" ] && exit 0
begin_msg "Starting VirtualBox web service" console;
check_single_user $VBOXWEB_USER
temp=$(lsmod | grep vboxdrv)
echo $temp
if [ -z "$temp" ]; then
fail_msg "VirtualBox kernel module not loaded!"
exit 1
fi
PARAMS="--background"
[ -n "$VBOXWEB_HOST" ] && PARAMS="$PARAMS -H $VBOXWEB_HOST"
[ -n "$VBOXWEB_PORT" ] && PARAMS="$PARAMS -p $VBOXWEB_PORT"
[ -n "$VBOXWEB_SSL_KEYFILE" ] && PARAMS="$PARAMS -s -K
$VBOXWEB_SSL_KEYFILE"
[ -n "$VBOXWEB_SSL_PASSWORDFILE" ] && PARAMS="$PARAMS -a
$VBOXWEB_SSL_PASSWORDFILE"
[ -n "$VBOXWEB_SSL_CACERT" ] && PARAMS="$PARAMS -c
$VBOXWEB_SSL_CACERT"
[ -n "$VBOXWEB_SSL_CAPATH" ] && PARAMS="$PARAMS -C
$VBOXWEB_SSL_CAPATH"
[ -n "$VBOXWEB_SSL_DHFILE" ] && PARAMS="$PARAMS -D
$VBOXWEB_SSL_DHFILE"
[ -n "$VBOXWEB_SSL_RANDFILE" ] && PARAMS="$PARAMS -r
$VBOXWEB_SSL_RANDFILE"
[ -n "$VBOXWEB_TIMEOUT" ] && PARAMS="$PARAMS -t $VBOXWEB_TIMEOUT"
[ -n "$VBOXWEB_CHECK_INTERVAL" ] && PARAMS="$PARAMS -i
$VBOXWEB_CHECK_INTERVAL"
[ -n "$VBOXWEB_THREADS" ] && PARAMS="$PARAMS -T $VBOXWEB_THREADS"
[ -n "$VBOXWEB_KEEPALIVE" ] && PARAMS="$PARAMS -k
$VBOXWEB_KEEPALIVE"
[ -n "$VBOXWEB_AUTHENTICATION" ] && PARAMS="$PARAMS -A
$VBOXWEB_AUTHENTICATION"
[ -n "$VBOXWEB_LOGFILE" ] && PARAMS="$PARAMS -F $VBOXWEB_LOGFILE"
[ -n "$VBOXWEB_ROTATE" ] && PARAMS="$PARAMS -R $VBOXWEB_ROTATE"
[ -n "$VBOXWEB_LOGSIZE" ] && PARAMS="$PARAMS -S $VBOXWEB_LOGSIZE"
[ -n "$VBOXWEB_LOGINTERVAL" ] && PARAMS="$PARAMS -I
$VBOXWEB_LOGINTERVAL"
# set authentication method + password hash
if [ -n "$VBOXWEB_AUTH_LIBRARY" ]; then
su - "$VBOXWEB_USER" -c "$vboxmanage setproperty websrvauthlibrary
\"$VBOXWEB_AUTH_LIBRARY\""
if [ $? -ne 0 ]; then
fail_msg "Error $? setting webservice authentication library to
$VBOXWEB_AUTH_LIBRARY"
fi
fi
if [ -n "$VBOXWEB_AUTH_PWHASH" ]; then
su - "$VBOXWEB_USER" -c "$vboxmanage setextradata global
\"VBoxAuthSimple/users/$VBOXWEB_USER\" \"$VBOXWEB_AUTH_PWHASH\""
if [ $? -ne 0 ]; then
fail_msg "Error $? setting webservice password hash"
fi
fi
# prevent inheriting this setting to VBoxSVC
unset VBOX_RELEASE_LOG_DEST
start_daemon $VBOXWEB_USER $binary $PARAMS > /dev/null 2>&1
# ugly: wait until the final process has forked
sleep .1
PID=`pidof $binary 2>/dev/null`
if [ -n "$PID" ]; then
echo "$PID" > $PIDFILE
RETVAL=0
succ_msg "VirtualBox web service started"
else
RETVAL=1
fail_msg "VirtualBox web service failed to start"
fi
fi
return $RETVAL
}
stop() {
if test -f $PIDFILE; then
begin_msg "Stopping VirtualBox web service" console;
killproc $binary
RETVAL=$?
# Be careful: wait 1 second, making sure that everything is cleaned up.
sleep 1
if ! pidof $binary > /dev/null 2>&1; then
rm -f $PIDFILE
succ_msg "VirtualBox web service stopped"
else
fail_msg "VirtualBox web service failed to stop"
fi
fi
return $RETVAL
}
restart() {
stop && start
}
status() {
echo -n "Checking for VBox Web Service"
if [ -f $PIDFILE ]; then
echo " ...running"
else
echo " ...not running"
fi
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
force-reload)
restart
;;
status)
status
;;
setup)
;;
cleanup)
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
esac
exit $RETVAL
++++++ virtualbox-guest-kmp-files ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.453827167 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.453827167 +0100
@@ -1,6 +1,5 @@
%defattr (-,root,root)
%dir /lib/modules/%2-%1/
%dir /lib/modules/%2-%1/extra
-/lib/modules/%2-%1/extra/vboxvideo.ko
/lib/modules/%2-%1/extra/vboxsf.ko
/lib/modules/%2-%1/extra/vboxguest.ko
++++++ virtualbox-sed-params.patch ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.509827146 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.509827146 +0100
@@ -1,21 +1,21 @@
-Index: VirtualBox-5.2.14/src/VBox/Main/Makefile.kmk
+Index: VirtualBox-6.0.0/src/VBox/Main/Makefile.kmk
===================================================================
---- VirtualBox-5.2.14.orig/src/VBox/Main/Makefile.kmk
-+++ VirtualBox-5.2.14/src/VBox/Main/Makefile.kmk
-@@ -1523,7 +1523,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
+--- VirtualBox-6.0.0.orig/src/VBox/Main/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/Main/Makefile.kmk
+@@ -1521,7 +1521,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
--stringparam generating "dtrace-probes" \
-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE)
- $(QUIET)$(SED) -e '' -o "$@.tmp" \
+ $(QUIET)$(SED) -e '' --output "$@.tmp" \
- "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \
+ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr
"$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \
"$@" \
- "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d"
-Index: VirtualBox-5.2.14/src/VBox/Devices/Makefile.kmk
+ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr
"$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d"
+Index: VirtualBox-6.0.0/src/VBox/Devices/Makefile.kmk
===================================================================
---- VirtualBox-5.2.14.orig/src/VBox/Devices/Makefile.kmk
-+++ VirtualBox-5.2.14/src/VBox/Devices/Makefile.kmk
-@@ -854,8 +854,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
+--- VirtualBox-6.0.0.orig/src/VBox/Devices/Makefile.kmk
++++ VirtualBox-6.0.0/src/VBox/Devices/Makefile.kmk
+@@ -859,8 +859,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
$(QUIET)$(RM) -f $@ $@.tmp $@.pre
$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<
++++++ virtualbox-wrapper.sh ++++++
--- /var/tmp/diff_new_pack.h9UYcT/_old 2019-03-01 16:46:11.525827139 +0100
+++ /var/tmp/diff_new_pack.h9UYcT/_new 2019-03-01 16:46:11.525827139 +0100
@@ -55,4 +55,4 @@
fi
fi
# Now run the VB GUI
-LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
/usr/lib/virtualbox/VirtualBox $@
+LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
/usr/lib/virtualbox/VirtualBox6 $@
