6.1.0-1: Bumped version

8 files changed, 67 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aff50578ecf2..75b4841709e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-headless
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).
-	pkgver = 6.0.6
+	pkgver = 6.1.0
 	pkgrel = 1
 	url = https://virtualbox.org
 	install = virtualbox.install
@@ -17,6 +17,7 @@ pkgbase = virtualbox-headless
 	makedepends = libvncserver
 	makedepends = gsoap
 	makedepends = glu
+	makedepends = lib32-gcc-libs
 	depends = curl
 	depends = libxml2
 	depends = libvpx
@@ -27,13 +28,13 @@ pkgbase = virtualbox-headless
 	optdepends = virtualbox-guest-iso: Guest Additions CD image
 	optdepends = virtualbox-ext-vnc: VNC server support
 	optdepends = virtualbox-sdk: Developer kit
-	provides = virtualbox=6.0.6
+	provides = virtualbox=6.1.0
 	conflicts = virtualbox-ose
 	conflicts = virtualbox
 	replaces = virtualbox-ose
 	replaces = virtualbox
 	backup = etc/vbox/vbox.cfg
-	source = https://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6.tar.bz2
+	source = https://download.virtualbox.org/virtualbox/6.1.0/VirtualBox-6.1.0.tar.bz2
 	source = virtualbox.sysusers
 	source = 60-vboxdrv.rules
 	source = 60-vboxguest.rules
@@ -42,13 +43,11 @@ pkgbase = virtualbox-headless
 	source = vboxservice-nox.service
 	source = vboxweb.service
 	source = vboxreload
-	source = 002-dri-driver-path.patch
 	source = 005-gsoap-build.patch
 	source = 008-no-vboxvideo.patch
-	source = 009-include-path.patch
-	source = 011-python-3-7.patch
 	source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
-	sha256sums = 3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552
+	source = 013-Makefile.patch
+	sha256sums = 49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e
 	sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95
@@ -56,14 +55,11 @@ pkgbase = virtualbox-headless
 	sha256sums = 94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21
 	sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce
 	sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
-	sha256sums = 2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac
-	sha256sums = f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0
+	sha256sums = 4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d
 	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
-	sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc
-	sha256sums = 7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70
-	sha256sums = 55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d
+	sha256sums = 053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
-	makedepends_x86_64 = gcc-multilib
+	sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9
 
 pkgname = virtualbox-headless
 
