dgarcia/virtualbox
SHA256
1
0
Fork 0
forked from jengelh/virtualbox
Code Pull Requests Activity

Accepting request 696073 from home:lwfinger:branches:openSUSE:Factory

Browse Source 
- Updated file "Fixes_for_Leap15.1.patch" to handle one addition problem due to backporting of kernel APIa.
  Remove "BuildRequires: quilt" - that package is not needed.
  VirtualBox 6.0.6 fixes the following: CVE-2019-2656, CVE-2019-2680, CVE-2019-2696, CVE-2019-2703, CVE-2019-2721,
                                        CVE-2019-2722, CVE-2019-2723, CVE-2019-2657, CVE-2019-2690, CVE-2019-2679,
                                        CVE-2019-2678, and CVE-2019-2574 boo#1132827.

- Version bump to 6.0.6 (released April 17 2019 by Oracle)
The following files in the openSUSE implemetation are removed: "fix_32_bit_builds.patch", "fixes_for_5.0.patch", and
"fixes_for_5.1.patch". These issues are fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/696073
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=486
This commit is contained in:
Larry Finger
2019-04-30 00:56:27 +00:00
committed by Git OBS Bridge
parent b394ad8f9f
commit 2296780557
14 changed files with 432 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
virtualbox.spec
View File

@@ -42,7 +42,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
%define _udevrulesdir /usr/lib/udev/rules.d
Name: virtualbox
# ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!!
Version: 6.0.4
Version: 6.0.6
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0-or-later
@@ -110,6 +110,8 @@ Patch107: virtualbox-sed-params.patch
Patch108: virtualbox-snpritnf-buffer-overflow.patch
# Patch to add code to explain USB Passthru
Patch109: vbox-usb-warning.diff
# Patch to ensure that VirtualBoxVM is SUID
Patch110: vbox-suid-warning.diff
# Fix change in kernel API for ttm_bo_move_memcpy()
Patch112: modify_for_4_8_bo_move.patch
# Remove all mention of _smp_mflags
@@ -126,17 +128,12 @@ Patch120: fixes_for_python.patch
Patch122: fixes_for_Qt5.11.patch
# Switch to Python 3.4+
Patch123: switch_to_python3.4+.patch
Patch124: fix_32_bit_builds.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
# Fixes for kernel 5.1
Patch130: fixes_for_5.1.patch
# Fixes for Qt5.13
Patch131: fixes_for_qt5.13.patch
#endif
@@ -183,7 +180,6 @@ BuildRequires: module-init-tools
BuildRequires: pam-devel
BuildRequires: pulseaudio-devel
BuildRequires: python3-devel
BuildRequires: quilt
BuildRequires: sed
BuildRequires: update-desktop-files
BuildRequires: which
@@ -429,6 +425,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch107 -p1
%patch108 -p1
%patch109 -p1
%patch110 -p1
%patch112 -p1
%patch113 -p1
%patch115 -p1
@@ -437,12 +434,9 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch120 -p1
%patch122 -p1
%patch123 -p1
%patch124 -p1
%patch125 -p1
%patch126 -p1
%patch128 -p1
%patch129 -p1
%patch130 -p1
%if %{qt5ver} >= 51300
%patch131 -p1
@@ -524,10 +518,15 @@ install -D -m 644 "COPYING" "%{buildroot}%{_datadir}/licenses/LICENSE.vnc"
#
# build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci
# guest modules : vboxguest,vboxsf
# guest modules : vboxguest,vboxsf vboxvideo (for Leap 15.1)
echo "build kernel modules"
%if 0%{?suse_version} == 1500
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
%else
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
out/linux.*/release/bin/additions/src/vbox{guest,sf}; do
%endif
#get the module name from path
module_name=$(basename "$vbox_module")
@@ -593,7 +592,11 @@ export INSTALL_MOD_DIR=extra
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 :
%if 0%{?suse_version} == 1500
for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video}
%else
for module_name in vbox{drv,netflt,pci,netadp,guest,sf}
%endif
do
#and through the all flavors
for flavor in %{flavors_to_build}; do
@@ -659,6 +662,7 @@ install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
install -m 755 VBoxPermissionMessage %{buildroot}%{_vbox_instdir}
install -m 755 VBoxSUIDMessage %{buildroot}%{_vbox_instdir}
install -m 755 VBoxUSB_DevRules %{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
@@ -787,6 +791,9 @@ getent group vboxusers >/dev/null || groupadd -r vboxusers
# Add groups for seamless mode and shared folders:
getent group vboxguest >/dev/null || groupadd -r vboxguest
getent group vboxsf >/dev/null || groupadd -r vboxsf
%if 0%{?suse_version} == 1500
getent group vboxvideo >/dev/null || groupadd -r vboxvideo
%endif
%service_add_pre vboxadd-service.service
%pre websrv
@@ -957,6 +964,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%files qt
%defattr(-, root, root)
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSUIDMessage
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules
%attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6
%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM