diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | 009-include-path.patch | 96 | ||||
| -rw-r--r-- | PKGBUILD | 22 |
3 files changed, 37 insertions, 109 deletions
@@ -1,6 +1,6 @@ pkgbase = virtualbox-bin pkgdesc = Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version) - pkgver = 6.0.4 + pkgver = 6.0.6 pkgrel = 1 url = https://www.virtualbox.org/ install = virtualbox-bin.install @@ -20,7 +20,7 @@ pkgbase = virtualbox-bin optdepends = virtualbox-ext-oracle: for Oracle extensions optdepends = linux-headers: build the module for Arch kernel optdepends = linux-lts-headers: build the module for LTS Arch kernel - provides = virtualbox=6.0.4 + provides = virtualbox=6.0.6 provides = virtualbox-sdk provides = VIRTUALBOX-HOST-MODULES provides = virtualbox-host-dkms @@ -31,16 +31,16 @@ pkgbase = virtualbox-bin conflicts = virtualbox-host-modules-arch replaces = virtualbox_bin replaces = virtualbox-sun - noextract = VirtualBoxSDK-6.0.4-128413.zip + noextract = VirtualBoxSDK-6.0.6-130049.zip options = !strip options = !emptydirs backup = etc/vbox/vbox.cfg backup = etc/conf.d/vboxweb - source = http://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4-128413-Linux_amd64.run - source = https://download.virtualbox.org/virtualbox/6.0.4/VirtualBoxSDK-6.0.4-128413.zip - source = VBoxAuth-r75085.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=75085 - source = VBoxAuthPAM-r75085.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=75085 - source = VBoxAuthSimple-r75085.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=75085 + source = http://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6-130049-Linux_amd64.run + source = https://download.virtualbox.org/virtualbox/6.0.6/VirtualBoxSDK-6.0.6-130049.zip + source = VBoxAuth-r78150.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=78150 + source = VBoxAuthPAM-r78150.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=78150 + source = VBoxAuthSimple-r78150.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=78150 source = VBoxFixUSB source = 10-vboxdrv.rules source = vboxweb.rc @@ -48,18 +48,18 @@ pkgbase = virtualbox-bin source = do_dkms source = dkms.conf source = 009-include-path.patch - sha256sums = a04454161150e2f387177b4a3b688292ea4a516c915d859782742e8137393ba5 - sha256sums = 618ee3fd3eb64b4dd6f11bd80f1116cad7a5f9308a65536ce257cd2dbbb68dd7 - sha256sums = 23e3e0e6abfaa69bf0aa046c0ee070d19435b97cb4bfbb16bba65a2783502154 - sha256sums = 815f6e2e3ab687356aad0e6f59eef6e266514fb12a6b569d239d834e0a480f37 - sha256sums = 99deff35d8a600f20223b96ba409451834e58ac21a589a989dd82a2d6fe006ae + sha256sums = 4e721f4a1c07bec4b81af0cfc6b15ba06b974e34909532b7a79de8c4b0b36719 + sha256sums = c418865976c518e2c60bc66f9b6479850b432f4e58ab4be4b36a41078efec845 + sha256sums = 584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e + sha256sums = 600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114 + sha256sums = 452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49 sha256sums = 0aebe22abab402ea6b6573af637a99d8056a904920a52d84fb97729219219c23 sha256sums = 69417a9e8855cab8e4878886abe138f559fd17ae487d4cd19c8a24974a8bbec2 sha256sums = 656905de981ffa24f6f921c920538854a235225053f44baedacc07b46ca0cf56 sha256sums = 12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651 sha256sums = cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a sha256sums = e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801 - sha256sums = 5112f0e1ba3bd0bd92ef2edb2d21024e265abb02841aa29aa05410526adc273f + sha256sums = f3aa4efcee92868867876728b6e3b0b828593e26e6eefc2dd4adb0d5e78e2776 pkgname = virtualbox-bin diff --git a/009-include-path.patch b/009-include-path.patch index 845ae9df92e4..1679d8fbc832 100644 --- a/009-include-path.patch +++ b/009-include-path.patch @@ -1,85 +1,13 @@ -diff --git a/src/VBox/HostDrivers/Support/vboxdrv/Makefile b/src/VBox/HostDrivers/Support/vboxdrv/Makefile -index d199047..34d895f 100644 ---- a/src/VBox/HostDrivers/Support/vboxdrv/Makefile -+++ b/src/VBox/HostDrivers/Support/vboxdrv/Makefile -@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE - MOD_OBJS += SUPDrvDTrace.o - endif +diff --git a/src/vboxhost/vboxnetadp/Makefile b/src/vboxhost/vboxnetadp/Makefile +index 623485e9..5068906f 100644 +--- a/src/vboxhost/vboxnetadp/Makefile ++++ b/src/vboxhost/vboxnetadp/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 --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux) - ifdef VBOX_WITH_NATIVE_DTRACE - MOD_INCL += -I/usr/include/linux -I/usr/include - endif -@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \ -+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \ - -fno-omit-frame-pointer -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/src/VBox/HostDrivers/Support/vboxnetadp/Makefile b/src/VBox/HostDrivers/Support/vboxnetadp/Makefile -index 694cb5c..8487820 100644 ---- a/src/VBox/HostDrivers/Support/vboxnetadp/Makefile -+++ b/src/VBox/HostDrivers/Support/vboxnetadp/Makefile -@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ - -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ - -Wno-declaration-after-statement -@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/src/VBox/HostDrivers/Support/vboxnetflt/Makefile b/src/VBox/HostDrivers/Support/vboxnetflt/Makefile -index e262c61..ca956d5 100644 ---- a/src/VBox/HostDrivers/Support/vboxnetflt/Makefile -+++ b/src/VBox/HostDrivers/Support/vboxnetflt/Makefile -@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ - -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ - -Wno-declaration-after-statement -@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer -diff --git a/src/VBox/HostDrivers/Support/vboxpci/Makefile b/src/VBox/HostDrivers/Support/vboxpci/Makefile -index 6b3878a..7b8a8a2 100644 ---- a/src/VBox/HostDrivers/Support/vboxpci/Makefile -+++ b/src/VBox/HostDrivers/Support/vboxpci/Makefile -@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ - math/gcc/umoddi3.o - endif - --MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) -+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux) - MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ - -DRT_WITH_VBOX -DVBOX_WITH_HARDENING - ifeq ($(BUILD_TARGET_ARCH),amd64) -@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE - endif - - # build defs --MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h -fno-pie - - include $(obj)/Makefile.include.footer @@ -5,9 +5,9 @@ # Contributor: M0Rf30 pkgname=virtualbox-bin -pkgver=6.0.4 -_build=128413 -_rev=75085 +pkgver=6.0.6 +_build=130049 +_rev=78150 pkgrel=1 pkgdesc='Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)' arch=('x86_64') @@ -39,18 +39,18 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver 'dkms.conf' '009-include-path.patch') noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip") -sha256sums=('a04454161150e2f387177b4a3b688292ea4a516c915d859782742e8137393ba5' - '618ee3fd3eb64b4dd6f11bd80f1116cad7a5f9308a65536ce257cd2dbbb68dd7' - '23e3e0e6abfaa69bf0aa046c0ee070d19435b97cb4bfbb16bba65a2783502154' - '815f6e2e3ab687356aad0e6f59eef6e266514fb12a6b569d239d834e0a480f37' - '99deff35d8a600f20223b96ba409451834e58ac21a589a989dd82a2d6fe006ae' +sha256sums=('4e721f4a1c07bec4b81af0cfc6b15ba06b974e34909532b7a79de8c4b0b36719' + 'c418865976c518e2c60bc66f9b6479850b432f4e58ab4be4b36a41078efec845' + '584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e' + '600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114' + '452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49' '0aebe22abab402ea6b6573af637a99d8056a904920a52d84fb97729219219c23' '69417a9e8855cab8e4878886abe138f559fd17ae487d4cd19c8a24974a8bbec2' '656905de981ffa24f6f921c920538854a235225053f44baedacc07b46ca0cf56' '12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651' 'cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a' 'e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801' - '5112f0e1ba3bd0bd92ef2edb2d21024e265abb02841aa29aa05410526adc273f') + 'f3aa4efcee92868867876728b6e3b0b828593e26e6eefc2dd4adb0d5e78e2776') prepare() { mkdir -p "${pkgname}-${pkgver}" @@ -77,8 +77,8 @@ package() { # apply patch 009-include-path (thanks to Christian Hesse) printf '%s\n' " -> Applying patch '009-includepath.patch'..." - cd "${pkgdir}/${_installdir}/src/vboxhost/" - patch -Np5 -i "${srcdir}/009-include-path.patch" + cd "${pkgdir}/${_installdir}" + patch -Np1 -i "${srcdir}/009-include-path.patch" # hardened build: mark binaries suid root, and make sure the # directory is only writable by the user |