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

Accepting request 116114 from Virtualization

Browse Source 
update to 4.1.14 + use workaround to fix kmk_sed issue which breaks build

OBS-URL: https://build.opensuse.org/request/show/116114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2012-05-07 20:53:23 +00:00 committed by Git OBS Bridge
commit 1ab52890ee
10 changed files with 100 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VirtualBox-4.1.12-UserManual.pdf
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0912c9dc43c06afd4c95e5ff45d53dba13ec579848fb8da3c61e80de4bba16c6
size 5063631

3
VirtualBox-4.1.12-patched.tar.bz2
View File

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

3
VirtualBox-4.1.14-patched.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13790fa065bd90a533a5090a0d2aa13914e6a6d81290d7e16626800c78a11ca6
size 46317829

29
vbox-config.diff
View File

@ -1,29 +0,0 @@
--- VirtualBox-4.0.2_OSE.orig/Config.kmk 2011-01-18 16:33:45.000000000 +0000
+++ VirtualBox-4.0.2_OSE/Config.kmk 2011-01-31 01:27:30.788003407 +0000
@@ -503,7 +503,7 @@
VBOX_WITH_CROGL = 1
endif
# Enable the VNC server in VBoxHeadless (GPL only).
-#VBOX_WITH_VNC = 1
+VBOX_WITH_VNC = 1
# Enable S3 support (requires libcurl)
VBOX_WITH_S3 = 1
## @}
@@ -581,7 +581,7 @@
#VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox
ifdef VBOX_WITH_HARDENING
if1of ($(KBUILD_TARGET), linux solaris)
- VBOX_PATH_APP_PRIVATE = /opt/VirtualBox
+ VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox
else ifeq ($(KBUILD_TARGET),darwin)
VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS
else ifeq ($(KBUILD_TARGET),freebsd)
@@ -608,7 +608,7 @@
endif
endif
# Where the documentation is (going to be) installed.
-#VBOX_PATH_APP_DOCS = /usr/share/doc/virtualbox
+VBOX_PATH_APP_DOCS = /usr/share/doc/packages/virtualbox
ifdef VBOX_WITH_HARDENING
if1of ($(KBUILD_TARGET), darwin solaris)
VBOX_PATH_APP_DOCS = $(VBOX_PATH_APP_PRIVATE)

54
vbox-no-build-dates.diff
View File

