rpms/VirtualBox/F-15 VirtualBox-OSE-4.1.6-strings.patch, 1.2, 1.3 VirtualBox-OSE-90-vboxdrv.rules, 1.6, 1.7 VirtualBox.spec, 1.3, 1.4

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-15 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15261 Modified Files: VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE-90-vboxdrv.rules VirtualBox.spec Log Message: * Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-5 - Kernel patches just for rawhide, so we don't need recompile kmods. - Update strings. * Wed Jun 13 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-4 - Upstreamed patches to fix compiles with 3.5 kernels, kindly alerted by virtualbox team. * Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-3 - From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd unit files must put them into %{_unitdir}. - Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream. VirtualBox-OSE-4.1.6-strings.patch: Frontends/VirtualBox/src/main.cpp | 22 +++++++++++----------- Installer/linux/VBox.sh | 13 ++++++++----- VMM/VMMR3/VM.cpp | 8 ++++---- VMM/VMMR3/VM.cpp.orig |only 4 files changed, 23 insertions(+), 20 deletions(-) Index: VirtualBox-OSE-4.1.6-strings.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-15/VirtualBox-OSE-4.1.6-strings.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-OSE-4.1.6-strings.patch 6 Feb 2012 02:37:12 -0000 1.2 +++ VirtualBox-OSE-4.1.6-strings.patch 16 Jun 2012 15:19:50 -0000 1.3 @@ -1,3 +1,7 @@ +From: Sérgio Basto +Subject: Rebased for 4.1.16 +Date: Sat Jun 16 2012 + From 3a6d9a3d4f8d9084759fe871033b6b4a990aa761 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Mon, 10 May 2010 12:08:47 -0400 @@ -10,9 +14,10 @@ src/VBox/VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 20 insertions(+), 19 deletions(-) ---- a/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-05 07:16:19.000000000 +0000 -+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-12 03:13:48.210675902 +0000 -@@ -72,13 +72,13 @@ +diff -urp VirtualBox-4.1.16.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.16/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.16.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-05-22 14:11:30.000000000 +0100 ++++ VirtualBox-4.1.16/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-16 10:13:57.881394005 +0100 +@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli ); QString g_QStrHintLinuxNoDriver = QApplication::tr( @@ -25,24 +30,26 @@ - "recompiles the vboxdrv kernel module if necessary." + "The VirtualBox Linux kernel driver (vboxdrv) is probably not " + "loaded.<br/><br/>" -+ "If you installed or VirtualBox OSE package recently you need to restart " ++ "If you installed or VirtualBox package recently you need to restart " + "the computer for the driver to load.<br/><br/>" + "Alternatively, you may attempt to load the driver by issuing the " + "following command with system administrator (root) privileges:<br/><br/>" -+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>" ++ " <font color=blue>'/etc/sysconfig/modules/VirtualBox.modules'</font><br/><br/>" ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -@@ -92,7 +92,7 @@ +@@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio "The VirtualBox kernel modules do not match this version of " "VirtualBox. The installation of VirtualBox was apparently not " "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>" ++ " <font color=blue>'/etc/sysconfig/modules/VirtualBox.modules'</font><br/><br/>" "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." +- "OSE version and the PUEL version of VirtualBox." ++ "RPM Fusion version and the Oracle version of VirtualBox." ); -@@ -101,9 +101,9 @@ + + QString g_QStrHintOtherNoDriver = QApplication::tr( "Make sure the kernel module has been loaded successfully." ); @@ -54,11 +61,10 @@ ); #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX) -diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh -index 9319696..0e782e0 100644 ---- a/src/VBox/Installer/linux/VBox.sh -+++ b/src/VBox/Installer/linux/VBox.sh -@@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then +diff -urp VirtualBox-4.1.16.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.16/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.16.orig/src/VBox/Installer/linux/VBox.sh 2012-05-22 14:11:56.000000000 +0100 ++++ VirtualBox-4.1.16/src/VBox/Installer/linux/VBox.sh 2012-06-16 10:23:36.793849025 +0100 +@@ -32,19 +32,22 @@ elif ! lsmod|grep -q vboxdrv; then cat << EOF WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to @@ -66,7 +72,7 @@ + load. Reboot the computer, or insert the kernel module by executing - sudo /etc/init.d/vboxdrv setup -+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root) ++ '/etc/sysconfig/modules/VirtualBox.modules' (as root) You will not be able to start VMs until this problem is fixed. EOF @@ -76,7 +82,9 @@ +WARNING: The character device /dev/vboxdrv does not exist. Try running - sudo /etc/init.d/vboxdrv restart ++ '/sbin/udevadm control --reload-rules' (as root) + 'systemctl restart udev-trigger.service' (as root) ++ 'systemctl restart udev-settle.service' (as root) - and if that is not successful, try to re-install the package. + and if that is not successful, then you're in situation that @@ -84,32 +92,29 @@ You will not be able to start VMs until this problem is fixed. EOF -diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp -index d9e1bc1..c24f8dd 100644 ---- a/src/VBox/VMM/VMMR3/VM.cpp -+++ b/src/VBox/VMM/VMMR3/VM.cpp -@@ -363,8 +363,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, +diff -urp VirtualBox-4.1.16.orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.16/src/VBox/VMM/VMMR3/VM.cpp +--- VirtualBox-4.1.16.orig/src/VBox/VMM/VMMR3/VM.cpp 2012-05-22 14:13:00.000000000 +0100 ++++ VirtualBox-4.1.16/src/VBox/VMM/VMMR3/VM.cpp 2012-06-16 10:10:39.047479661 +0100 +@@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv is not set up properly. " - "Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "Reboot the computer, or insert the kernel module by executing " -+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); ++ "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif -@@ -405,8 +405,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, +@@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv was not created for some " - "reason. Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "reason. Insert the kernel module by executing " -+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); ++ "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif --- -1.7.3.4 - +Only in VirtualBox-4.1.16/src/VBox/VMM/VMMR3: VM.cpp.orig Index: VirtualBox-OSE-90-vboxdrv.rules =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-15/VirtualBox-OSE-90-vboxdrv.rules,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- VirtualBox-OSE-90-vboxdrv.rules 27 Nov 2011 22:03:30 -0000 1.6 +++ VirtualBox-OSE-90-vboxdrv.rules 16 Jun 2012 15:19:50 -0000 1.7 @@ -1,3 +1,4 @@ -ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600" -ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600" -ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}" +SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-15/VirtualBox.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VirtualBox.spec 31 May 2012 05:26:09 -0000 1.3 +++ VirtualBox.spec 16 Jun 2012 15:19:50 -0000 1.4 @@ -1,7 +1,5 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%global systemd_dir /lib/systemd/system - # Standard compiler flags, without: # -Wall -- VirtualBox takes care of reasonable warnings very well # -m32, -m64 -- 32bit code is built besides 64bit on x86_64 @@ -17,7 +15,7 @@ Name: VirtualBox Version: 4.1.16 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Release: 5%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -48,6 +46,11 @@ Patch22: VirtualBox-OSE-4.1.12-gsoap.patch Patch23: VirtualBox-OSE-4.1.10-mesa.patch +### +#Upstream patches +Patch100: VirtualBox-changeset_41660.patch +Patch101: VirtualBox-changeset_41577.patch + %if 0%{?fedora} < 17 BuildRequires: kBuild >= 0.1.98 %endif @@ -82,6 +85,11 @@ BuildRequires: libXcomposite-devel BuildRequires: libXmu-devel +BuildRequires: systemd-units +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + # Plague-specific weirdness %if 0%{?fedora} > 11 || 0%{?rhel} > 5 ExclusiveArch: i686 x86_64 @@ -91,10 +99,6 @@ ExclusiveArch: i386 x86_64 %endif -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - Provides: %{name}-OSE = %{version}-%{release} Obsoletes: %{name}-OSE < %{version}-%{release} Requires: %{name}-kmod = %{version}%{?prereltag} @@ -176,6 +180,12 @@ %setup -q find -name '*.py[co]' -delete +# upstream patches first +%if 0%{?fedora} > 17 +%patch100 -p1 -b .kernel35 +%patch101 -p1 -b .kernel35.2 +%endif + %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx @@ -353,10 +363,13 @@ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf install -m 0644 -D %{SOURCE10} \ - $RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service + $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service install -m 0644 -D %{SOURCE11} \ - $RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service + $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service + +install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \ + $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh @@ -512,7 +525,8 @@ %config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules %config %{_sysconfdir}/sysconfig/modules/%{name}.modules %doc COPYING -%{systemd_dir}/vboxweb.service +%{_unitdir}/vboxweb.service +/lib/udev/VBoxCreateUSBNode.sh %files devel @@ -540,7 +554,7 @@ %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules %config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules %doc COPYING -%{systemd_dir}/vboxservice.service +%{_unitdir}/vboxservice.service %files kmodsrc @@ -548,6 +562,18 @@ %changelog +* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-5 +- Kernel patches just for rawhide, so we don't need recompile kmods. +- Update strings. + +* Wed Jun 13 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-4 +- Upstreamed patches to fix compiles with 3.5 kernels, kindly alerted by virtualbox team. + +* Sat Jun 09 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-3 +- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd + unit files must put them into %{_unitdir}. +- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream. + * Wed May 23 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-2 - Obsolete also VirtualBox-OSE-kmodsrc.