diff options
author | KenjiTakahashi | 2020-09-13 09:55:41 +0200 |
---|---|---|
committer | KenjiTakahashi | 2020-09-13 09:55:41 +0200 |
commit | 12e944f7741f548953de061b89536c49f7e40280 (patch) | |
tree | 95947e28fc76aa6719e747b71c8178817ae9e5f9 | |
parent | f733b24f64ad122a5dc26a93b68fee36a385b6c1 (diff) | |
download | aur-12e944f7741f548953de061b89536c49f7e40280.tar.gz |
6.1.14-1: Bumped version
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 018-work-around-black-screen.patch | 20 | ||||
-rw-r--r-- | 018-xclient.patch | 24 | ||||
-rw-r--r-- | 020-gsoap.patch | 13 | ||||
-rw-r--r-- | LocalConfig.kmk | 3 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | vboxservice.service | 12 |
7 files changed, 57 insertions, 49 deletions
@@ -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.1.8 + pkgver = 6.1.14 pkgrel = 1 url = https://virtualbox.org install = virtualbox.install @@ -28,18 +28,17 @@ 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.1.8 + provides = virtualbox=6.1.14 conflicts = virtualbox-ose conflicts = virtualbox replaces = virtualbox-ose replaces = virtualbox backup = etc/vbox/vbox.cfg - source = https://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8.tar.bz2 + source = https://download.virtualbox.org/virtualbox/6.1.14/VirtualBox-6.1.14a.tar.bz2 source = virtualbox.sysusers source = 60-vboxdrv.rules source = 60-vboxguest.rules source = LocalConfig.kmk - source = vboxservice.service source = vboxservice-nox.service source = vboxweb.service source = vboxreload @@ -49,13 +48,13 @@ pkgbase = virtualbox-headless source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch source = 013-Makefile.patch source = 017-fix-narrowing-conversion.patch - source = 018-work-around-black-screen.patch - sha256sums = 426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc + source = 018-xclient.patch + source = 020-gsoap.patch + sha256sums = 16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95 - sha256sums = 79c0035be857726344f648aea6cf2be9326caf398d83fead569d7e5836f39990 - sha256sums = 94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21 + sha256sums = 432c3101023e482e1c8e4af3188370425597efd854a7693fe2f97012a402a30a sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f sha256sums = 4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d @@ -65,7 +64,8 @@ pkgbase = virtualbox-headless sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024 sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9 sha256sums = 5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99 - sha256sums = 116f90f2d87a0a5d49e84b734dd6407667faf9e44f5078085bba591dd357745f + sha256sums = cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3 + sha256sums = c6892a3561a72a9b308cb33fa6647cc53e54a3bd40cb41780cad7f8e9d7df9f6 pkgname = virtualbox-headless diff --git a/018-work-around-black-screen.patch b/018-work-around-black-screen.patch deleted file mode 100644 index 41777f4c15a1..000000000000 --- a/018-work-around-black-screen.patch +++ /dev/null @@ -1,20 +0,0 @@ -From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Mon, 18 May 2020 08:21:06 +0200 -Subject: [PATCH 1/1] work around black screen - -Signed-off-by: Christian Hesse <mail@eworm.de> ---- - src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -index e7d4e292..7a17a692 100755 ---- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then - /usr/bin/VBoxClient --checkhostversion - /usr/bin/VBoxClient --seamless - /usr/bin/VBoxClient --draganddrop -- /usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled - fi diff --git a/018-xclient.patch b/018-xclient.patch new file mode 100644 index 000000000000..411c85d1b9ef --- /dev/null +++ b/018-xclient.patch @@ -0,0 +1,24 @@ +--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient +@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do + test -w $i || rm -f $i + done + +-if ! test -c /dev/vboxguest 2>/dev/null; then +- # Do not start if the kernel module is not present. +- # Execute notify-send in the back-ground to avoid racing with sddm, +- # as notify-send may wait for sddm to start while it waits for us to exit. +- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." & +-elif test -z "${SSH_CONNECTION}"; then +- # This script can also be triggered by a connection over SSH, which is not +- # what we had in mind, so we do not start VBoxClient in that case. We do +- # not use "exit" here as this script is "source"d, not executed. ++# Do not start if the kernel module is not present; or if this script is ++# triggered by a connection over SSH. ++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then + /usr/bin/VBoxClient --clipboard + /usr/bin/VBoxClient --checkhostversion + /usr/bin/VBoxClient --seamless + /usr/bin/VBoxClient --draganddrop +- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled + fi diff --git a/020-gsoap.patch b/020-gsoap.patch new file mode 100644 index 000000000000..9a1aa3af7cbf --- /dev/null +++ b/020-gsoap.patch @@ -0,0 +1,13 @@ +diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp +index 8dd3ca1b..9d5c9138 100644 +--- a/src/VBox/Main/webservice/vboxweb.cpp ++++ b/src/VBox/Main/webservice/vboxweb.cpp +@@ -944,7 +944,7 @@ static void doQueuesLoop() + if (rv == 0) + continue; // timeout, not necessary to bother gsoap + // r < 0, errno +- if (soap_socket_errno(soap.master) == SOAP_EINTR) ++ if (soap_socket_errno == SOAP_EINTR) + rv = 0; // re-check if we should terminate + break; + } diff --git a/LocalConfig.kmk b/LocalConfig.kmk index b42d76e414dd..c57f4f9aa645 100644 --- a/LocalConfig.kmk +++ b/LocalConfig.kmk @@ -33,3 +33,6 @@ VBOX_GUI_WITH_SHARED_LIBRARY = 1 # do not build additions VBOX_WITH_ADDITIONS := + +# disable experimental cloud infrastructure integration +VBOX_WITH_CLOUD_NET := @@ -3,8 +3,8 @@ # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=virtualbox-headless -pkgver=6.1.8 -_tarver=${pkgver} +pkgver=6.1.14 +_tarver=${pkgver}a pkgrel=1 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).' arch=('i686' 'x86_64') @@ -28,7 +28,6 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv '60-vboxdrv.rules' '60-vboxguest.rules' 'LocalConfig.kmk' - 'vboxservice.service' 'vboxservice-nox.service' 'vboxweb.service' 'vboxreload' @@ -38,15 +37,15 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' '013-Makefile.patch' '017-fix-narrowing-conversion.patch' - '018-work-around-black-screen.patch' + '018-xclient.patch' + '020-gsoap.patch' ) sha256sums=( - '426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc' + '16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e' '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95' - '79c0035be857726344f648aea6cf2be9326caf398d83fead569d7e5836f39990' - '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21' + '432c3101023e482e1c8e4af3188370425597efd854a7693fe2f97012a402a30a' '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' @@ -56,7 +55,8 @@ sha256sums=( '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99' - '116f90f2d87a0a5d49e84b734dd6407667faf9e44f5078085bba591dd357745f' + 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3' + 'c6892a3561a72a9b308cb33fa6647cc53e54a3bd40cb41780cad7f8e9d7df9f6' ) prepare() { diff --git a/vboxservice.service b/vboxservice.service deleted file mode 100644 index 7e0c87f0b5fa..000000000000 --- a/vboxservice.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle - -[Service] -ExecStartPre=-/usr/bin/modprobe vboxguest -ExecStartPre=-/usr/bin/modprobe vboxvideo -ExecStartPre=-/usr/bin/modprobe vboxsf -ExecStart=/usr/bin/VBoxService -f - -[Install] -WantedBy=multi-user.target |