Hello community, here is the log from the commit of package virtualbox checked in at Fri Nov 30 14:02:40 CET 2007. -------- --- virtualbox/virtualbox.changes 2007-11-21 03:21:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox/virtualbox.changes 2007-11-29 16:56:59.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 29 15:21:26 CET 2007 - anschneider@suse.de + +- Fixes that virtualbox compiles with gcc 4.3 + * virtualbox-gcc43-fixes.diff + * virtualbox-validate-op-gcc43.diff + +------------------------------------------------------------------- +Wed Nov 28 13:38:12 CET 2007 - anschneider@suse.de + +- Require the same version for the kmp module as the package self. +- Fix conflicts with Kernel 2.6.24 + * virtualbox-kernel-2.6.24.diff + +------------------------------------------------------------------- @@ -4 +18,7 @@ -- buildreq: gcc-42 -> gcc-43 +- buildreq: gcc-42 -> gcc-43 + +------------------------------------------------------------------- +Fri Nov 2 13:00:33 CET 2007 - suse-tux@gmx.de + +- Added own Makefiles for the kernel modules (vboxvfs seems + to be broken though) New: ---- Makefile-vboxadd Makefile-vboxvfs virtualbox-gcc43-fixes.diff virtualbox-kernel-2.6.24.diff virtualbox-validate-op-gcc43.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.u19285/_old 2007-11-30 14:02:07.000000000 +0100 +++ /var/tmp/diff_new_pack.u19285/_new 2007-11-30 14:02:07.000000000 +0100 @@ -39,12 +39,14 @@ %endif %endif %endif +# Version: 1.5.2 -Release: 5 +Release: 6 Summary: VirtualBox OSE is an Emulator License: GPL v2 or later Group: System/Emulators/PC Url: http://www.virtualbox.org/ +# # WARNING: This is not a comment, but the real command to repack souce: #%(sh %{_sourcedir}/%{name}-patch-source VirtualBox-%{version}_OSE.tar.bz2) Source0: VirtualBox-%{version}_OSE.tar.bz2 @@ -52,14 +54,21 @@ Source2: 60-vboxdrv.rules Source3: README.SUSE Source4: virtualbox.desktop +Source5: Makefile-vboxadd +Source6: Makefile-vboxvfs +# Patch0: vbox-futex.diff Patch1: %{name}-64issue.diff Patch2: vbox-kmp-vboxadd.diff Patch3: vbox-kmp-vboxvfs.diff Patch4: %{name}-init-script.diff +Patch5: virtualbox-kernel-2.6.24.diff +Patch6: virtualbox-gcc43-fixes.diff +Patch7: virtualbox-validate-op-gcc43.diff +# BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils -Requires: virtualbox-kmp +Requires: virtualbox-kmp = %{version} %description VirtualBox OSE is an extremely feature rich, high performance product @@ -75,13 +84,13 @@ %suse_kernel_module_package kdump um xen xenpae %package KMP -Summary: kernel module for virtualbox +Summary: Kernel Module for VirtualBox Group: System/Emulators/PC Obsoletes: virtualbox-kmp Provides: virtualbox-kmp %description KMP -This package contains the kernel-module for Virtualbox OSE +This package contains the kernel-module for VirtualBox OSE. @@ -128,6 +137,9 @@ %patch2 %patch3 %patch4 +%patch5 +%patch6 +%patch7 %build # this fixes a XEN-issue on %%suse_version >= 1020 (some headers won't @@ -151,12 +163,18 @@ VBOX_LINUX_SRC=/usr/src/linux-%{kernel_version}-obj/%{_target_cpu}/default \ %endif all -pushd out/linux.*/release/bin/src -# we are using our own Makefile for the kernel module -#%__cp %{SOURCE1} . -%__mkdir obj -echo "flavors_to_build: %{flavors_to_build}" -for flavor in %flavors_to_build; do +# install custom Makefiles +%__cp %{SOURCE1} out/linux.*/release/bin/src +%__cp %{SOURCE5} out/linux.*/release/bin/additions/src/vboxadd/Makefile +%__cp %{SOURCE6} out/linux.*/release/bin/additions/src/vboxvfs/Makefile +for mod in out/linux.*/release/bin/src \ + out/linux.*/release/bin/additions/src/vboxadd \ + out/linux.*/release/bin/additions/src/vboxvfs +do + pushd $mod + %__mkdir obj + echo "flavors_to_build: %{flavors_to_build}" + for flavor in %flavors_to_build; do %__rm -rf obj/$flavor %__mkdir obj/$flavor for i in * ; do @@ -165,69 +183,27 @@ done %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ M=$PWD/obj/$flavor -done -popd -# virtualbox guest kernel modules -pushd out/linux.*/release/bin/additions/src/vboxadd -%__mkdir obj -echo "flavors_to_build: %{flavors_to_build}" -for flavor in %flavors_to_build; do - %__rm -rf obj/$flavor - %__mkdir obj/$flavor - for i in * ; do - test $i = obj && continue - %__cp -r $i obj/$flavor/ - done - %__make KERN_DIR=/usr/src/linux-obj/%_target_cpu/$flavor \ - MODULE_DIR=$PWD/obj/$flavor -done -popd -pushd out/linux.*/release/bin/additions/src/vboxvfs -%__mkdir obj -echo "flavors_to_build: %{flavors_to_build}" -for flavor in %flavors_to_build; do - %__rm -rf obj/$flavor - %__mkdir obj/$flavor - for i in * ; do - test $i = obj && continue - %__cp -r $i obj/$flavor/ done - %__make KERN_DIR=/usr/src/linux-obj/%_target_cpu/$flavor \ - MODULE_DIR=$PWD/obj/$flavor + popd done -popd %install -pushd out/linux.*/release/bin/src -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=updates -k=%kernel_version -kernel_version_=${k%%-*} -for flavor in %flavors_to_build; do - %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/obj/$flavor - %__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates -done -popd -pushd out/linux.*/release/bin/additions/src/vboxadd -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=updates -k=%kernel_version -kernel_version_=${k%%-*} -for flavor in %flavors_to_build; do - %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/obj/$flavor - %__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates -done -popd -pushd out/linux.*/release/bin/additions/src/vboxvfs +# virtualbox kernel modules export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=updates k=%kernel_version kernel_version_=${k%%-*} -for flavor in %flavors_to_build; do +for mod in out/linux.*/release/bin/src \ + out/linux.*/release/bin/additions/src/vboxadd \ + out/linux.*/release/bin/additions/src/vboxvfs +do + pushd $mod + for flavor in %flavors_to_build; do %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/obj/$flavor %__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates + done + popd done -popd # virtualbox xorg-x11 guest additions pushd out/linux.*/release/bin/additions/ %__install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers @@ -323,9 +299,21 @@ %{_bindir}/vboxadd-timesync %{_bindir}/vboxadd-xclient %{_sbindir}/mountvboxsf + %changelog +* Thu Nov 29 2007 - anschneider@suse.de +- Fixes that virtualbox compiles with gcc 4.3 + * virtualbox-gcc43-fixes.diff + * virtualbox-validate-op-gcc43.diff +* Wed Nov 28 2007 - anschneider@suse.de +- Require the same version for the kmp module as the package self. +- Fix conflicts with Kernel 2.6.24 + * virtualbox-kernel-2.6.24.diff * Wed Nov 21 2007 - ro@suse.de - buildreq: gcc-42 -> gcc-43 +* Fri Nov 02 2007 - suse-tux@gmx.de +- Added own Makefiles for the kernel modules (vboxvfs seems + to be broken though) * Thu Nov 01 2007 - mkudlvasr@suse.cz - added init scripts for starting kernel module. fixes [bug 328887] - disabled stripping of VBoxREM2.rel . fixes [bug 307722] ++++++ Makefile ++++++ --- virtualbox/Makefile 2007-10-31 00:19:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox/Makefile 2007-11-28 18:18:13.000000000 +0100 @@ -1,16 +1,28 @@ KERNEL_SOURCE ?= /lib/modules/$(shell uname -r)/build # this is taken from the original Makefile -KFLAGS := -D__KERNEL__ -DMODULE -D__LINUX__ -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 +KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 ifndef CONFIG_VBOXDRV_FIXEDMAJOR KFLAGS += -DCONFIG_VBOXDRV_AS_MISC endif ifeq ($(BUILD_TARGET_ARCH),amd64) - KFLAGS += -D__AMD64__ + KFLAGS += -DRT_ARCH_AMD64 else - KFLAGS += -D__X86__ + KFLAGS += -DRT_ARCH_X86 endif +# +# Without IDT patching. See defetct #2160. +# +KFLAGS += -DVBOX_WITHOUT_IDT_PATCHING + +# +# Use the RTR0MemObj API - testing. +# If this makes testboxes crash/burn/leak disable it and add a comment to defect #2116. +# +KFLAGS += -DUSE_NEW_OS_INTERFACE_FOR_MM + + EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include) $(KFLAGS) vboxdrv-obj-y = \ @@ -24,7 +36,9 @@ r0drv/linux/process-r0drv-linux.o \ r0drv/linux/semaphore-r0drv-linux.o \ r0drv/linux/spinlock-r0drv-linux.o \ - r0drv/linux/thread-r0drv-linux.o + r0drv/linux/thread-r0drv-linux.o \ + r0drv/memobj-r0drv.o \ + r0drv/linux/memobj-r0drv-linux.o vboxdrv-objs := $(vboxdrv-obj-y) obj-m += vboxdrv.o ++++++ README.SUSE ++++++ --- virtualbox/README.SUSE 2007-10-31 00:19:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox/README.SUSE 2007-11-05 14:57:14.000000000 +0100 @@ -26,3 +26,12 @@ open "/etc/sysconfig/kernel" with your preferred $EDITOR or YaST and add "vboxdrv" to the MODULES_LOADED_ON_BOOT="" variable. +GUEST ADDITIONS + + Are packaged, for the virtualbox-guest-tools you need the kernel modules + and you have to load vboxadd and vboxvfs. + If you install the xorg modules you can configure the video card running: + sax2 -m 0=vboxvideo + + The guest additions for Windows are available at: + http://code.google.com/p/virtual-box-windows-guest-additions-installer/ ++++++ virtualbox-gcc43-fixes.diff ++++++ Index: src/VBox/Main/VMMDevInterface.cpp =================================================================== --- src/VBox/Main/VMMDevInterface.cpp.orig +++ src/VBox/Main/VMMDevInterface.cpp @@ -27,6 +27,7 @@ #include <VBox/VBoxGuest.h> #include <VBox/shflsvc.h> #include <iprt/asm.h> +#include <stdio.h> #ifdef VBOX_HGCM #include "hgcm/HGCM.h" Index: src/VBox/Additions/linux/xclient/main.cpp =================================================================== --- src/VBox/Additions/linux/xclient/main.cpp.orig +++ src/VBox/Additions/linux/xclient/main.cpp @@ -30,6 +30,7 @@ using std::endl; #include <sys/types.h> #include <unistd.h> #include <getopt.h> +#include <stdlib.h> #include <X11/Xlib.h> #include <X11/Intrinsic.h> Index: src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.orig +++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp @@ -28,6 +28,8 @@ #include "VBoxRegistrationDlg.h" #endif +#include <stdlib.h> + #include <qapplication.h> #include <qmessagebox.h> #include <qpixmap.h> Index: src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp.orig +++ src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp @@ -68,6 +68,7 @@ #include <cstdarg> #include <assert.h> +#include <locale> #include <string> #include <vector> #include <string> @@ -86,6 +87,23 @@ namespace happyhttp const char* GetWinsockErrorString( int err ); #endif +/* + * structs needed for std::transform() + * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 + */ +struct ToUpper { + ToUpper(std::locale const& l) : loc(l) {;} + char operator() (char c) const { return std::toupper(c,loc); } +private: + std::locale const& loc; +}; + +struct ToLower { + ToLower(std::locale const& l) : loc(l) {;} + char operator() (char c) const { return std::tolower(c,loc); } +private: + std::locale const& loc; +}; //--------------------------------------------------------------------- // Helper functions @@ -537,8 +555,10 @@ Response::Response( const char* method, const char* Response::getheader( const char* name ) const { + ToLower __tolower(std::locale::classic()); + std::string lname( name ); - std::transform( lname.begin(), lname.end(), lname.begin(), tolower ); + std::transform( lname.begin(), lname.end(), lname.begin(), __tolower ); std::map< std::string, std::string >::const_iterator it = m_Headers.find( lname ); if( it == m_Headers.end() ) ++++++ virtualbox-kernel-2.6.24.diff ++++++ Index: include/iprt/types.h =================================================================== --- include/iprt/types.h.orig +++ include/iprt/types.h @@ -58,8 +58,9 @@ /* * Kludge for the linux kernel: * 1. sys/types.h doesn't mix with the kernel. - * 2. Starting with 2.6.19 linux/types.h typedefs bool and linux/stddef.h + * 2. Starting with 2.6.19, linux/types.h typedefs bool and linux/stddef.h * declares false and true as enum values. + * 3. Starting with 2.6.24, linux/types.h typedefs uintptr_t. * We work around these issues here and nowhere else. */ # include <stddef.h> @@ -69,8 +70,11 @@ # define bool linux_bool # define true linux_true # define false linux_false +# define uintptr_t linux_uintptr_t +# include <linux/autoconf.h> # include <linux/types.h> # include <linux/stddef.h> +# undef uintptr_t # undef false # undef true # undef bool Index: Config.kmk =================================================================== --- Config.kmk.orig +++ Config.kmk @@ -1204,7 +1204,8 @@ ifneq ($(filter linux,$(BUILD_TARGET)),) kernelpath := $(VBOX_LINUX_SRC) endif ifeq ($(BUILD_TARGET_ARCH),x86) - VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default + VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default \ + $(kernelpath)/include/asm-x86/mach-default endif endif endif ++++++ virtualbox-validate-op-gcc43.diff ++++++ Index: src/recompiler/InnoTek/op-validate.sed =================================================================== --- src/recompiler/InnoTek/op-validate.sed.orig +++ src/recompiler/InnoTek/op-validate.sed @@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan /\.Lfe[0-9][0-9]*:/d /\.LFE[0-9][0-9]*:/d /size[[:space:]]/d +/p2align[[:space:]]/d +/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d /^[/#]NO_APP[[:space:]]*$/d /^$/!b bad b end ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org