From 77d132861642f7e7f57b02ebf4eba78daee584a5bce1dc9e3a69243b47d32360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Jul 2015 11:43:54 +0000 Subject: [PATCH 01/11] - Version bump to 5.0.0: * Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206 --- UserManual.pdf | 4 +-- VirtualBox-4.3.28-patched.tar.bz2 | 3 --- VirtualBox-5.0.0-patched.tar.bz2 | 3 +++ gcc5-real-support.patch | 21 +++++++--------- gcc5-support.patch | 16 ------------ gcc51-support.patch | 16 ------------ vbox-disable-updates.diff | 29 +++++++++++----------- virtualbox-system-x.patch | 41 ++++++++++++++----------------- virtualbox.changes | 14 +++++++++++ virtualbox.spec | 15 +++++------ 10 files changed, 66 insertions(+), 96 deletions(-) delete mode 100644 VirtualBox-4.3.28-patched.tar.bz2 create mode 100644 VirtualBox-5.0.0-patched.tar.bz2 delete mode 100644 gcc5-support.patch delete mode 100644 gcc51-support.patch diff --git a/UserManual.pdf b/UserManual.pdf index 7efd6ce..5962ffa 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8756f3cfdc4b3e0d5eb10c13271d62e0489a5fc3beecbf31084b73ad66c6a2cc -size 6314596 +oid sha256:26951845eebbee76a4a62b28687e74ad318ba1e790d1d8486cb8b37cf04d3cd0 +size 3446131 diff --git a/VirtualBox-4.3.28-patched.tar.bz2 b/VirtualBox-4.3.28-patched.tar.bz2 deleted file mode 100644 index f296461..0000000 --- a/VirtualBox-4.3.28-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:460211302e71885b376338b2cffb61f5fc274b681424b9a7427eaa6836d7d9a9 -size 74638986 diff --git a/VirtualBox-5.0.0-patched.tar.bz2 b/VirtualBox-5.0.0-patched.tar.bz2 new file mode 100644 index 0000000..abe6612 --- /dev/null +++ b/VirtualBox-5.0.0-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9de1c7b7a4a0dc28aa61960e3f15c3f094d9a0e7c86c7fb5c0bb3baf81cf9fa +size 75420734 diff --git a/gcc5-real-support.patch b/gcc5-real-support.patch index f4dbb73..abea36b 100644 --- a/gcc5-real-support.patch +++ b/gcc5-real-support.patch @@ -1,22 +1,19 @@ ---- - Config.kmk | 2 +- - configure | 9 +++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/Config.kmk -+++ b/Config.kmk -@@ -2292,7 +2292,7 @@ else +diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk +--- VirtualBox-5.0.0.old/Config.kmk 2015-07-11 13:17:27.273698360 +0200 ++++ VirtualBox-5.0.0/Config.kmk 2015-07-11 13:36:31.958812088 +0200 +@@ -2344,7 +2344,7 @@ # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. VBOX_GCC_VERSION = $(shell \ - $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), $$(firstword \3 0))|' ) -+ $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) ++ $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) endif # Find MinGW cross compilers for EFI on non-windows systems. We need to probe ---- a/configure -+++ b/configure -@@ -409,8 +409,13 @@ check_gcc() +diff -urN VirtualBox-5.0.0.old/configure VirtualBox-5.0.0/configure +--- VirtualBox-5.0.0.old/configure 2015-07-11 13:17:27.273698360 +0200 ++++ VirtualBox-5.0.0/configure 2015-07-11 13:37:30.457915488 +0200 +@@ -410,8 +410,13 @@ log_failure "cannot execute '$CXX -dumpversion'" fail really fi diff --git a/gcc5-support.patch b/gcc5-support.patch deleted file mode 100644 index 282c2df..0000000 --- a/gcc5-support.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 55371) -+++ configure (revision 55372) -@@ -422,8 +422,9 @@ - -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ - -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ - -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \ -- -o $cc_maj -gt 4 ]; then -- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 0isChecked()) { m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex); -Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -=================================================================== ---- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig -+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -359,15 +359,6 @@ UISettingsDialogGlobal::UISettingsDialog +diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:17:27.885699492 +0200 ++++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:23:13.230338850 +0200 +@@ -106,16 +106,6 @@ + iPageIndex, "#input", pSettingsPage); break; } - #ifdef VBOX_GUI_WITH_NETWORK_MANAGER +-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - /* Update page: */ - case GlobalSettingsPageType_Update: - { - pSettingsPage = new UIGlobalSettingsUpdate; -- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png", -- ":/refresh_16px.png", ":/refresh_disabled_16px.png", +- addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", - iPageIndex, "#update", pSettingsPage); - break; - } - #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ /* Language page: */ case GlobalSettingsPageType_Language: -@@ -498,8 +489,6 @@ void UISettingsDialogGlobal::retranslate + { +@@ -254,8 +244,6 @@ m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); #ifdef VBOX_GUI_WITH_NETWORK_MANAGER diff --git a/virtualbox-system-x.patch b/virtualbox-system-x.patch index c93b529..7c4cf93 100644 --- a/virtualbox-system-x.patch +++ b/virtualbox-system-x.patch @@ -1,24 +1,7 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes , Felix Geyer - -Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -=================================================================== ---- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -+++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:36:33.913630598 -0500 -@@ -40,8 +40,6 @@ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 - endif - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - LIBRARIES += \ -Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk -=================================================================== ---- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -@@ -74,18 +74,12 @@ +diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:17:27.581698930 +0200 ++++ VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 +@@ -67,18 +67,12 @@ VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -42,8 +25,8 @@ Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -@@ -215,10 +209,10 @@ - $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) +@@ -213,10 +207,10 @@ + if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ @@ -57,3 +40,15 @@ Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ +diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:17:27.580698928 +0200 ++++ VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 +@@ -40,8 +40,6 @@ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_VALIDATIONKIT + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 + endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + LIBRARIES += \ diff --git a/virtualbox.changes b/virtualbox.changes index c0afd2f..fe6edbf 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 11 11:41:26 UTC 2015 - tchvatal@suse.com + +- Version bump to 5.0.0: + * Major bump from 4 series with tons of changes. + * Read upstream changelog for in-depth informations +- Obsoleted patches: + * gcc5-support.patch + * gcc51-support.patch +- Refreshed patches: + * gcc5-real-support.patch + * vbox-disable-updates.diff + * virtualbox-system-x.patch + ------------------------------------------------------------------- Mon Jul 6 09:19:54 UTC 2015 - alarrosa@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index d433285..bdb6b78 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # # spec file for package virtualbox # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_libexecdir}/udev/rules.d Name: virtualbox -Version: 4.3.28 +Version: 5.0.0 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -75,9 +75,8 @@ Patch103: vbox-disable-updates.diff Patch104: vbox-fpie.diff #smap issues on Haswell or Broadwell (boo#931461) Patch105: smap.diff -Patch106: gcc5-support.patch -Patch107: gcc51-support.patch -Patch108: gcc5-real-support.patch +# Patch to build with Factory gcc5 +Patch106: gcc5-real-support.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -298,12 +297,10 @@ This package contains icons for guest desktop files that were created on the des %patch99 -p1 %patch100 %patch101 -p1 -%patch103 +%patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -%patch107 -%patch108 -p1 +%patch106 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config From d5b08441369e1ea67683f816c8a880166420de45369130321b249d0e47f2c570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Jul 2015 12:47:21 +0000 Subject: [PATCH 02/11] - Fix vbox build by replacing non-existent sed parameter: * virtualbox-sed-params.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=207 --- virtualbox-sed-params.patch | 12 ++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 virtualbox-sed-params.patch diff --git a/virtualbox-sed-params.patch b/virtualbox-sed-params.patch new file mode 100644 index 0000000..18615f6 --- /dev/null +++ b/virtualbox-sed-params.patch @@ -0,0 +1,12 @@ +diff -urN VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk 2015-07-11 13:17:27.573698915 +0200 ++++ VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk 2015-07-11 14:34:21.357349819 +0200 +@@ -1199,7 +1199,7 @@ + $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ + --stringparam generating "dtrace-probes" \ + -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $< +- $(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-end.d" diff --git a/virtualbox.changes b/virtualbox.changes index fe6edbf..53da611 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 11 12:46:51 UTC 2015 - tchvatal@suse.com + +- Fix vbox build by replacing non-existent sed parameter: + * virtualbox-sed-params.patch + ------------------------------------------------------------------- Sat Jul 11 11:41:26 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index bdb6b78..7ff33cd 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -77,6 +77,8 @@ Patch104: vbox-fpie.diff Patch105: smap.diff # Patch to build with Factory gcc5 Patch106: gcc5-real-support.patch +# Patch to build with gnu sed correctly +Patch107: virtualbox-sed-params.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -301,6 +303,7 @@ This package contains icons for guest desktop files that were created on the des %patch104 -p1 %patch105 -p1 %patch106 -p1 +%patch107 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config From 2021ffd044e3869056b2044c274d06aca4abaacf38ee88ae2601ffac82bf32ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Jul 2015 12:48:17 +0000 Subject: [PATCH 03/11] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=208 --- virtualbox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virtualbox.spec b/virtualbox.spec index 7ff33cd..e76da57 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -491,7 +491,6 @@ install -m 755 VirtualBox %{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} -install -m 644 V*.gc %{buildroot}%{_vbox_instdir} install -m 644 *.r0 %{buildroot}%{_vbox_instdir} install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/ # install languages From 9070b8f21835c341282835040addcfc2d7a315341d730e3b466be496b8e164bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jul 2015 12:42:49 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=209 --- virtualbox.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/virtualbox.spec b/virtualbox.spec index e76da57..e18caf9 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -549,7 +549,6 @@ cp -r out/linux.*/release/bin/sdk/bindings/auth %{buildroot}%{_vbox_instdir}/sdk pushd out/linux.*/release/bin/sdk/bindings/xpcom cp -r include %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom cp -r idl %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom -cp -r cbinding %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom cp -r samples %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom popd @@ -699,9 +698,7 @@ exit 0 %{_vbox_instdir}/VBoxVMM.so %{_vbox_instdir}/VBoxXPCOMC.so %{_vbox_instdir}/VBoxXPCOM.so -%{_vbox_instdir}/VBox*.gc %{_vbox_instdir}/VBox*.r0 -%{_vbox_instdir}/VMMGC.gc %{_vbox_instdir}/VMMR0.r0 %{_vbox_instdir}/VBoxEFI*.fd %{_vbox_instdir}/VBoxManage @@ -709,7 +706,7 @@ exit 0 %{_vbox_instdir}/VBoxTunctl %{_vbox_instdir}/VBoxXPCOMIPCD %{_vbox_instdir}/VBoxExtPackHelperApp -%{_vbox_instdir}/DBGCPlugInDiggers.so +%{_vbox_instdir}/DbgPlugInDiggers.so %{_vbox_instdir}/VBoxAuth.so %{_vbox_instdir}/VBoxAuthSimple.so %{_vbox_instdir}/VBoxDbg.so @@ -784,7 +781,6 @@ exit 0 %dir %{_vbox_instdir}/sdk/bindings %dir %{_vbox_instdir}/sdk/bindings/xpcom %{_vbox_instdir}/sdk/bindings/VirtualBox.xidl -%{_vbox_instdir}/sdk/bindings/xpcom/cbinding %{_vbox_instdir}/sdk/bindings/xpcom/idl %{_vbox_instdir}/sdk/bindings/xpcom/include %{_vbox_instdir}/sdk/bindings/xpcom/samples From 97e95f5819469471bd0d599b49cf318245452bda6e88c04e2f49170be5f6fe75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jul 2015 13:30:39 +0000 Subject: [PATCH 05/11] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=210 --- virtualbox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virtualbox.spec b/virtualbox.spec index e18caf9..288da33 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -360,7 +360,6 @@ echo "build basic parts" VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ TOOL_YASM_AS=yasm \ VBOX_BUILD_PUBLISHER=_SUSE \ - TOOL_GCC3_CFLAGS="%{optflags}" TOOL_GCC3_CXXFLAGS="%{optflags}" \ VBOX_GCC_OPT="%{optflags}" # From 5b84ab1c4e766dd4843cd4ec4b7ff1c5656062d3f98cebecae0d4bab17230ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Jul 2015 18:52:12 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=211 --- virtualbox.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/virtualbox.spec b/virtualbox.spec index 288da33..bf1c4e9 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -360,6 +360,7 @@ echo "build basic parts" VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ TOOL_YASM_AS=yasm \ VBOX_BUILD_PUBLISHER=_SUSE \ + TOOL_GCC3_CFLAGS="%{optflags}" TOOL_GCC3_CXXFLAGS="%{optflags}" \ VBOX_GCC_OPT="%{optflags}" # @@ -490,6 +491,7 @@ install -m 755 VirtualBox %{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} +install -m 644 *.rc %{buildroot}%{_vbox_instdir} install -m 644 *.r0 %{buildroot}%{_vbox_instdir} install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/ # install languages @@ -697,6 +699,9 @@ exit 0 %{_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 %{_vbox_instdir}/VMMR0.r0 %{_vbox_instdir}/VBoxEFI*.fd From 756ec3ce8215dd9f20efb91b02a2ec12c7360401a0bbb2dc6a97557e7cc47088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Jul 2015 19:14:21 +0000 Subject: [PATCH 07/11] - Fix buffer overflow on dtrace lib: * virtualbox-snpritnf-buffer-overflow.patch - Note: still does not respect cxxflags OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=212 --- virtualbox-snpritnf-buffer-overflow.patch | 16 ++++++++++++++++ virtualbox.changes | 7 +++++++ virtualbox.spec | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 virtualbox-snpritnf-buffer-overflow.patch diff --git a/virtualbox-snpritnf-buffer-overflow.patch b/virtualbox-snpritnf-buffer-overflow.patch new file mode 100644 index 0000000..6975769 --- /dev/null +++ b/virtualbox-snpritnf-buffer-overflow.patch @@ -0,0 +1,16 @@ +diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c +--- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 20:53:12.121479325 +0200 ++++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 21:04:02.001865414 +0200 +@@ -1568,10 +1568,10 @@ + width = 0; + + if (width != 0) +- f += snprintf(f, sizeof (format), "%d", ABS(width)); ++ f += snprintf(f, sizeof (f), "%d", ABS(width)); + + if (prec > 0) +- f += snprintf(f, sizeof (format), ".%d", prec); ++ f += snprintf(f, sizeof (f), ".%d", prec); + + (void) strcpy(f, pfd->pfd_fmt); + pfd->pfd_rec = rec; diff --git a/virtualbox.changes b/virtualbox.changes index 53da611..e31ffca 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 14 19:13:46 UTC 2015 - tchvatal@suse.com + +- Fix buffer overflow on dtrace lib: + * virtualbox-snpritnf-buffer-overflow.patch +- Note: still does not respect cxxflags + ------------------------------------------------------------------- Sat Jul 11 12:46:51 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index bf1c4e9..3a97192 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -79,6 +79,8 @@ Patch105: smap.diff Patch106: gcc5-real-support.patch # Patch to build with gnu sed correctly Patch107: virtualbox-sed-params.patch +# Patch to use snprintf correcty and not overflow dst buffer +Patch108: virtualbox-snpritnf-buffer-overflow.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -304,6 +306,7 @@ This package contains icons for guest desktop files that were created on the des %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch108 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config From 508cb0954f8ecd5970943c8e6d8ca054b4260ac3958d27ee38b585f7d27aaba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Jul 2015 18:42:07 +0000 Subject: [PATCH 08/11] - Install more binaries that were in bin generated folder OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=213 --- virtualbox.changes | 5 +++++ virtualbox.spec | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/virtualbox.changes b/virtualbox.changes index e31ffca..b74a15c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 15 18:41:47 UTC 2015 - tchvatal@suse.com + +- Install more binaries that were in bin generated folder + ------------------------------------------------------------------- Tue Jul 14 19:13:46 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index 3a97192..292ce17 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -478,6 +478,13 @@ install -m 755 VBoxManage %{buildroot}%{_vbox_instdir} install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir} install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir} install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir} +install -m 755 VBoxNetNAT %{buildroot}%{_vbox_instdir} +install -m 755 VBoxAutostart %{buildroot}%{_vbox_instdir} +install -m 755 VBoxVolInfo %{buildroot}%{_vbox_instdir} +install -m 755 vboxshell.py %{buildroot}%{_vbox_instdir} +install -m 755 VBoxBalloonCtrl %{buildroot}%{_vbox_instdir} +install -m 755 webtest %{buildroot}%{_vbox_instdir} +install -m 755 VBoxDTrace %{buildroot}%{_vbox_instdir} # create links to vbox tools in PATH - they could be usefull for controlling vbox from command line ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage ln -s %{_vbox_instdir}/VBoxHeadless %{buildroot}%{_bindir}/VBoxHeadless @@ -680,6 +687,12 @@ exit 0 %{_bindir}/VBoxSDL %{_bindir}/VBoxTunctl %dir %{_vbox_instdir} +%{_vbox_instdir}/VBoxAutostart +%{_vbox_instdir}/VBoxBalloonCtrl +%{_vbox_instdir}/VBoxDTrace +%{_vbox_instdir}/VBoxNetNAT +%{_vbox_instdir}/VBoxVolInfo +%{_vbox_instdir}/vboxshell.py %{_vbox_instdir}/VBoxSysInfo.sh %{_vbox_instdir}/VBoxDD2.so %{_vbox_instdir}/VBoxDD.so From 569930e6c7272aef318c7d6c3589c3bd2208a0f68400821a6baeb53e4b1c253a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 16 Jul 2015 15:13:43 +0000 Subject: [PATCH 09/11] Updating link to change in openSUSE:Factory/virtualbox revision 102.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=df08239ed01f0f433fe95075a612f84f --- virtualbox.changes | 5 ----- virtualbox.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index b74a15c..87d4597 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -3019,11 +3019,6 @@ Wed Feb 25 13:48:04 CET 2009 - suse-tux@gmx.de - removed the networking part from the README.SUSE file. There's no need to create a bridge anymore. -------------------------------------------------------------------- -Tue Feb 24 16:46:46 CET 2009 - dmueller@suse.de - -- merge with factory - ------------------------------------------------------------------- Tue Feb 24 16:46:46 CET 2009 - suse-tux@gmx.de diff --git a/virtualbox.spec b/virtualbox.spec index 292ce17..a8b0f9a 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # # spec file for package virtualbox # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 87efa3c962352b5943cdbc11ca65c984f6dca1d1e6f15c6831902c2ca759a89b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 16 Jul 2015 15:13:44 +0000 Subject: [PATCH 10/11] Accepting request 315190 from Virtualization baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/315190 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=214 --- virtualbox.changes | 5 +++++ virtualbox.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/virtualbox.changes b/virtualbox.changes index 87d4597..b74a15c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -3019,6 +3019,11 @@ Wed Feb 25 13:48:04 CET 2009 - suse-tux@gmx.de - removed the networking part from the README.SUSE file. There's no need to create a bridge anymore. +------------------------------------------------------------------- +Tue Feb 24 16:46:46 CET 2009 - dmueller@suse.de + +- merge with factory + ------------------------------------------------------------------- Tue Feb 24 16:46:46 CET 2009 - suse-tux@gmx.de diff --git a/virtualbox.spec b/virtualbox.spec index a8b0f9a..292ce17 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # # spec file for package virtualbox # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From d7854b504dd79ac4157da98e67f76cf1c120567eab012753d57d9f61c0ed0338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 19 Jul 2015 15:13:04 +0000 Subject: [PATCH 11/11] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=215 --- virtualbox-snpritnf-buffer-overflow.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/virtualbox-snpritnf-buffer-overflow.patch b/virtualbox-snpritnf-buffer-overflow.patch index 6975769..06fe546 100644 --- a/virtualbox-snpritnf-buffer-overflow.patch +++ b/virtualbox-snpritnf-buffer-overflow.patch @@ -1,6 +1,6 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c --- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 20:53:12.121479325 +0200 -+++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 21:04:02.001865414 +0200 ++++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-19 17:11:11.677617929 +0200 @@ -1568,10 +1568,10 @@ width = 0; @@ -14,3 +14,14 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/c (void) strcpy(f, pfd->pfd_fmt); pfd->pfd_rec = rec; +diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +--- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-14 20:53:12.120479323 +0200 ++++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-19 17:12:35.554945664 +0200 +@@ -866,6 +866,7 @@ + x = x + (x >> 32); + return (x & 0x7F); + #endif ++ return 0; + } + + /*