diff --git a/VirtualBox-4.1.2-UserManual.pdf b/VirtualBox-4.1.2-UserManual.pdf deleted file mode 100644 index 3405725..0000000 --- a/VirtualBox-4.1.2-UserManual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f88979bf9a821b26ed7bc3a8b1681633e62feb85d04f468cb38dce9ea88b6339 -size 5002874 diff --git a/VirtualBox-4.1.2-patched.tar.bz2 b/VirtualBox-4.1.2-patched.tar.bz2 deleted file mode 100644 index 36134d3..0000000 --- a/VirtualBox-4.1.2-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69484975d81fd7344af63f9e668b2dd1200f075a6807cc8c90721e4edaddf7d2 -size 46171433 diff --git a/VirtualBox-4.1.4-UserManual.pdf b/VirtualBox-4.1.4-UserManual.pdf new file mode 100644 index 0000000..88e11ab --- /dev/null +++ b/VirtualBox-4.1.4-UserManual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae4bb67e8eead8d315ab8daa11385278a2701d7973c921bf066b16ca5759a8f3 +size 5028555 diff --git a/VirtualBox-4.1.4-patched.tar.bz2 b/VirtualBox-4.1.4-patched.tar.bz2 new file mode 100644 index 0000000..b372787 --- /dev/null +++ b/VirtualBox-4.1.4-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7510bf8b630431154cbab94b4c055cb18ee96d8ae9f2d329e63905dc05dcba +size 46592322 diff --git a/vbox-fix-ftbfs-as-needed.patch.diff b/vbox-fix-ftbfs-as-needed.patch.diff deleted file mode 100644 index e7f5155..0000000 --- a/vbox-fix-ftbfs-as-needed.patch.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk -+++ VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk -@@ -469,9 +469,11 @@ - libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags) - libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs) - xpidl_CFLAGS = \ -- $(libIDL_config_cflags) -+ $(shell pkg-config --cflags libIDL-2.0) - xpidl_LDFLAGS = \ -- $(libIDL_config_libs) -+ $(shell pkg-config --libs-only-L libIDL-2.0) -+xpidl_LIBS.linux = \ -+ $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g') - xpidl_LDFLAGS.linux = \ - $(VBOX_LD_as_needed) - endif ---- VirtualBox-4.0.0_OSE/Config.kmk -+++ VirtualBox-4.0.0_OSE/Config.kmk -@@ -4082,7 +4082,7 @@ - TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64 - TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64 - ifeq ($(KBUILD_HOST),linux) --TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl -+TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt - else ifeq ($(KBUILD_HOST),os2) - TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF - TEMPLATE_VBOXBLDPROG_LIBS = socket iconv diff --git a/virtualbox-4.1.2-rpmlintrc b/virtualbox-4.1.4-rpmlintrc similarity index 100% rename from virtualbox-4.1.2-rpmlintrc rename to virtualbox-4.1.4-rpmlintrc diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index a23e6fa..6b7a9eb 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1,5 +1,5 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" #these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !! -#SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers" -#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers" - +# +#SUBSYSTEM=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}" +#SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}" diff --git a/virtualbox-60-vboxmouse.conf b/virtualbox-60-vboxmouse.conf deleted file mode 100644 index e949ac5..0000000 --- a/virtualbox-60-vboxmouse.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "VBoxMouse" - Driver "vboxmouse" - MatchDevicePath "/dev/vboxguest" -EndSection diff --git a/virtualbox.changes b/virtualbox.changes index 3a558fd..92d29fe 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Fri Oct 7 09:41:22 UTC 2011 - mseben@gmail.com + +- dropped xorg conf file virtualbox-60-vboxmouse.conf as there is + no more vboxmouse_drv.so xorg driver on %suse_version >= 1130 +- modified virtualbox-60-vboxdrv.rules to use setfacl instead of GROUP rule +- update to virtualbox 4.1.4 + * VMM: fixed PAE guests running on 32-bit hosts (4.0 regression; bug #9458) + * VMM: fixed INVALID_PARAMETER guru meditation caused by insufficient memory conditions (4.1.0 regression; bug #9240) + * VMM: fixed clobbered CPU registers during stos/lods/ins/outs emulation under rare circumstances + * VMM: another fix for 64-bit guests on recent AMD CPUs + * GUI: warn the user if he uses an outdated extension pack and allow to download and upgrade in that case (bug #8025) + * GUI: fixed spurious LCtrl key events on some Windows hosts (4.0.6 regression; bug #373) + * VBoxManage: another fix for extpack install --replace (bug #9308) + * VBoxManage: allow to specify the UUID of the target image in convertfromraw + * VRDP: fixed a rare crash when two or more clients connect to the server (bug #9503) + * VRDP: fixed a case when a client was not resized correctly (bug #9242) + * USB: make device capturing work on Windows hosts with usbhub class filter drivers installed (bug #9298); bugfixes for Windows host USB support + * VHD: fixed reads crossing block boundaries (bug #8532) + * VMDK: fixed progress indicator when creating split VMDK images + * Floppy: fixed medium size detection for physical mediums (Windows hosts only) + * Main: fixed VM initialization if a shared folder does not exist (bug #7941) + * Main: fixed possible deadlock between hard disk enumeration and resetting of immutable disks (bug #9549) + * Main: fixed not detaching of virtual storage after a snapshot restore operation (bug #8296) + * Main: always reset modified state after restoring a snapshot (bug #9387) + * Main: fixed writing of changed VM settings to disk when using snapshots (bug #8932) + * Main: fixed taking screen shots (e.g. the preview window) for headless VMs if the Guest Additions are active + * Virtio-net: fixed the problem with UDP packets exceeding MTU (bug #9370) + * 3D Support: fixed incorrect rendering and possible crashes when switching to/from fullscreen with enabled 2D acceleration + * 3D Support: fixed compiz under ubuntu 9.10 + * Guest control: Miscellaneous small bugfixes + * Linux / Solaris hosts: don't use hard links in packages (4.1.2 regression; bug #9441) + * Mac OS X hosts: fix installation issues when installed as root (bug #1578) + * Mac OS X hosts: fixed packet capture issues with vboxnetX host-only interfaces (bug #8076) + * Solaris hosts: fixed incoming multicast packets for Crossbow based bridged networking (bug #9532) + * Solaris hosts: fixed starting EFI guests due to missing EFI ROM files (bug #9535) + * Windows hosts installer: fixed ADDLOCAL usage on command line (4.1.0 regression; bug #9488) + * Windows hosts installer: fixed dangling shortcut to the .chm help file (bug #9646) + * Windows hosts installer: try to fix installation error 2869 which appeared under certain circumstances (bug #9664) + * Windows hosts: VBoxHeadless should never open a separate console window (bug #3549) + * Guest Additions: fixed hang while waiting for guest execution output (4.1.2 regression; bug #9446) + * Linux Additions: add support for X.Org Server 1.11 (bug #9519) + * Linux Additions: suppress an incorrect error message and allow a shared folder to be mounted in multiple places (bug #9627) + * Linux Additions: start VBoxService correctly on openSUSE 12.1 (bug #6229) + * Linux Additions: properly finish the installation even if the compilation of the DRM module fails (which is not fatal) + * Solaris Additions: fixed memory leaks and panics while mounting (from console) and unmounting shared folders. + * Windows Additions: fixed swapped mouse cursor hotspot coordinates (4.1.0 regression; bug #9447) + * Windows Additions: fixed PAGE_FAULT_IN_NONPAGED_AREA BSOD in VBoxDisp.dll when running SnippingTool (bug #9508) + * Windows Additions: make image viewer work correctly with Aero enabled (Vista and Windows 7) + * Windows Additions: fixed incorrect window border blurs under Aero with ATI cards (Vista and Windows 7) + * Windows Additions: fixed incorrect rendering when moving 3D applications outside guest desktop and back under Aero (Vista and Windows 7) + * Windows Additions: fixed guest hangs when switching back from fullscreen text mode apps (bug #9636) + ------------------------------------------------------------------- Mon Sep 19 17:55:56 UTC 2011 - crrodriguez@opensuse.org diff --git a/virtualbox.spec b/virtualbox.spec index 615664a..ac4f959 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -21,11 +21,7 @@ Name: virtualbox BuildRequires: fdupes -%if %suse_version > 1110 BuildRequires: acpica dmidecode -%else -BuildRequires: pmtools -%endif #drop hal dependency %if %suse_version < 1210 BuildRequires: hal-devel @@ -39,9 +35,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d BuildRequires: pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev BuildRequires: boost-devel -%if %suse_version > 1110 BuildRequires: zlib-devel-static -%endif %ifarch amd64 x86_64 ia32e em64t #drop hal dependency %if %suse_version < 1210 @@ -53,7 +47,7 @@ BuildRequires: gcc-32bit gcc-c++-32bit %endif # ExclusiveArch: %ix86 x86_64 -Version: 4.1.2 +Version: 4.1.4 Release: 1 Summary: VirtualBox is an Emulator License: GPLv2+ @@ -75,7 +69,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}-60-vboxmouse.conf # init script to start virtual boxes during boot, to be configured via /etc/sysconfig/vbox bnc#582398 Source12: %{name}-vboxes Source13: %{name}-sysconfig.vbox @@ -97,8 +91,6 @@ Patch6: vbox-smc-napa.diff Patch8: vbox-python-detection.diff #fix build Patch10: vbox-disable_vboxpci_build.diff -#fix build -Patch11: vbox-fix-ftbfs-as-needed.patch.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch99: vbox-permissions_warning.diff @@ -222,7 +214,6 @@ Development file for %{name} %patch6 -p1 %patch8 -p1 %patch10 -%patch11 -p1 %patch99 -p1 %patch100 %patch101 @@ -300,10 +291,11 @@ echo "create directory structure" %__install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls %__install -d -m 755 %{buildroot}%{_datadir}/pixmaps %__install -d -m 755 %{buildroot}%{_datadir}/applications -%if %suse_version >= 1130 - %__install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ -%else +#%if %suse_version >= 1130 +# %__install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ +#%else #since 11.3 we don't use hal to detect vbox mouse +%if %suse_version < 1130 %__install -d -m 755 %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty %endif %__install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom @@ -356,21 +348,17 @@ pushd out/linux.*/release/bin/additions/ #VBoxClient daemon (support for clipboard,autoresize,seamless windows) %__install -m 755 VBoxClient %{buildroot}%{_bindir} # xorg drivers for mouse and videos check suse version to add propper driver +# check the patch https://www.virtualbox.org/changeset/38784, regarding the +# dropped xorg mouse driver in >= 1130 %if %suse_version > 1140 - %__install -m 755 vboxmouse_drv_110.so \ - %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_110.so \ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %else %if %suse_version == 1140 - %__install -m 755 vboxmouse_drv_19.so \ - %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_19.so \ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %else %if %suse_version == 1130 - %__install -m 755 vboxmouse_drv_18.so \ - %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_18.so \ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %else @@ -384,10 +372,10 @@ pushd out/linux.*/release/bin/additions/ %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_15.so \ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%endif -%endif -%endif -%endif +%endif #if =1120 +%endif #if =1130 +%endif #if =1140 +%endif #if >1140 popd # VBoxOGL* libs for guest-x11 subpackage %__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ @@ -397,10 +385,11 @@ popd # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) %__install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \ %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh -%if %suse_version >= 1130 +#%if %suse_version >= 1130 # add xorg config snipet to vbox mouse integration recognize - %__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf -%else + # %__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf +#%else +%if %suse_version < 1130 # hal policy file to autodetect the virtualbox mouse %__install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi \ %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi @@ -513,27 +502,31 @@ groupadd -r vboxusers 2>/dev/null || : /sbin/ldconfig %fillup_and_insserv -f -y vboxdrv %fillup_only -an vboxes -%if %suse_version >=1140 - %set_permissions +%if %suse_version >= 1140 + %set_permissions %{_vbox_instdir}/VBoxNetDHCP + %set_permissions %{_vbox_instdir}/VBoxNetAdpCtl + %set_permissions %{_vbox_instdir}/VBoxBFE + %set_permissions %{_vbox_instdir}/VBoxHeadless + %set_permissions %{_vbox_instdir}/VBoxSDL %else %run_permissions %endif %post qt -%if %suse_version >=1140 - %set_permissions +%if %suse_version >= 1140 + %set_permissions %{_vbox_instdir}/VirtualBox %else %run_permissions %endif %verifyscript -%if %suse_version >=1140 +%if %suse_version >= 1140 %verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP %endif -%if %suse_version > 1110 - %verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl -%endif -%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL +%verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl +%verify_permissions -e %{_vbox_instdir}/VBoxBFE +%verify_permissions -e %{_vbox_instdir}/VBoxHeadless +%verify_permissions -e %{_vbox_instdir}/VBoxSDL %verifyscript qt %verify_permissions -e %{_vbox_instdir}/VirtualBox @@ -619,24 +612,20 @@ exit 0 %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv %if %suse_version >= 1140 -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP + %verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP %else -%{_vbox_instdir}/VBoxNetDHCP + %{_vbox_instdir}/VBoxNetDHCP %endif -%if %suse_version > 1110 -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl -%else -%{_vbox_instdir}/VBoxNetAdpCtl -%endif -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxBFE -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxBFE +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL # %files qt %defattr(-, root, root) -%{_vbox_instdir}/VBoxPermissionMessage -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox +%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage +%verify(not mode) %attr(4755,root,vboxusers) %{_vbox_instdir}/VirtualBox #wrapper script is in bindir %attr(0755,root,root) %{_bindir}/VirtualBox #ldd shows libQt* dependency @@ -656,13 +645,13 @@ exit 0 %{_bindir}/VBoxClient %{_libdir}/VBoxOGL*.so %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%{_libdir}/xorg/modules/input/vboxmouse_drv.so %{_libdir}/dri/vboxvideo_dri.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh -%if %suse_version >= 1130 -%config %{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf -%else -%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi +%if %suse_version < 1130 +# %config %{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf +#%else + %{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi + %{_libdir}/xorg/modules/input/vboxmouse_drv.so %endif # @@ -683,9 +672,9 @@ exit 0 %dir %{_vbox_instdir}/sdk/bindings/xpcom %{_vbox_instdir}/sdk/bindings/xpcom/python %if 0%{?suse_version} > 1130 -%attr(0755, root, root) %{_vbox_instdir}/VBoxPython2_7.so + %attr(0755, root, root) %{_vbox_instdir}/VBoxPython2_7.so %else -%attr(0755, root, root) %{_vbox_instdir}/VBoxPython2_6.so + %attr(0755, root, root) %{_vbox_instdir}/VBoxPython2_6.so %endif %files devel