From 6fcc2cd8ec3d57af4142613fedd96b6c52386160af6438eeb349aa4f3f8ad9d0 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Wed, 4 Apr 2012 04:13:22 +0000 Subject: [PATCH] Accepting request 112419 from home:mseben:branches:Virtualization update to virtualbox 4.1.10 OBS-URL: https://build.opensuse.org/request/show/112419 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=81 --- VirtualBox-4.1.10-UserManual.pdf | 3 ++ VirtualBox-4.1.10-patched.tar.bz2 | 3 ++ VirtualBox-4.1.8-UserManual.pdf | 3 -- VirtualBox-4.1.8-patched.tar.bz2 | 3 -- kernel-3.3.patch | 43 ------------------- vbox-gsoap_ssl.diff | 13 ++++++ vbox-vboxadd-init-script.diff | 16 +++---- ...8-rpmlintrc => virtualbox-4.1.10-rpmlintrc | 0 virtualbox.changes | 41 ++++++++++++++++++ virtualbox.spec | 14 +++--- 10 files changed, 76 insertions(+), 63 deletions(-) create mode 100644 VirtualBox-4.1.10-UserManual.pdf create mode 100644 VirtualBox-4.1.10-patched.tar.bz2 delete mode 100644 VirtualBox-4.1.8-UserManual.pdf delete mode 100644 VirtualBox-4.1.8-patched.tar.bz2 delete mode 100644 kernel-3.3.patch create mode 100644 vbox-gsoap_ssl.diff rename virtualbox-4.1.8-rpmlintrc => virtualbox-4.1.10-rpmlintrc (100%) diff --git a/VirtualBox-4.1.10-UserManual.pdf b/VirtualBox-4.1.10-UserManual.pdf new file mode 100644 index 0000000..d12925b --- /dev/null +++ b/VirtualBox-4.1.10-UserManual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e6944fb737e47b47cd1e81c4f5eba7471a2d67c9d0bd632202b173adbbec99 +size 5060162 diff --git a/VirtualBox-4.1.10-patched.tar.bz2 b/VirtualBox-4.1.10-patched.tar.bz2 new file mode 100644 index 0000000..9bf5fea --- /dev/null +++ b/VirtualBox-4.1.10-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45962ee8c9982fcec17bd021ea619399d89db97db597fafd33de941146177c69 +size 46335892 diff --git a/VirtualBox-4.1.8-UserManual.pdf b/VirtualBox-4.1.8-UserManual.pdf deleted file mode 100644 index 202b617..0000000 --- a/VirtualBox-4.1.8-UserManual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae9ca5321e88f4ff654402732112c3ac75302277559a6fbeed014358642642da -size 5045126 diff --git a/VirtualBox-4.1.8-patched.tar.bz2 b/VirtualBox-4.1.8-patched.tar.bz2 deleted file mode 100644 index be1312e..0000000 --- a/VirtualBox-4.1.8-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0410bbe69fc9ff2c8be0639110c2b55b1f31fa424a026008f8b58c191f8ca624 -size 46582650 diff --git a/kernel-3.3.patch b/kernel-3.3.patch deleted file mode 100644 index 8d58d7b..0000000 --- a/kernel-3.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c -=================================================================== ---- VirtualBox-4.1.8_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c -+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c -@@ -86,6 +86,20 @@ int vboxvideo_driver_load(struct drm_dev - #endif - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) -+/* since linux-3.3.0-rc1 drm_driver::fops is pointer */ -+static struct file_operations driver_fops = -+{ -+ .owner = THIS_MODULE, -+ .open = drm_open, -+ .release = drm_release, -+ .unlocked_ioctl = drm_ioctl, -+ .mmap = drm_mmap, -+ .poll = drm_poll, -+ .fasync = drm_fasync, -+}; -+#endif -+ - static struct drm_driver driver = - { - /* .driver_features = DRIVER_USE_MTRR, */ -@@ -96,6 +110,7 @@ static struct drm_driver driver = - .get_map_ofs = drm_core_get_map_ofs, - .get_reg_ofs = drm_core_get_reg_ofs, - #endif -+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - .fops = - { - .owner = THIS_MODULE, -@@ -112,6 +127,9 @@ static struct drm_driver driver = - .poll = drm_poll, - .fasync = drm_fasync, - }, -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */ -+ .fops = &driver_fops, -+#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) - .pci_driver = - { diff --git a/vbox-gsoap_ssl.diff b/vbox-gsoap_ssl.diff new file mode 100644 index 0000000..d98d90c --- /dev/null +++ b/vbox-gsoap_ssl.diff @@ -0,0 +1,13 @@ +Index: VirtualBox-4.1.10/configure +=================================================================== +--- VirtualBox-4.1.10.orig/configure ++++ VirtualBox-4.1.10/configure +@@ -1959,7 +1959,7 @@ check_gsoap() + else + cnf_append "VBOX_GSOAP_CXX_SOURCES" "" + fi +- cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoap++" ++ cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoapssl++ ssl crypto" + log_success "found" + else + log_failure "stlvector.h not found -- disabling webservice" diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff index 3c903d1..ef4037b 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -17,8 +17,8 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO - PATH=$PATH:/bin:/sbin:/usr/sbin -@@ -165,8 +166,6 @@ fi + . /var/lib/VBoxGuestAdditions/config +@@ -169,8 +170,6 @@ fi dev=/dev/vboxguest userdev=/dev/vboxuser @@ -27,7 +27,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh test_for_gcc_and_make() { -@@ -242,12 +241,6 @@ do_vboxguest_non_udev() +@@ -256,12 +255,6 @@ do_vboxguest_non_udev() fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -40,7 +40,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh if [ ! -c $userdev ]; then maj=10 -@@ -258,12 +251,6 @@ do_vboxguest_non_udev() +@@ -272,12 +265,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -53,7 +53,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh fi fi } -@@ -292,8 +279,7 @@ start() +@@ -308,8 +295,7 @@ start() do_vboxguest_non_udev;; esac @@ -63,7 +63,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh $MODPROBE vboxsf > /dev/null 2>&1 || { if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then fail_msg -@@ -303,8 +289,7 @@ start() +@@ -319,8 +305,7 @@ start() fi fail "modprobe vboxsf failed" } @@ -73,7 +73,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh # Mount all shared folders from /etc/fstab. Normally this is done by some # other startup script but this requires the vboxdrv kernel module loaded. -@@ -321,10 +306,8 @@ stop() +@@ -337,10 +322,8 @@ stop() if ! umount -a -t vboxsf 2>/dev/null; then fail "Cannot unmount vboxsf folders" fi @@ -86,7 +86,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh fi if running_vboxguest; then rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" -@@ -483,16 +466,8 @@ extra_setup() +@@ -500,16 +483,8 @@ extra_setup() # setup_script setup() { diff --git a/virtualbox-4.1.8-rpmlintrc b/virtualbox-4.1.10-rpmlintrc similarity index 100% rename from virtualbox-4.1.8-rpmlintrc rename to virtualbox-4.1.10-rpmlintrc diff --git a/virtualbox.changes b/virtualbox.changes index 088da09..5322a0d 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Sun Apr 1 05:48:40 UTC 2012 - mseben@gmail.com + +- added vbox-gsoap_ssl.diff to fix building websrv with ssl support +- drop deprecated kernel-3.3.patch +- update to virtualbox 4.1.10 (This is a maintenance release): + * GUI: if 3D support on the host is not available for some reason, do not only disable this VM setting but also uncheck the checkbox + * VMM: fixed a potential problem causing to schedule interrupts during SYSEXIT right after STI + * VMM: fixed a potential guest memory corruption issue with page fusion + * VMM: adjusted the module matching algorithm for page fusion a little, generally resulting in slightly more shared pages + * Main: host interfaces no longer have "defaults" for IP address and network mask attributes + * Main: don't depend on a password for certain guest control operations (bug #10030) + * 3D Support: fixed Windows XP hosts support (4.1.8 regression; bugs #10071 and #10088) + * 3D Support: rendering fixes for Linux hosts with NVIDIA graphics + * 3D Support: fixed saved state issues (4.1.8 regression; bug #10126) + * 3D Support: WDDM driver: fixed powershell_ise crashes (bug #10167), make WPF-based apps work with Aero enabled, fixed additional possible WinSAT crashes + * VRDP: fixed remote clipboard compatibility issues with some clients + * Storage: fixed a possible data corruption when compacting VDI or VHD images with snapshots (32-bit hosts only) + * iSCSI: fixed crash when using incorrect credentials when authenticating with a LIO target (bug #10173) + * Serial: don't abort in host mode under rare error conditions (non-Windows hosts only) + * SDK: actually ship current C bindings + * SDK: fixed the Java glue code for JDK 1.7.0 (bug #9848) + * SDK: added Python example + * Metrics: make metrics collection more robust regarding blocked VMs + * Web service: added SSL/TLS support + * VBoxShell: fixed Guest Additions information lookup + * Solaris installer: fixed dependency checking while installing VirtualBox in a zone + * Linux hosts/guests: Linux 3.3-rc1 compile fixes + * Solaris hosts: fixed debug kernel panics while opening module CTF data (bug #9651) + * Mac OS X hosts: fixed Python support on Lion + * Linux Additions: make 3D passthrough work on OL/RHEL 6.2 (bug #10010) + * Linux Additions: fixed missing implementation when copying shared folder data through kernel high memory (bug #9878) + * Linux Additions: make sure all data is written when closing a memory mapped file on a shared folder + * Linux Additions: added support for X.Org Server 1.12 + * Solaris Additions: fixed guest kernel driver to load properly on guest reboot (4.1.8 regression; bug #10113) + * Solaris Additions: fixed missing 64-bit OpenGL library VBoxOGL.so (bug #10151) + * Solaris Additions: fixed VBoxService import and start for Solaris 11 guests. + * Windows Additions: some Windows 8 adaptions + * Windows Additions: several fixes for shared folders (bug #9753) + * Guest control: miscellaneous bugfixes + ------------------------------------------------------------------- Sun Mar 18 08:18:34 UTC 2012 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 81322bf..e099e81 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -29,10 +29,11 @@ BuildRequires: hal-devel %if %suse_version >= 1210 BuildRequires: glibc-devel-static %endif -#gsoap and java needed for building webservice +#gsoap,libopenssl and java needed for building webservice BuildRequires: gsoap-devel BuildRequires: libgsoap-devel BuildRequires: java-1_6_0-openjdk-devel +BuildRequires: libopenssl-devel # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -76,7 +77,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit %endif # ExclusiveArch: %ix86 x86_64 -Version: 4.1.8 +Version: 4.1.10 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -121,14 +122,15 @@ Patch6: vbox-smc-napa.diff Patch8: vbox-python-detection.diff #fix build: we have to ommit gcc flag -fvisibility=hidden for soap related sources Patch9: vbox-visibility.diff +#fix building websrv with ssl support +#http://www.mail-archive.com/vbox-dev@virtualbox.org/msg04997.html +Patch10: vbox-gsoap_ssl.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 #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier Patch100: vbox-no-build-dates.diff Patch101: vbox-default-os-type.diff -# PATCH-FIX-UPSTREAM Compile with 3.3.0 kernel -Patch102: kernel-3.3.patch #disable update in vbox gui Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) @@ -243,7 +245,7 @@ Obsoletes: %{name}-ose-devel < %version Development file for %{name} ########################################### %prep -%setup -q -n VirtualBox-%{version}_OSE +%setup -q -n VirtualBox-%{version} %patch1 %patch2 %patch3 -p1 @@ -252,10 +254,10 @@ Development file for %{name} %patch6 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch99 -p1 %patch100 %patch101 -%patch102 -p1 %patch103 %patch104 -p1 #copy user manual