Update to version 7.0.2

3 files changed, 34 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25083f373fcf..17233400a7d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = virtualbox-bin
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use (Oracle branded non-OSE)
-	pkgver = 6.1.40
+	pkgver = 7.0.2
 	pkgrel = 1
 	url = https://www.virtualbox.org/
 	arch = x86_64
 	license = GPL2
 	makedepends = python
-	noextract = VirtualBoxSDK-6.1.40-154048.zip
-	source = http://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40-154048-Linux_amd64.run
-	source = https://download.virtualbox.org/virtualbox/6.1.40/VirtualBoxSDK-6.1.40-154048.zip
+	noextract = VirtualBoxSDK-7.0.2-154219.zip
+	source = http://download.virtualbox.org/virtualbox/7.0.2/VirtualBox-7.0.2-154219-Linux_amd64.run
+	source = https://download.virtualbox.org/virtualbox/7.0.2/VirtualBoxSDK-7.0.2-154219.zip
 	source = VBoxAuth-r96547.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=96547
 	source = VBoxAuthPAM-r96547.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=96547
 	source = VBoxAuthSimple-r96547.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=96547
@@ -19,8 +19,8 @@ pkgbase = virtualbox-bin
 	source = virtualbox.sysusers
 	source = LICENSE.sdk
 	source = 013-Makefile.patch
-	sha256sums = 4a6b781563dd9db7bd0c8759867fce6a6ff801ccfd97fb2febb9b5fe333f788d
-	sha256sums = f0eb87d02ebbd39c95f3a572802d1e77a3e52a943a6f3d205d131a5bf75a31fb
+	sha256sums = 3ae19123af28e052cc0df926c7ff1fadd2f6618c8a2385d3814c79de07a6bd74
+	sha256sums = 86614406ac13e7ec22812721ac1ad54e2ee5a82d4ed715591a7c61881c9ea573
 	sha256sums = 1d1a828b8411d08dc886463628589716151a514639d606d99e3578e9894fd5bd
 	sha256sums = b762b1d19647bd0d116f62fc683f061b7a80667fc0377e0a6b00691797a5fa3c
 	sha256sums = 7c7e19388158418762529805c19fab80ba329eb287dadc152bb226dfedb9d7ed
@@ -30,7 +30,7 @@ pkgbase = virtualbox-bin
 	sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = 09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1
-	sha256sums = 3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635
+	sha256sums = a3ec0cab869e2d64914bffbf1c11a3c571808438656af654932f96e7a69114fd
 
 pkgname = virtualbox-bin
 	depends = device-mapper
@@ -47,7 +47,7 @@ pkgname = virtualbox-bin
 	optdepends = virtualbox-bin-guest-iso: for guest additions CD image
 	optdepends = virtualbox-bin-sdk: for the software developer kit
 	optdepends = virtualbox-ext-oracle: for Oracle extensions pack
-	provides = virtualbox=6.1.40
+	provides = virtualbox=7.0.2
 	provides = virtualbox-host-dkms
 	provides = VIRTUALBOX-HOST-MODULES
 	conflicts = virtualbox
diff --git a/013-Makefile.patch b/013-Makefile.patch
index 5cabc5cb0d5e..c7dc2b9fccb6 100644
--- a/013-Makefile.patch
+++ b/013-Makefile.patch
@@ -1,7 +1,7 @@
 --- a/src/vboxhost/Makefile
 +++ b/src/vboxhost/Makefile
-@@ -23,25 +23,25 @@
- # terms and conditions of either the GPL or the CDDL or both.
+@@ -33,25 +33,25 @@
+ # SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
  #
  
 -ifneq ($(KERNELRELEASE),)
@@ -13,18 +13,18 @@
 +# 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
+- 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
@@ -32,11 +32,12 @@
 -# convenience Makefile without KERNELRELEASE
 +# convenience Makefile without KBUILD_EXTMOD
  
- KBUILD_VERBOSE ?=
- KERN_VER ?= $(shell uname -r)
-@@ -167,4 +167,4 @@ load: unload
+ ifndef SUDO
+  ifneq ($(shell id -u),0)
+@@ -244,5 +244,5 @@ load: unload
  		fi; \
  	done
  
 -endif # ! KERNELRELEASE
 +endif # ! KBUILD_EXTMOD
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 2d7ed2e92bd4..776e2efcc975 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,9 @@
 
 pkgbase=virtualbox-bin
 pkgname=('virtualbox-bin' 'virtualbox-bin-guest-iso' 'virtualbox-bin-sdk')
