[arch-commits] Commit in virtualbox/trunk (3 files)
Sébastien Luttringer
seblu at archlinux.org
Wed Oct 7 23:47:29 UTC 2015
Date: Thursday, October 8, 2015 @ 01:47:29
Author: seblu
Revision: 143321
upgpkg: virtualbox 5.0.6-1
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/001-vboxdrv-reference.patch
virtualbox/trunk/011-fix-i686-build.patch
-----------------------------+
001-vboxdrv-reference.patch | 57 ------------------------------------------
011-fix-i686-build.patch | 28 --------------------
PKGBUILD | 13 +++------
3 files changed, 5 insertions(+), 93 deletions(-)
Deleted: 001-vboxdrv-reference.patch
===================================================================
--- 001-vboxdrv-reference.patch 2015-10-07 22:50:31 UTC (rev 143320)
+++ 001-vboxdrv-reference.patch 2015-10-07 23:47:29 UTC (rev 143321)
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
- "module by executing<br/><br/>"
-- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-- "as root. If it is available in your distribution, you should install the "
-- "DKMS package first. This package keeps track of Linux kernel changes and "
-- "recompiles the vboxdrv kernel module if necessary."
-+ " <font color=blue>'pacman -S virtualbox-host-modules'</font><br/><br/>"
-+ "as root. If you don't use our stock kernel, install virtualbox-host-dkms and "
-+ "execute dkms autoinstall ."
- );
-
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
-
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
- "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/>"
-- "may correct this. Make sure that you do not mix the "
-- "OSE version and the PUEL version of VirtualBox."
-+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+ " <font color=blue>'dkms autoinstall'</font><br/><br/>"
- );
-
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
- 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
-- load. Please recompile the kernel module and install it by
-+ load. Please reinstall the kernel module virtualbox-host-modules or
-+ if you don't use our stock kernel compile the modules with
-
-- sudo /etc/init.d/vboxdrv setup
-+ sudo dkms autoinstall
-
- You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
- cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
-
-- sudo /etc/init.d/vboxdrv restart
-+ sudo modprobe vboxdrv
-
- and if that is not successful, try to re-install the package.
-
Deleted: 011-fix-i686-build.patch
===================================================================
--- 011-fix-i686-build.patch 2015-10-07 22:50:31 UTC (rev 143320)
+++ 011-fix-i686-build.patch 2015-10-07 23:47:29 UTC (rev 143321)
@@ -1,28 +0,0 @@
-Index: src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-===================================================================
---- a/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp (revision 57689)
-+++ b/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp (revision 57690)
-@@ -842,7 +842,7 @@
- * @param enmPhase
- * @param pfnLog
- */
--static void vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
-+static DECLCALLBACK(void) vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
- {
- /* Some introductory information. */
- static RTTIMESPEC s_TimeSpec;
-Index: src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-===================================================================
---- a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp (revision 57657)
-+++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp (revision 57658)
-@@ -103,8 +103,8 @@
- unsigned char *mScreenBuffer;
- unsigned char *mFrameBuffer;
- uint32_t uClients;
-- static DECLCALLBACK(enum rfbNewClientAction) rfbNewClientEvent(rfbClientPtr cl);
-- static DECLCALLBACK(void) vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
-+ static enum rfbNewClientAction rfbNewClientEvent(rfbClientPtr cl);
-+ static void vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
- static void vncKeyboardEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
- static void clientGoneHook(rfbClientPtr cl);
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-07 22:50:31 UTC (rev 143320)
+++ PKGBUILD 2015-10-07 23:47:29 UTC (rev 143321)
@@ -10,7 +10,7 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.0.4
+pkgver=5.0.6
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
@@ -59,7 +59,6 @@
'vboxservice-nox.service'
'vboxweb.service'
'vboxreload'
- '001-vboxdrv-reference.patch'
'002-dri-driver-path.patch'
'003-ogl-include-path.patch'
'005-gsoap-build.patch'
@@ -66,9 +65,8 @@
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
'010-no-update.patch'
- '011-fix-i686-build.patch'
)
-md5sums=('499abc66de7bb74a9117bda75e43ec4d'
+md5sums=('30163e68a0d89e9f4590aeb61cd237e5'
'984412a63aa9c07ddc3cfd970381d5df'
'4833c8e0524fd2272b24ba0d94aef006'
'6e2722bfd7013c1b0174382626ac1b8d'
@@ -78,14 +76,12 @@
'fcf6bcef98b16849d5c9f048592739c0'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'44a8e105517a1e04769b50469a87bdcb'
- '5ebaaf351419a58db6fdddbc19c58c5e'
'9be7e2703afeee1fca9368bd8750e710'
'9e49bbaa2192b141c27ee43cef8cbab7'
'ecfd13297d7753ebe7b8763ca5b792d9'
'd82a6f19be739341ed7f1cf4ee8070ca'
'188ea65918309f737ce28216c2b07c3b'
- 'dfa08dc682c7668c8a6f0ffc3f44fece'
- '64c32077b669f81012fbe4e395b52c57')
+ 'dfa08dc682c7668c8a6f0ffc3f44fece')
prepare() {
cd "VirtualBox-$pkgver"
@@ -222,8 +218,9 @@
install -Dm644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
install -Dm644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
- # install module reloading shortcut
+ # install module reloading shortcut (with a symlink with default helper)
install -Dm755 vboxreload "$pkgdir/usr/bin"
+ ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
}
package_virtualbox-sdk() {
More information about the arch-commits
mailing list