1
0
forked from pool/virtualbox

Accepting request 345609 from Virtualization

1

OBS-URL: https://build.opensuse.org/request/show/345609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger 2015-12-01 09:01:57 +00:00 committed by Git OBS Bridge
commit 7b5387a315
8 changed files with 164 additions and 30 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7f643f1414ddc14d01d220d7c9ca1b1de528576251ffd91a96e71f4047d3c65c oid sha256:f8200e7b948f0fd0cc18a603a249c37ec69c5fe115e73d0204f7a3316443746e
size 3468626 size 3475107

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25482165a12011d15ffaa2f60eebd11643c8468f5262301f33d5d7e643e53046
size 76515670

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19454a177845bea15142586b3ae2b823cd7457605eb8c38ce2720c3567a6a151
size 76123020

View File

@ -2,7 +2,7 @@
<constraints> <constraints>
<hardware> <hardware>
<memory> <memory>
<size unit="M">5000</size> <size unit="M">8000</size>
</memory> </memory>
</hardware> </hardware>
</constraints> </constraints>

View File

@ -15,7 +15,7 @@ Index: src/VBox/Runtime/common/string/uniread.cpp
=================================================================== ===================================================================
--- src/VBox/Runtime/common/string/uniread.cpp.orig --- src/VBox/Runtime/common/string/uniread.cpp.orig
+++ src/VBox/Runtime/common/string/uniread.cpp +++ src/VBox/Runtime/common/string/uniread.cpp
@@ -1033,7 +1033,7 @@ int PrintHeader(const char *argv0, const @@ -1035,7 +1035,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n" " * IPRT - Unicode Tables.\n"
" *\n" " *\n"
" * Automatically Generated from %s\n" " * Automatically Generated from %s\n"
@ -125,23 +125,6 @@ Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -161,10 +161,10 @@ static void VBoxServiceLogHeaderFooter(P
case RTLOGPHASE_BEGIN:
{
pfnLog(pLoggerRelease,
- "VBoxService %s r%s (verbosity: %d) %s (%s %s) release log\n"
+ "VBoxService %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n",
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ "openSUSE","Buildservice",szTmp);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
=================================================================== ===================================================================
--- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig --- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig
@ -172,7 +155,7 @@ Index: src/VBox/Main/glue/com.cpp
=================================================================== ===================================================================
--- src/VBox/Main/glue/com.cpp.orig --- src/VBox/Main/glue/com.cpp.orig
+++ src/VBox/Main/glue/com.cpp +++ src/VBox/Main/glue/com.cpp
@@ -294,7 +294,7 @@ static void vboxHeaderFooter(PRTLOGGER p @@ -292,7 +292,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif #endif
"Log opened %s\n", "Log opened %s\n",
g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(), g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
@ -181,3 +164,16 @@ Index: src/VBox/Main/glue/com.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -238,7 +238,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n",
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ "openSUSE", "Build Service", szTmp);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)

66
vbox-usb-warning.diff Normal file
View File

@ -0,0 +1,66 @@
Index: a/src/apps/Makefile.kmk
===================================================================
--- a/src/apps/Makefile.kmk (revision 58576)
+++ b/src/apps/Makefile.kmk (working copy)
@@ -34,7 +34,9 @@
endif
endif
include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
+include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: a/src/apps/VBoxUSB_DevRules/Makefile.kmk
===================================================================
--- a/src/apps/VBoxUSB_DevRules/Makefile.kmk (revision 0)
+++ b/src/apps/VBoxUSB_DevRules/Makefile.kmk (working copy)
@@ -0,0 +1,29 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
+#
+# VBoxUSB_DevRules is wrapper for suse users
+#
+# 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.
+#
+
+
+SUB_DEPTH = ../../..
+include $(KBUILD_PATH)/subheader.kmk
+
+PROGRAMS += VBoxUSB_DevRules
+
+VBoxUSB_DevRules_TEMPLATE = VBOXQT4GUIEXE
+VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp
+VBoxUSB_DevRules_QT_MODULES = Core Gui
+
+#INSTALLS += VBoxUSB_DevRules
+
+include $(KBUILD_PATH)/subfooter.kmk
+
+
Index: a/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
===================================================================
--- a/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp (revision 0)
+++ b/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp (working copy)
@@ -0,0 +1,13 @@
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ QMessageBox msgBox;
+ msgBox.setWindowTitle(QObject::tr("USB Rules and Permissions !"));
+ msgBox.setText(QObject::tr("USB passthru opens a security hole. Please read \n\nhttps://bugzilla.novell.com/show_bug.cgi?id=664520\n\nto understand the problem. If you really want/need to use USB passthru, then copy /usr/lib/udev/rules.d/60-vboxdrv.rules to /etc/udev/rules.d/, and modify that file as outlined in the comments.\n\nTo avoid seeing this message every time VirtualBox is started, a dummy file is being created."));
+ int ret = msgBox.exec();
+ app.quit();
+ return 0;
+}
+

View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Sat Nov 21 17:54:57 UTC 2015 - Larry.Finger@lwfinger.net
- Remove file vbox_build_kms_modules.diff.
-------------------------------------------------------------------
Fri Nov 20 19:05:51 UTC 2015 - Larry.Finger@lwfinger.net
- Temporarily disable i586 builds.
-------------------------------------------------------------------
Fri Nov 20 15:44:20 UTC 2015 - Larry.Finger@lwfinger.net
- Increase memory to 8000 MB to try to fix out-of-memory error when building i586 version.
-------------------------------------------------------------------
Mon Nov 16 19:40:37 UTC 2015 - Larry.Finger@lwfinger.net
- Increase memory to 7000 MB in _constraint to see if that fixes link problem on i586.
-------------------------------------------------------------------
Thu Nov 12 12:55:16 UTC 2015 - idonmez@suse.com
- Version bump to 5.0.10 (released 2015-11-10 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
VMM: improved support for certain Intel Atom CPUs (bug #14773)
VMM: system register emulation fix (5.0 regression; bug #14515)
GUI: fixed immediate screenshot issue (bug #14108)
GUI: fixed another 3D overlay window reparenting issue when the VM is switched to fullscreen mode on X11 hosts
GUI: fixed help index (bug #14722)
GUI: fixed state synchronization issue in the VM manager window when VM was paused from its runtime window
Audio: fixed suspending/resuming audio streams on VM pause/unpause (bug #14784)
Audio: properly reset AC97 audio streams, otherwise there is silence until a non-48 kHz stream is played
Audio: fixed a small emulation quirk of the AD1980 codec of the HDA device to make recent linux guests work (bug #14653)
USB: serveral fixes for the xHCI controller
USB: fixed a crash under certain conditions on hosts with Linux kernels older than version 3.3
USB: better identification of certain USB devices
NAT: support TCP in DNS proxy (bug #14736)
NAT Network: fixed sporadic crashes on Windows hosts (bug #13899)
API: when creating differencing images (e.g. as part of a snapshot or cloning a VM) use the same disk image variant as the parent image if possible, which means that e.g. a diff image for a VMDK image split into 2 GB files will also be split (bug #14764)
API: event queue handling fixes preventing loss of certain events at runtime (e.g. new webcam attached), particularly important on Mac OS X hosts
Webcam: passthrough fix for certain devices (Windows hosts only)
VBoxManage: don't crash on snapshot restorecurrent / edit if the VM has no snapshots
VBoxManage: don't crash on controlvm addencpassword (bug #14729)
Mac OS X hosts: use the correct kernel on certain hosts
Windows hosts: fixed VRDP external authentication
Windows hosts: allow to use a shared folder path with extended-length path prefix (5.0 regression; bug #14651)
Windows hosts: fix a crash in the netfilter host driver under certain conditions (bug #14799)
Windows host installer: documented and fixed public properties which can be used to control the installation to some extent
Windows host installer: fixed not starting the actual installation when showing the version information or help dialogs
X11 Additions: added basic support for X.Org Server 1.18 (3D requires additional fixes)
- Refresh vbox-no-build-dates.diff
-------------------------------------------------------------------
Sun Nov 8 05:10:36 UTC 2015 - Larry.Finger@lwfinger.net
- Add a popup window to the VB startup wrapper to make clear why USB passthru is not automatically
enabled, and explain what steps the user should take if this feature is wanted despite the security
hole.
Patch file vbox-usb-warning.diff fixes the problem shown in boo#953018.
-------------------------------------------------------------------
Tue Oct 20 19:01:09 UTC 2015 - Larry.Finger@lwfinger.net Tue Oct 20 19:01:09 UTC 2015 - Larry.Finger@lwfinger.net
- Version bump to 5.0.8 (released 2015-10-20 by Oracle) - Version bump to 5.0.8 (released 2015-10-20 by Oracle)

View File

@ -19,7 +19,7 @@
%define _vbox_instdir %{_libexecdir}/virtualbox %define _vbox_instdir %{_libexecdir}/virtualbox
%define _udevrulesdir %{_libexecdir}/udev/rules.d %define _udevrulesdir %{_libexecdir}/udev/rules.d
Name: virtualbox Name: virtualbox
Version: 5.0.8 Version: 5.0.10
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPL-2.0+ License: GPL-2.0+
@ -81,6 +81,9 @@ Patch106: gcc5-real-support.patch
Patch107: virtualbox-sed-params.patch Patch107: virtualbox-sed-params.patch
# Patch to use snprintf correcty and not overflow dst buffer # Patch to use snprintf correcty and not overflow dst buffer
Patch108: virtualbox-snpritnf-buffer-overflow.patch Patch108: virtualbox-snpritnf-buffer-overflow.patch
# Patch to add code to explain USB Passthru
Patch109: vbox-usb-warning.diff
#
BuildRequires: LibVNCServer-devel BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: acpica BuildRequires: acpica
@ -146,10 +149,12 @@ Provides: %{name}-ose = %{version}
Obsoletes: %{name}-ose < %{version} Obsoletes: %{name}-ose < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template)
ExclusiveArch: %ix86 x86_64 # Temporarily disable i586 until build problem is solved
%if 0%{?suse_version} == 1315 #ExclusiveArch: %ix86 x86_64
ExcludeArch: %ix86 #%if 0%{?suse_version} == 1315
%endif #ExcludeArch: %ix86
#%endif
ExclusiveArch: x86_64
%ifarch amd64 x86_64 ia32e em64t %ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit BuildRequires: gcc-32bit
BuildRequires: gcc-c++-32bit BuildRequires: gcc-c++-32bit
@ -307,6 +312,7 @@ This package contains icons for guest desktop files that were created on the des
%patch106 -p1 %patch106 -p1
%patch107 -p1 %patch107 -p1
%patch108 -p1 %patch108 -p1
%patch109 -p1
#copy user manual #copy user manual
cp %{SOURCE1} UserManual.pdf cp %{SOURCE1} UserManual.pdf
#copy kbuild config #copy kbuild config