Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2012-05-07 22:53:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2012-04-17 07:50:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2012-05-07 22:53:26.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Apr 29 16:02:54 UTC 2012 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- drop vbox-config.diff and use LocalConfig.kmk to properly define + lib,app and doc paths (bnc#737525) + +------------------------------------------------------------------- Old: ---- VirtualBox-4.1.12-UserManual.pdf VirtualBox-4.1.12-patched.tar.bz2 vbox-config.diff virtualbox-4.1.12-rpmlintrc New: ---- VirtualBox-4.1.14-patched.tar.bz2 virtualbox-4.1.14-UserManual.pdf virtualbox-4.1.14-rpmlintrc virtualbox-LocalConfig.kmk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.tAOrHz/_old 2012-05-07 22:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.tAOrHz/_new 2012-05-07 22:53:32.000000000 +0200 @@ -26,6 +26,9 @@ %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 @@ %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 @@ # 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 @@ 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 @@ 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 @@ %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch8 -p1 %patch99 -p1 @@ -254,8 +253,28 @@ %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 @@ # --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 \ ++++++ VirtualBox-4.1.12-patched.tar.bz2 -> VirtualBox-4.1.14-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-4.1.12-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new/VirtualBox-4.1.14-patched.tar.bz2 differ: char 11, line 1 ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.tAOrHz/_old 2012-05-07 22:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.tAOrHz/_new 2012-05-07 22:53:32.000000000 +0200 @@ -28,7 +28,7 @@ =================================================================== --- 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, @@ -44,26 +44,6 @@ 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 =================================================================== --- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig @@ -221,7 +201,7 @@ =================================================================== --- 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 @@ 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) ++++++ virtualbox-4.1.12-rpmlintrc -> virtualbox-4.1.14-rpmlintrc ++++++ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
