summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-19 00:30:43 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-19 00:30:43 -0300
commit5ec59a370a6d474da0fc96a57e4f569024c52629 (patch)
tree35ef1aaf3c40269ff05c679f82daba9fd5c501f6
parentad7eb2cbf9c3e45ff40748c8a1cfc820ce4372dc (diff)
downloadabslibre-5ec59a370a6d474da0fc96a57e4f569024c52629.tar.gz
abslibre-5ec59a370a6d474da0fc96a57e4f569024c52629.tar.bz2
abslibre-5ec59a370a6d474da0fc96a57e4f569024c52629.zip
virtualbox-libre-4.1.18-5.2: updating revision with changes in vboxdrv-reference.patch
-rw-r--r--libre/virtualbox-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch37
2 files changed, 31 insertions, 10 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index f2fa1adba..79c0d0b02 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-source'
'virtualbox-libre-parabola-source')
pkgver=4.1.18
-pkgrel=5.1
+pkgrel=5.2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -257,7 +257,7 @@ package_virtualbox-libre-parabola-source() {
md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'5f85710e0b8606de967716ded7b2d351'
- '2d599c6cf8bbbf183a7c07a9bcb926c7'
+ '7e14fbec3aa6904b1015ae82b5a7b097'
'a1ff1d1b4423556887e48a32978226a6'
'4ff559f2bea335d59c4012048983ca91'
'97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index c2c673386..6991a49d7 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,34 +1,55 @@
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 "
+
+ /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
+ QString g_QStrHintLinuxNoMemory = QApplication::tr(
+- "This error means that the kernel driver was either not able to "
++ "This error means that the kernel libre driver was either not able to "
+ "allocate enough memory or that some mapping operation failed."
+ );
+
+ QString g_QStrHintLinuxNoDriver = QApplication::tr(
+- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
++ "The VirtualBox Linux-libre 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/>"
+- "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."
++ "libre module by executing<br/><br/>"
+ " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
+ "as root. If you don't use our stock kernel, install virtualbox-libre-source and "
+ "execute dkms install vboxhost/4.1.18 ."
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
-
+- "The VirtualBox kernel modules do not match this version of "
++ "The VirtualBox kernel libre modules do not match this version of "
+ "VirtualBox. The installation of VirtualBox was apparently not "
+ "successful. Please try completely uninstalling and reinstalling "
+ "VirtualBox."
+ );
+
QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
- "The VirtualBox kernel modules do not match this version of "
+- "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."
++ "The VirtualBox kernel libre modules do not match this version of "
+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
+ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
);
-
+
QString g_QStrHintOtherNoDriver = QApplication::tr(
+- "Make sure the kernel module has been loaded successfully."
++ "Make sure the kernel libre module has been loaded successfully."
+ );
+
+ /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
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
@@ -37,7 +58,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
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-libre-modules or
++ load. Please reinstall the kernel libre module virtualbox-libre-modules or
+ if you don't use our stock kernel compile the modules with
- sudo /etc/init.d/vboxdrv setup