@ -28,7 +28,7 @@ Index: src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- src/VBox/Main/src-client/ConsoleImpl.cpp.orig
+++ src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -6040,13 +6040,13 @@ HRESULT Console::consoleInitReleaseLog(c
@@ -6146,13 +6146,13 @@ HRESULT Console::consoleInitReleaseLog(c
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
RTLogRelLogger(pReleaseLogger, 0, ~0U,
@ -42,26 +42,6 @@ Index: src/VBox/Main/src-client/ConsoleImpl.cpp
- __DATE__, __TIME__, szTmp);
+ szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/Main/src-server/generic/OpenGLTestApp.cpp
===================================================================
--- src/VBox/Main/src-server/generic/OpenGLTestApp.cpp.orig
+++ src/VBox/Main/src-server/generic/OpenGLTestApp.cpp
@@ -142,13 +142,12 @@ static int vboxInitLogging(const char *p
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
RTLogRelLogger(loggerRelease, 0, ~0U,
- "VBoxTestGL %s r%u %s (%s %s) release log\n"
+ "VBoxTestGL %s r%u %s release log\n"
#ifdef VBOX_BLEEDING_EDGE
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
#endif
"Log opened %s\n",
- VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@ -221,7 +201,7 @@ Index: src/VBox/Main/webservice/vboxweb.cpp
===================================================================
--- src/VBox/Main/webservice/vboxweb.cpp.orig
+++ src/VBox/Main/webservice/vboxweb.cpp
@@ -666,7 +666,7 @@ static void WebLogHeaderFooter(PRTLOGGER
@@ -739,7 +739,7 @@ static void WebLogHeaderFooter(PRTLOGGER
#endif
"Log opened %s\n",
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
@ -230,3 +210,33 @@ Index: src/VBox/Main/webservice/vboxweb.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -157,10 +157,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
===================================================================
--- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig
+++ src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ "openSUSE", "Buildservice", szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)

3
virtualbox-4.1.14-UserManual.pdf Normal file
View File

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

0
virtualbox-4.1.12-rpmlintrc → virtualbox-4.1.14-rpmlintrc
View File

11
virtualbox-LocalConfig.kmk Normal file
View File

@ -0,0 +1,11 @@
VBOX_WITH_TESTCASES =
VBOX_WITH_TESTSUITE =
VBOX_WITH_ORIGIN :=
VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_PATH_APP_PRIVATE = /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/doc/packages/virtualbox
VBOX_WITH_REGISTRATION_REQUEST =

21
virtualbox.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sun Apr 29 16:02:54 UTC 2012 - mseben@gmail.com
- use workaround for issue with kmk_sed and gcc4.7 http://svn.netlabs.org/kbuild/ticket/112,
which breaks build, instead of kmk_sed use /usr/bin/sed
-------------------------------------------------------------------
Sat Apr 28 19:38:57 UTC 2012 - mseben@gmail.com
- update to virtualbox 4.1.14 (This is a maintenance release):
* Network: fixed the problem with packets larger than MTU-4 when PCnet or PRO/1000 was bridged to certain types of adapters on OS X hosts (bug #3783)
* NAT: fixed a segfault under rare circumstances
* 3D Support: fixed Windows WDDM video driver crash for SMP guests (bugs #10200, #10331)
* Windows Guest Additions, VRDP: fixed occasional text corruption (bug #3001)
-------------------------------------------------------------------
Sat Apr 21 10:25:41 UTC 2012 - mseben@gmail.com
- drop vbox-config.diff and use LocalConfig.kmk to properly define
lib,app and doc paths (bnc#737525)
-------------------------------------------------------------------
Wed Apr 4 09:21:39 UTC 2012 - mseben@gmail.com

39
virtualbox.spec
View File

@ -26,6 +26,9 @@ BuildRequires: fdupes
%if %suse_version < 1210
BuildRequires: hal-devel
%endif
%if %suse_version > 1210
BuildRequires: sed
%endif
%if %suse_version >= 1210
BuildRequires: glibc-devel-static
%endif
@ -77,7 +80,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.1.12
Version: 4.1.14
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -89,7 +92,7 @@ Url: http://www.virtualbox.org/
# WARNING: This is not a comment, but the real command to repack souce
#%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2)
Source0: VirtualBox-%{version}-patched.tar.bz2
Source1: VirtualBox-%{version}-UserManual.pdf
Source1: %{name}-%{version}-UserManual.pdf
Source2: %{name}-60-vboxdrv.rules
Source3: %{name}-60-vboxguest.rules
Source4: %{name}-default.virtualbox
@ -98,8 +101,7 @@ Source6: %{name}-guest-kmp-files
Source7: %{name}-host-preamble
Source8: %{name}-guest-preamble
Source9: %{name}-wrapper.sh
# since 11.3 we need this conf instead of HAL's fdi to define vbox mouse
#Source10: %{name}-60-vboxmouse.conf
Source10: %{name}-LocalConfig.kmk
# init script to start virtual boxes during boot, to be configured via /etc/sysconfig/vbox bnc#582398
Source12: %{name}-vboxes
Source13: %{name}-sysconfig.vbox
@ -111,8 +113,6 @@ Patch2: vbox-vboxadd-init-script.diff
Patch3: vbox-vboxweb-init-script.diff
#fix return values which trigger post build checks and coused build error - should goes to upstream
Patch4: vbox-ret-in-nonvoid-fnc.diff
#fix/enable config (rpath, docs, VNC)
Patch5: vbox-config.diff
#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
@ -245,7 +245,6 @@ Development file for %{name}
%patch2
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch99 -p1
@ -254,8 +253,28 @@ Development file for %{name}
%patch103
%patch104 -p1
#copy user manual
%__cp %{S:1} ./UserManual.pdf
%__cp %{S:1} UserManual.pdf
#copy kbuild config
%__cp %{S:10} LocalConfig.kmk
#
##########################
####workaround kmk_sed --v
#instead of kmk_sed use /usr/bin/sed because of bug http://svn.netlabs.org/kbuild/ticket/112,
#but we have to create wrapper which will handle --append and --outpout options which are not provided by /usr/bin/sed
cat >> kmk_sed <<EOF
#!/bin/bash
while [ "\$#" != "0" ]; do
pass=\${pass}" \$1"
[ "\$1" == "-e" ] && shift && pass=\${pass}" '\$1'"
shift
done
eval "sed \$(echo "\$pass" | sed -e "s/--output=/>/g;s/--append=/>/g;s/--output/>/g;s/--append/>>/g");"
EOF
chmod +x ./kmk_sed
echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk
####workaround kmk_sed --^
##########################
#
%build
#ensure we dont ever use them
rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
@ -263,6 +282,8 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
# --disable-kmods don't build Linux kernel modules - but use SUSE specific way see few lines under
# --nofatal try to avoid build fail caused by missing makeself package
./configure \
--enable-vnc \
--enable-vde \
--disable-kmods \
--disable-java \
--disable-docs \