-pkgver=6.1.40
-_build=154048
+pkgver=7.0.2
+_build=154219
 _rev=96547
-_rdeskver=1.8.4
 pkgrel=1
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use (Oracle branded non-OSE)'
 arch=('x86_64')
@@ -29,8 +28,8 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver
         'LICENSE.sdk'
         '013-Makefile.patch')
 noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip")
-sha256sums=('4a6b781563dd9db7bd0c8759867fce6a6ff801ccfd97fb2febb9b5fe333f788d'
-            'f0eb87d02ebbd39c95f3a572802d1e77a3e52a943a6f3d205d131a5bf75a31fb'
+sha256sums=('3ae19123af28e052cc0df926c7ff1fadd2f6618c8a2385d3814c79de07a6bd74'
+            '86614406ac13e7ec22812721ac1ad54e2ee5a82d4ed715591a7c61881c9ea573'
             '1d1a828b8411d08dc886463628589716151a514639d606d99e3578e9894fd5bd'
             'b762b1d19647bd0d116f62fc683f061b7a80667fc0377e0a6b00691797a5fa3c'
             '7c7e19388158418762529805c19fab80ba329eb287dadc152bb226dfedb9d7ed'
@@ -40,7 +39,7 @@ sha256sums=('4a6b781563dd9db7bd0c8759867fce6a6ff801ccfd97fb2febb9b5fe333f788d'
             'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
             '09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1'
-            '3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635')
+            'a3ec0cab869e2d64914bffbf1c11a3c571808438656af654932f96e7a69114fd')
 
 prepare() {
     local _extractdir="${pkgname}-${pkgver}/VirtualBox-extracted"
@@ -50,7 +49,6 @@ prepare() {
     sh "VirtualBox-${pkgver}-${_build}-Linux_amd64.run" --noexec --nox11 --target "${pkgname}-${pkgver}"
     bsdtar -xf "${pkgname}-${pkgver}/VirtualBox.tar.bz2" -C "$_extractdir"
     bsdtar -xf "VirtualBoxSDK-${pkgver}-${_build}.zip" -C "${pkgname}-${pkgver}"
-    bsdtar -xf "${_extractdir}/rdesktop-vrdp.tar.gz" -C "${pkgname}-${pkgver}" --include='*.1'
     
     # dkms configuration
     install -D -m644 dkms.conf -t "${_extractdir}/src/vboxhost"
@@ -84,11 +82,11 @@ package_virtualbox-bin() {
     cp -Pr --no-preserve='ownership' "${pkgname}-${pkgver}/VirtualBox-extracted" "${pkgdir}/${_installdir}"
     
     # mark binaries suid root, and make sure the directory is only writable by the user
-    chmod 4755 "${pkgdir}/${_installdir}"/{VirtualBoxVM,VBox{Headless,Net{AdpCtl,DHCP,NAT},SDL,VolInfo}}
+    chmod 4755 "${pkgdir}/${_installdir}"/{VirtualBoxVM,VBox{Headless,Net{AdpCtl,DHCP,NAT},VolInfo}}
     chmod go-w "${pkgdir}/${_installdir}"
     
-    # remove guest iso, rdesktop-vrdp packed sources and bundled sdk files
-    rm -r "${pkgdir}/${_installdir}"/{additions/VBoxGuestAdditions.iso,rdesktop-vrdp.tar.gz,sdk}
+    # remove guest iso and bundled sdk files
+    rm -r "${pkgdir}/${_installdir}"/{additions/VBoxGuestAdditions.iso,sdk}
     
     # module sources
     install -d -m755 "${pkgdir}/usr/src"
@@ -116,10 +114,6 @@ package_virtualbox-bin() {
     install -D -m644 vboxweb.service -t "${pkgdir}/usr/lib/systemd/system"
     install -D -m644 virtualbox.sysusers "${pkgdir}/usr/lib/sysusers.d/virtualbox.conf"
     
-    # man page for rdesktop-vrdp
-    install -D -m644 "${pkgname}-${pkgver}/rdesktop-${_rdeskver}-vrdp/doc/rdesktop.1" \
-        "${pkgdir}/usr/share/man/man1/rdesktop-vrdp.1"
-    
     # symlinks
     local _dir
     local _file