diff --git a/002-dri-driver-path.patch b/002-dri-driver-path.patch
deleted file mode 100644
index 26b7f3f65f44..000000000000
--- a/002-dri-driver-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-index 92b4ffc..1a1c467 100644
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-@@ -56,24 +56,8 @@ typedef enum {
- 
- //#define DEBUG_DRI_CALLS
- 
--/// @todo this could be different...
--#ifdef RT_ARCH_AMD64
--# ifdef RT_OS_FREEBSD
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--#  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#else
--# ifdef RT_OS_FREEBSD
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-+#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- #  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/008-no-vboxvideo.patch b/008-no-vboxvideo.patch
index 60b721a8c281..c427c2fa3d30 100644
--- a/008-no-vboxvideo.patch
+++ b/008-no-vboxvideo.patch
@@ -1,5 +1,5 @@
 Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-10-11 02:49:23.184986182 +0100
+--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:23.184986182 +0100
 +++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
 @@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
  
diff --git a/009-include-path.patch b/009-include-path.patch
deleted file mode 100644
index 985a30cd04c6..000000000000
--- a/009-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-index 623485e9..5068906f 100644
---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-@@ -58,7 +58,7 @@ VBOXMOD_DEFS = \
- 	RT_WITH_VBOX \
- 	VBOX_WITH_HARDENING \
- 	VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
--VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
- 
- include $(obj)/Makefile-footer.gmk
- 
diff --git a/011-python-3-7.patch b/011-python-3-7.patch
deleted file mode 100644
index 0eebf0039b43..000000000000
--- a/011-python-3-7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 128da55c..c4bb08c4 100755
---- a/configure
-+++ b/configure
-@@ -1969,7 +1969,7 @@ extern "C" int main(void)
- }
- EOF
-   found=
--  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
-+  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
-   for p in $PYTHONDIR; do
-     for d in $SUPPYTHONLIBS; do
-       for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/013-Makefile.patch b/013-Makefile.patch
new file mode 100644
index 000000000000..30b44c7259fd
--- /dev/null
+++ b/013-Makefile.patch
@@ -0,0 +1,44 @@
+diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
+index 18466b48..7c7de4e5 100644
+--- a/src/VBox/HostDrivers/linux/Makefile
++++ b/src/VBox/HostDrivers/linux/Makefile
+@@ -23,25 +23,25 @@
+ # terms and conditions of either the GPL or the CDDL or both.
+ #
+ 
+-ifneq ($(KERNELRELEASE),)
++ifneq ($(KBUILD_EXTMOD),)
+ 
+-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
+-# or inside a kernel source tree.
++# Building from kBuild (make -C <kernel_directory> M=`pwd`).
++# KBUILD_EXTMOD is set to $(M) in this case.
+ 
+ obj-m = vboxdrv/
+-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
+  obj-m += vboxnetflt/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
+  obj-m += vboxnetadp/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+  obj-m += vboxpci/
+ endif
+ 
+-else # ! KERNELRELEASE
++else # ! KBUILD_EXTMOD
+ 
+-# convenience Makefile without KERNELRELEASE
++# convenience Makefile without KBUILD_EXTMOD
+ 
+ KBUILD_VERBOSE ?=
+ KERN_VER ?= $(shell uname -r)
+@@ -146,4 +146,4 @@ load: unload
+ 		fi; \
+ 	done
+ 
+-endif # ! KERNELRELEASE
++endif # ! KBUILD_EXTMOD
diff --git a/PKGBUILD b/PKGBUILD
index 5f52a16eb0ce..2b84bebdc045 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=virtualbox-headless
-pkgver=6.0.6
+pkgver=6.1.0
 _tarver=${pkgver}
 pkgrel=1
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).'
@@ -11,8 +11,9 @@ arch=('i686' 'x86_64')
 url='https://virtualbox.org'
 license=('GPL' 'custom')
 depends=('curl' 'libxml2' 'libvpx' 'libpng' 'python' 'opus')
-makedepends=('iasl' 'libxslt' 'cdrkit' 'libidl2' 'libpulse' 'device-mapper' 'libvncserver' 'gsoap' 'glu')
-makedepends_x86_64=('gcc-multilib')
+makedepends=(
+    'iasl' 'libxslt' 'cdrkit' 'libidl2' 'libpulse' 'device-mapper' 'libvncserver' 'gsoap' 'glu' 'lib32-gcc-libs'
+)
 optdepends=('vde2: Virtual Distributed Ethernet support'
             'virtualbox-guest-iso: Guest Additions CD image'
             'virtualbox-ext-vnc: VNC server support'
@@ -31,15 +32,13 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv
         'vboxservice-nox.service'
         'vboxweb.service'
         'vboxreload'
-        '002-dri-driver-path.patch'
         '005-gsoap-build.patch'
         '008-no-vboxvideo.patch'
-        '009-include-path.patch'
-        '011-python-3-7.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
+        '013-Makefile.patch'
         )
 sha256sums=(
-    '3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552'
+    '49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039'
     '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
     '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
     '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
@@ -47,13 +46,11 @@ sha256sums=(
     '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
     '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
     'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
-    '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
-    'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
+    '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
     '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
-    '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
-    '7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70'
-    '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
+    '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
     '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
+    'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
 )
 
 prepare() {
@@ -87,6 +84,7 @@ build() {
         --enable-vnc \
         --disable-java \
         --disable-kmods \
+        --disable-alsa \
         --with-makeself=/usr/bin/echo
     # fake makeself binary to compile without nofatal
     # makeself is used by linux installer. we don't need it.
@@ -116,7 +114,7 @@ package() {
     # libraries
     install -dm0755 "$pkgdir/usr/lib/virtualbox"
     install -m0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m0644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+    install -m0644 *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
     ## setuid root binaries
     install -m4755 VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
     ## other binaries
@@ -124,6 +122,7 @@ package() {
 
     # components
     install -dm0755 "$pkgdir/usr/lib/virtualbox/components"
+    rm components/VBoxREM.so # TODO: remove when dead link is fixed
     install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
 
     # extensions packs
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