summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
-rwxr-xr-xvboxreload2
-rw-r--r--virtualbox-host-dkms.conf4
4 files changed, 9 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 15a85220faf9..f9c4f5d19cb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = virtualbox-svn
- pkgver = 82099
+ pkgver = 82582
pkgrel = 1
url = http://virtualbox.org
arch = x86_64
@@ -62,12 +62,11 @@ pkgbase = virtualbox-svn
source = 008-no-vboxvideo.patch
source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
source = 013-Makefile.patch
- source = 014-iasl.patch
source = 101-vboxsf-automount.patch
source = mount.vboxsf
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec
+ sha256sums = 76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db
sha256sums = c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c
sha256sums = e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b
sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
@@ -78,13 +77,12 @@ pkgbase = virtualbox-svn
sha256sums = 94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21
sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce
sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
- sha256sums = 2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac
+ sha256sums = 4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d
sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
sha256sums = 13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab
sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc
sha256sums = 06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e
sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9
- sha256sums = 5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237
sha256sums = a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4
sha256sums = f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947
makedepends_x86_64 = gcc-multilib
diff --git a/PKGBUILD b/PKGBUILD
index ecfab576324a..de3aa6fafc68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('virtualbox-svn'
'virtualbox-guest-utils-svn'
'virtualbox-guest-utils-nox-svn'
'virtualbox-ext-vnc-svn')
-pkgver=82099
+pkgver=82582
pkgrel=1
_vboxsf_commit='87b9015c57dd7f226c768131bf8b4c0249de9835'
arch=('x86_64')
@@ -76,14 +76,13 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk"
'008-no-vboxvideo.patch'
'012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
'013-Makefile.patch'
- '014-iasl.patch'
# The following patch and mount.vboxsf wrapper should be removed
# once support for mainline-style options string gets upstreamed
'101-vboxsf-automount.patch'
'mount.vboxsf')
sha256sums=('SKIP'
'SKIP'
- 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
+ '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
@@ -94,13 +93,12 @@ sha256sums=('SKIP'
'94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
'01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
- '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
+ '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
'7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
'13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e'
'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
- '5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237'
'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
@@ -184,7 +182,7 @@ package_virtualbox-svn() {
# libraries
install -dm0755 "$pkgdir/usr/lib/virtualbox"
install -m0755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m0644 *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+ install -m0644 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
## setuid root binaries
install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
## other binaries
@@ -296,7 +294,7 @@ package_virtualbox-host-dkms-svn() {
# module loading
local _p="$pkgdir/usr/lib/modules-load.d/virtualbox-host-dkms.conf"
install -Dm0644 /dev/null "$_p"
- printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p"
+ printf "vboxdrv\nvboxnetadp\nvboxnetflt\n" > "$_p"
# starting vbox 5.1, dkms.conf file was dropped
local _p="$pkgdir/usr/src/vboxhost-svn_OSE/dkms.conf"
install -Dm0644 "$srcdir/virtualbox-host-dkms.conf" "$_p"
@@ -361,8 +359,6 @@ package_virtualbox-guest-utils-svn() {
install -m0644 -D "$srcdir"/VirtualBox/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
install -d "$pkgdir/usr/lib/xorg/modules/dri"
- #install -m0755 VBoxOGL*.so "$pkgdir/usr/lib"
- #ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
popd
# systemd stuff
diff --git a/vboxreload b/vboxreload
index 04b6e7b9e381..d21aa627fc4f 100755
--- a/vboxreload
+++ b/vboxreload
@@ -20,7 +20,7 @@
(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
-modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
+modules=(vboxnetadp vboxnetflt vboxdrv)
echo -n 'Unloading modules: '
for _m in "${modules[@]}"; do
diff --git a/virtualbox-host-dkms.conf b/virtualbox-host-dkms.conf
index a8b41bf40027..403bb39d088a 100644
--- a/virtualbox-host-dkms.conf
+++ b/virtualbox-host-dkms.conf
@@ -29,7 +29,3 @@ DEST_MODULE_LOCATION[1]="/kernel/misc"
BUILT_MODULE_NAME[2]="vboxnetadp"
BUILT_MODULE_LOCATION[2]="vboxnetadp"
DEST_MODULE_LOCATION[2]="/kernel/misc"
-
-BUILT_MODULE_NAME[3]="vboxpci"
-BUILT_MODULE_LOCATION[3]="vboxpci"
-DEST_MODULE_LOCATION[3]="/kernel/misc"