Hello community,
here is the log from the commit of package virtualbox-ose
checked in at Sat Sep 13 12:26:16 CEST 2008.
--------
--- virtualbox-ose/virtualbox-ose.changes 2008-09-08 17:09:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2008-09-11 20:43:18.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 11 20:41:05 CEST 2008 - mkudlvasr@suse.cz
+
+- new upstream version 1.6.6
+- removed Patch14 - not needed any more
+- added rc-symlinks to init scripts
+- fixed Config.kmk
+
+-------------------------------------------------------------------
Old:
----
vbox-vboxfs-2.6.25
VirtualBox-1.6.4-OSE-patched.tar.bz2
virtualbox-missing-Makefiles.diff
virtualbox-system-yasm.diff
New:
----
VirtualBox-1.6.6-OSE-patched.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.a30287/_old 2008-09-13 12:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.a30287/_new 2008-09-13 12:25:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox-ose (Version 1.6.4)
+# spec file for package virtualbox-ose (Version 1.6.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,14 +26,14 @@
%else
BuildRequires: libXalan-c-devel libXerces-c-devel
%endif
-BuildRequires: bin86 dev86 libidl-devel libxslt-devel qt3-devel
+BuildRequires: bin86 dev86 libidl-devel libxslt-devel
BuildRequires: SDL-devel kernel-syms module-init-tools pmtools
BuildRequires: e2fsprogs-devel update-desktop-files
%if %suse_version <= 1030
BuildRequires: compat-libstdc++
%endif
BuildRequires: hal-devel pulseaudio-devel qt3-devel-tools xorg-x11-devel
-BuildRequires: kbuild
+BuildRequires: kbuild python
# is needed only as owner of xorg/modules directory
BuildRequires: xorg-x11-server-sdk
%if %suse_version > 1030
@@ -62,7 +62,7 @@
%endif
%endif
#
-Version: 1.6.4
+Version: 1.6.6
Release: 1
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
@@ -90,12 +90,12 @@
Patch6: virtualbox-gcc43-fixes.diff
Patch7: virtualbox-validate-op-gcc43.diff
Patch8: use-o3-to-workaround-gcc-ice.diff
-Patch9: virtualbox-system-yasm.diff
+#Patch9: virtualbox-system-yasm.diff
Patch10: vbox-2.6.25
-Patch11: vbox-vboxfs-2.6.25
+#Patch11: vbox-vboxfs-2.6.25
Patch12: vbox-buildfix
Patch13: virtualbox-use-intree-yasm.diff
-Patch14: virtualbox-missing-Makefiles.diff
+#Patch14: virtualbox-missing-Makefiles.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils
@@ -190,7 +190,7 @@
#%patch11 -p1
%patch12 -p1
%patch13
-%patch14
+#%patch14
%__cp %{SOURCE7} .
%build
@@ -285,6 +285,10 @@
%__install -m 744 vboxadd-timesync.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-timesync
%__install -m 744 vboxvfs.sh %{buildroot}%{_sysconfdir}/init.d/vboxvfs
popd
+# rc-links to virtualbox guest tools init scripts
+%__ln_s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd
+%__ln_s %{_sysconfdir}/init.d/vboxadd-timesync %{buildroot}%{_sbindir}/rcvboxadd-timesync
+%__ln_s %{_sysconfdir}/init.d/vboxvfs %{buildroot}%{_sbindir}/rcvboxvfs
pushd src/VBox/Additions/x11/installer
%__install -d -m 755 %{buildroot}%{_datadir}/virtualbox
%__install -m 744 x11config.pl %{buildroot}%{_datadir}/virtualbox/x11config.pl
@@ -339,6 +343,8 @@
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__cp %{SOURCE4} %{name}.desktop
%suse_update_desktop_file -i %{name} System Emulator
+%__ln_s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv
+%__ln_s %{_sysconfdir}/init.d/vboxnet %{buildroot}%{_sbindir}/rcvboxnet
###
### generate SaX2/hwinfo data
###
@@ -440,6 +446,8 @@
%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
%{_sysconfdir}/init.d/vboxdrv
%{_sysconfdir}/init.d/vboxnet
+%{_sbindir}/rcvboxdrv
+%{_sbindir}/rcvboxnet
%files -n xorg-x11-driver-virtualbox-ose
%defattr(-, root, root)
@@ -454,6 +462,9 @@
#%{_bindir}/vboxadd-xclient
%{_bindir}/VBoxClient
%{_sbindir}/mountvboxsf
+%{_sbindir}/rcvboxadd
+%{_sbindir}/rcvboxadd-timesync
+%{_sbindir}/rcvboxvfs
%{_sysconfdir}/init.d/vboxadd
%{_sysconfdir}/init.d/vboxvfs
%{_sysconfdir}/init.d/vboxadd-timesync
@@ -462,6 +473,11 @@
%{_datadir}/virtualbox/x11restore.pl
%changelog
+* Thu Sep 11 2008 mkudlvasr@suse.cz
+- new upstream version 1.6.6
+- removed Patch14 - not needed any more
+- added rc-symlinks to init scripts
+- fixed Config.kmk
* Mon Sep 08 2008 dmueller@suse.de
- merge into openSUSE Factory
* Sat Aug 09 2008 suse-tux@gmx.de
++++++ use-o3-to-workaround-gcc-ice.diff ++++++
--- /var/tmp/diff_new_pack.a30287/_old 2008-09-13 12:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.a30287/_new 2008-09-13 12:25:53.000000000 +0200
@@ -1,6 +1,6 @@
--- src/recompiler/Makefile.kmk
+++ src/recompiler/Makefile.kmk
-@@ -231,9 +231,9 @@
+@@ -225,9 +225,9 @@
# Extra flags for these source modules.
target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
@@ -10,5 +10,5 @@
-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
-
+ cpu-exec.c_CFLAGS.solaris.amd64 = -O2 -fomit-frame-pointer -fno-strict-aliasing
++++++ vbox-2.6.25 ++++++
--- /var/tmp/diff_new_pack.a30287/_old 2008-09-13 12:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.a30287/_new 2008-09-13 12:25:53.000000000 +0200
@@ -1,6 +1,6 @@
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -225,11 +225,21 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+--- VirtualBox-1.6.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-1.6.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -257,11 +257,21 @@
#undef bool
/*
@@ -24,4 +24,4 @@
+#define change_page_attr(a,b,c) my_change_page_attr((a), (b), (c))
#endif
- #endif
+ /**
++++++ vbox-buildfix ++++++
--- /var/tmp/diff_new_pack.a30287/_old 2008-09-13 12:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.a30287/_new 2008-09-13 12:25:53.000000000 +0200
@@ -1,12 +1,14 @@
----
- Config.kmk | 9 ++++++++-
- src/VBox/Runtime/Makefile.kmk | 1 +
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -1216,7 +1216,14 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
+--- VirtualBox-1.6.6/Config.kmk
++++ VirtualBox-1.6.6/Config.kmk
+@@ -1493,17 +1493,28 @@
kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+ else
+ # Linux >= 2.6.25
+- kernelpath := $(shell $(SED_EXT) -ne 's+^MAKEARGS *:= *-C *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
++ kernelsrc := $(shell $(SED_EXT) -ne 's+^MAKEARGS *:= *-C *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
++ kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+ endif
+ ifneq ($(kernelpath),)
VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
else
- kernelpath := $(VBOX_LINUX_SRC)
@@ -19,5 +21,13 @@
+ kernelpath := $(VBOX_LINUX_SRC)
+ endif
endif
- ifeq ($(BUILD_TARGET_ARCH),x86)
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default \
+ $(kernelpath)/include/asm-x86/mach-default
+ endif
++ ifeq ($(KBUILD_TARGET_ARCH),amd64)
++ VBOX_LINUX_INCS += $(kernelpath)/include/asm-x86/mach-default
++ endif
+ endif
+ endif
+ endif
++++++ VirtualBox-1.6.4-OSE-patched.tar.bz2 -> VirtualBox-1.6.6-OSE-patched.tar.bz2 ++++++
virtualbox-ose/VirtualBox-1.6.4-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-1.6.6-OSE-patched.tar.bz2 differ: byte 11, line 1
++++++ virtualbox-gcc43-fixes.diff ++++++
--- /var/tmp/diff_new_pack.a30287/_old 2008-09-13 12:25:54.000000000 +0200
+++ /var/tmp/diff_new_pack.a30287/_new 2008-09-13 12:25:54.000000000 +0200
@@ -1,6 +1,6 @@
--- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
+++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
-@@ -28,6 +28,8 @@
+@@ -33,6 +33,8 @@
#include "VBoxRegistrationDlg.h"
#endif
@@ -11,7 +11,7 @@
#include