diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 90 |
2 files changed, 51 insertions, 56 deletions
@@ -1,10 +1,9 @@ pkgbase = virtualbox-bin pkgdesc = Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version) - pkgver = 5.2.22 + pkgver = 6.0.0 pkgrel = 1 url = https://www.virtualbox.org/ install = virtualbox-bin.install - arch = i686 arch = x86_64 license = GPL2 makedepends = linux-headers @@ -21,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=5.2.22 + provides = virtualbox=6.0.0 provides = virtualbox-sdk provides = VIRTUALBOX-HOST-MODULES provides = virtualbox-host-dkms @@ -32,12 +31,13 @@ pkgbase = virtualbox-bin conflicts = virtualbox-host-modules-arch replaces = virtualbox_bin replaces = virtualbox-sun - noextract = VirtualBoxSDK-5.2.22-126460.zip + noextract = VirtualBoxSDK-6.0.0-127566.zip options = !strip options = !emptydirs backup = etc/vbox/vbox.cfg backup = etc/conf.d/vboxweb - source = https://download.virtualbox.org/virtualbox/5.2.22/VirtualBoxSDK-5.2.22-126460.zip + source = http://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0-127566-Linux_amd64.run + source = https://download.virtualbox.org/virtualbox/6.0.0/VirtualBoxSDK-6.0.0-127566.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 @@ -48,7 +48,8 @@ pkgbase = virtualbox-bin source = do_dkms source = dkms.conf source = 009-include-path.patch - sha256sums = b15fc5330d435834c1a683c63b4117feb7cb96a02a30a0c034b8c4c746c93259 + sha256sums = b81461f3662af4e94992d224cdcf4aedb161a9d84458689c06d1fe6fc28686c9 + sha256sums = b12fec50d87dcdcef1be9cb4e0f0de55ceeea3a5580fb5fe78d9e29f6898c8c5 sha256sums = 23e3e0e6abfaa69bf0aa046c0ee070d19435b97cb4bfbb16bba65a2783502154 sha256sums = 815f6e2e3ab687356aad0e6f59eef6e266514fb12a6b569d239d834e0a480f37 sha256sums = 99deff35d8a600f20223b96ba409451834e58ac21a589a989dd82a2d6fe006ae @@ -59,10 +60,6 @@ pkgbase = virtualbox-bin sha256sums = cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a sha256sums = e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801 sha256sums = 5112f0e1ba3bd0bd92ef2edb2d21024e265abb02841aa29aa05410526adc273f - source_i686 = http://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22-126460-Linux_x86.run - sha256sums_i686 = df4b30195b2fb25c30085349e8abf5bd8c286973bed933075b7963c52e2e767e - source_x86_64 = http://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22-126460-Linux_amd64.run - sha256sums_x86_64 = e48984cf0cc0dc0dd7035519fe747b77544e3fb6ac17cecbf934c7eef7224088 pkgname = virtualbox-bin @@ -5,12 +5,12 @@ # Contributor: M0Rf30 pkgname=virtualbox-bin -pkgver=5.2.22 -_build=126460 +pkgver=6.0.0 +_build=127566 _rev=75085 pkgrel=1 pkgdesc='Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)' -arch=('i686' 'x86_64') +arch=('x86_64') url='https://www.virtualbox.org/' license=('GPL2') depends=('dkms' 'fontconfig' 'gcc' 'libgl' 'libidl2' 'libxcursor' 'libxinerama' @@ -26,7 +26,8 @@ replaces=('virtualbox_bin' 'virtualbox-sun') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') options=('!strip' '!emptydirs') install="${pkgname}.install" -source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBoxSDK-${pkgver}-${_build}.zip" +source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_amd64.run" + "https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBoxSDK-${pkgver}-${_build}.zip" "VBoxAuth-r${_rev}.h"::"https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=${_rev}" "VBoxAuthPAM-r${_rev}.c"::"https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=${_rev}" "VBoxAuthSimple-r${_rev}.cpp"::"https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=${_rev}" @@ -37,10 +38,9 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBoxSDK-${pk 'do_dkms' 'dkms.conf' '009-include-path.patch') -source_i686=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_x86.run") -source_x86_64=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_amd64.run") noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip") -sha256sums=('b15fc5330d435834c1a683c63b4117feb7cb96a02a30a0c034b8c4c746c93259' +sha256sums=('b81461f3662af4e94992d224cdcf4aedb161a9d84458689c06d1fe6fc28686c9' + 'b12fec50d87dcdcef1be9cb4e0f0de55ceeea3a5580fb5fe78d9e29f6898c8c5' '23e3e0e6abfaa69bf0aa046c0ee070d19435b97cb4bfbb16bba65a2783502154' '815f6e2e3ab687356aad0e6f59eef6e266514fb12a6b569d239d834e0a480f37' '99deff35d8a600f20223b96ba409451834e58ac21a589a989dd82a2d6fe006ae' @@ -51,17 +51,12 @@ sha256sums=('b15fc5330d435834c1a683c63b4117feb7cb96a02a30a0c034b8c4c746c93259' 'cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a' 'e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801' '5112f0e1ba3bd0bd92ef2edb2d21024e265abb02841aa29aa05410526adc273f') -sha256sums_i686=('df4b30195b2fb25c30085349e8abf5bd8c286973bed933075b7963c52e2e767e') -sha256sums_x86_64=('e48984cf0cc0dc0dd7035519fe747b77544e3fb6ac17cecbf934c7eef7224088') prepare() { - [ "$CARCH" = 'i686' ] && local _arch='x86' - [ "$CARCH" = 'x86_64' ] && local _arch='amd64' - mkdir -p "${pkgname}-${pkgver}" # extract the main source file - yes | sh "VirtualBox-${pkgver}-${_build}-Linux_${_arch}.run" \ + yes | sh "VirtualBox-${pkgver}-${_build}-Linux_amd64.run" \ --target "${srcdir}/${pkgname}-${pkgver}" \ --nox11 \ --noexec \ @@ -73,7 +68,7 @@ prepare() { } package() { - local _installdir='/opt/VirtualBox' + local _installdir='opt/VirtualBox' # install bundled files printf '%s\n' ' -> Installing bundled files...' @@ -85,22 +80,18 @@ package() { cd "${pkgdir}/${_installdir}/src/vboxhost/" patch -Np5 -i "${srcdir}/009-include-path.patch" - # hardened build: mark binaries suid root, create symlinks for working around - # unsupported $ORIGIN/.. in VBoxC.so and make sure the - # directory is only writable by the user (paranoid) + # hardened build: mark binaries suid root, and make sure the + # directory is only writable by the user + printf '%s\n' ' -> Fixing permissions...' cd "${pkgdir}/${_installdir}" - chmod 4511 VirtualBox VBox{SDL,Headless,NetDHCP,NetNAT,NetAdpCtl,VolInfo} - for _lib in VBox{VMM,RT}.so - do - ln -s "${_installdir}/${_lib}" "components/${_lib}" - done + chmod 4755 VirtualBoxVM VBox{Headless,Net{AdpCtl,DHCP,NAT},SDL,VolInfo} chmod go-w "${pkgdir}/${_installdir}" # install SDK printf '%s\n' ' -> Installing SDK...' cd "${srcdir}/${pkgname}-${pkgver}" pushd 'sdk/installer' >/dev/null - VBOX_INSTALL_PATH="$_installdir" python vboxapisetup.py install --root "$pkgdir" + VBOX_INSTALL_PATH="/${_installdir}" python vboxapisetup.py install --root "$pkgdir" popd >/dev/null rm -r "${pkgdir}/${_installdir}/sdk" mkdir -p "${pkgdir}/${_installdir}/sdk" @@ -130,29 +121,38 @@ package() { printf '%s\n' ' -> Creating needed symlinks...' - # symlink the launchers (second link can fail if fs is not case sensitive) + # symlinks for working around unsupported $ORIGIN/.. in VBoxC.so + local _lib + for _lib in VBox{RT,XPCOM}.so + do + ln -s "../${_lib}" "components/${_lib}" + done + + # symlink the launchers + local _bin install -d -m0755 "${pkgdir}/usr/bin" for _bin in VirtualBox VBox{Headless,Manage,SDL,SVC,Tunctl,NetAdpCtl,FixUSB} rdesktop-vrdp do - ln -s "${_installdir}/${_bin}" "${pkgdir}/usr/bin/${_bin}" - ln -s "${_installdir}/${_bin}" "${pkgdir}/usr/bin/${_bin,,}" &>/dev/null || : + ln -s "../../${_installdir}/${_bin}" "${pkgdir}/usr/bin/${_bin}" done # symlink the desktop icon and .desktop files install -d -m0755 "${pkgdir}/usr/"{share/applications,share/pixmaps} - ln -s "${_installdir}/VBox.png" "${pkgdir}/usr/share/pixmaps/VBox.png" - ln -s "${_installdir}/icons/128x128/virtualbox.png" "${pkgdir}/usr/share/pixmaps/virtualbox.png" - ln -s "${_installdir}/virtualbox.desktop" "${pkgdir}/usr/share/applications/virtualbox.desktop" + ln -s "../../../${_installdir}/VBox.png" "${pkgdir}/usr/share/pixmaps/VBox.png" + ln -s "../../../${_installdir}/icons/128x128/virtualbox.png" "${pkgdir}/usr/share/pixmaps/virtualbox.png" + ln -s "../../../${_installdir}/virtualbox.desktop" "${pkgdir}/usr/share/applications/virtualbox.desktop" # symlink mime info install -d -m0755 "${pkgdir}/usr/share/mime/packages" - ln -s "${_installdir}/virtualbox.xml" "${pkgdir}/usr/share/mime/packages/virtualbox.xml" + ln -s "../../../../${_installdir}/virtualbox.xml" "${pkgdir}/usr/share/mime/packages/virtualbox.xml" # symlink doc install -d -m0755 "${pkgdir}/usr/share/doc/${pkgname}" - ln -s "${_installdir}/VirtualBox.chm" "${pkgdir}/usr/share/doc/${pkgname}/virtualbox.chm" + ln -s "../../../../${_installdir}/VirtualBox.chm" "${pkgdir}/usr/share/doc/${pkgname}/virtualbox.chm" # symlink icons + local _dir + local _icon pushd icons >/dev/null for _dir in * do @@ -162,9 +162,9 @@ package() { do if [ "$_icon" = 'virtualbox.png' ] then - ln -s "${_installdir}/icons/${_dir}/${_icon}" "${pkgdir}/usr/share/icons/hicolor/${_dir}/apps/${_icon}" + ln -s "../../../../../../${_installdir}/icons/${_dir}/${_icon}" "${pkgdir}/usr/share/icons/hicolor/${_dir}/apps/${_icon}" else - ln -s "${_installdir}/icons/${_dir}/${_icon}" "${pkgdir}/usr/share/icons/hicolor/${_dir}/mimetypes/${_icon}" + ln -s "../../../../../../${_installdir}/icons/${_dir}/${_icon}" "${pkgdir}/usr/share/icons/hicolor/${_dir}/mimetypes/${_icon}" fi done cd - >/dev/null @@ -189,26 +189,24 @@ package() { # write the configuration file printf '%s\n' ' -> Writing the configuration file...' install -D -m0644 /dev/null "${pkgdir}/etc/vbox/vbox.cfg" - cat > "${pkgdir}/etc/vbox/vbox.cfg" <<EOF + cat > "${pkgdir}/etc/vbox/vbox.cfg" << __EOF__ # VirtualBox installation directory -INSTALL_DIR='${_installdir}' +INSTALL_DIR='/${_installdir}' # VirtualBox version INSTALL_VER='${pkgver}' INSTALL_REV='${_build}' -EOF +__EOF__ # write modules-load.d configuration to ensure that modules are loaded at boot printf '%s\n' " -> Writing 'modules-load.d' configuration..." install -D -m644 /dev/null "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n' '# Load virtualbox kernel modules at boot ' >"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n\n' "# This file was installed by the ${pkgname} AUR package" >>"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n' 'vboxdrv' >>"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n' 'vboxpci' >>"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n' 'vboxnetadp' >>"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - printf '%s\n' 'vboxnetflt' >>"${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - - # fix permissions (change executables from 4711 to 4755) - printf '%s\n' ' -> Fixing permissions...' - chmod 4755 "${pkgdir}/${_installdir}"/{VBox{Headless,Net{AdpCtl,DHCP,NAT},SDL,VolInfo},VirtualBox} + cat > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" << __EOF__ +# Load virtualbox kernel modules at boot +# This file was installed by the ${pkgname} AUR package +vboxdrv +vboxpci +vboxnetadp +vboxnetflt +__EOF__ } |