dbh201
2022-11-08 7c4acf113419eb06d28ccd42ffb7cff26b26aaff
virtualbox: update to 6.1.40

* virtualbox: update to 6.1.40

* userland-fetch: fix regexes
1 files deleted
1 files added
2 files modified
112 ■■■■ changed files
components/sysutils/virtualbox/Makefile 44 ●●●●● patch | view | raw | blame | history
components/sysutils/virtualbox/VirtualBox.sums 31 ●●●●● patch | view | raw | blame | history
components/sysutils/virtualbox/hashes/SHA256SUMS 31 ●●●●● patch | view | raw | blame | history
tools/userland-fetch 6 ●●●● patch | view | raw | blame | history
components/sysutils/virtualbox/Makefile
@@ -16,34 +16,44 @@
# Copyright 2021 omnios.org wrt the ctx patches
# Copyright 2022 Daniel Bell
#USE_OPENSSL11= yes
BUILD_STYLE=configure
BUILD_BITS=64
USE_OPENSSL11=          yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=         VirtualBox
COMPONENT_VERSION=      6.1.38
COMPONENT_REVISION =    0
COMPONENT_VERSION=      6.1.40
COMPONENT_SUMMARY=      VirtualBox - general-purpose full virtualizer
COMPONENT_PROJECT_URL=  https://www.virtualbox.org/
COMPONENT_FMRI=         system/virtualbox
COMPONENT_CLASSIFICATION= System/Virtualization
COMPONENT_CLASSIFICATION=System/Virtualization
COMPONENT_DOWNLOAD_URL= https://download.virtualbox.org/virtualbox/$(COMPONENT_VERSION)
COMPONENT_SRC=            $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=        $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_URL=  $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH= $(shell sed -E '/ [ \*]$(COMPONENT_ARCHIVE)$$/!d;s/(^[0-9a-fA-F]+)( .*)/sha256:\1/' $(COMPONENT_DIR)/$(COMPONENT_NAME).sums)
COMPONENT_LICENSE=      GPLv2
# Get build number from SDK zip entry in the checksum file
SDK_BUILD_NUMBER=    $(shell sed -E '/ [ \*]VirtualBoxSDK.*zip/!d;s/(^[0-9a-fA-F]+ [ \*]VirtualBoxSDK-[0-9\.]+-)([0-9]+)(.*$$)/\2/' $(COMPONENT_DIR)/$(COMPONENT_NAME).sums)
HASH_DIR=$(COMPONENT_DIR)/hashes
export HASH_DIR
FETCH_KEEP=-n --keep
DEFAULT_HASH_FILES=SHA256SUMS
export DEFAULT_HASH_FILES
# We need the hashfile before even parsing the Makefile since we need the build number from it.
ifeq (,$(wildcard $(HASH_DIR)/SHA256SUMS))
$(shell curl -q -o $(HASH_DIR)/SHA256SUMS $(COMPONENT_DOWNLOAD_URL)/SHA256SUMS)
endif
SDK_BUILD_NUM=$(shell sed -E '/ [ \*]VirtualBoxSDK.*zip/!d;s/(^[0-9a-fA-F]+ [ \*]VirtualBoxSDK-[0-9\.]+-)([0-9]+)(.*$$)/\2/' $(HASH_DIR)/SHA256SUMS)
COMPONENT_NAME_1=       VirtualBoxSDK
COMPONENT_VERSION_1=    $(COMPONENT_VERSION)-$(SDK_BUILD_NUMBER)
COMPONENT_VERSION_1=    $(COMPONENT_VERSION)-$(SDK_BUILD_NUM)
COMPONENT_SRC_1=        $(COMPONENT_NAME_1)-$(COMPONENT_VERSION_1)
COMPONENT_ARCHIVE_1=    $(COMPONENT_SRC_1).zip
COMPONENT_ARCHIVE_URL_1=$(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE_1)
COMPONENT_ARCHIVE_HASH_1= $(shell sed -E '/ [ \*]$(COMPONENT_ARCHIVE_1)$$/!d;s/(^[0-9a-fA-F]+)( .*)/sha256:\1/' $(COMPONENT_DIR)/$(COMPONENT_NAME).sums)
COMPONENT_ARCHIVE_1=    $(COMPONENT_SRC_1).zip
COMPONENT_LICENSE_1=    GPLv2
UNPACK_ARGS_1=        -r $(COMPONENT_SRC_1)
@@ -51,9 +61,8 @@
COMPONENT_POST_UNPACK_ACTION_1 = \
    cd $(COMPONENT_SRC); $(LN) -s ../$(COMPONENT_SRC_1)/sdk .;
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
TEST_TARGET=$(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
PATH=$(PATH.gnu)
@@ -225,13 +234,11 @@
# Sometimes 32-bit build is skipped silently. Better build like this:
#    gmake build install sample-manifest
build:        $(BUILD_32_and_64)
$(INSTALL_64): GMAKE= cd $(@D)/src/VBox/Installer && $(SHELL) -c ". $(@D)/env.sh && kmk solaris-install VBOX_PATH_SI_SCRATCH_PKG=$(PROTO_DIR)"
install:    $(INSTALL_64) $(INSTALL_ADDITIONS)
test:        $(NO_TESTS)
# Build dependencies
REQUIRED_PACKAGES += driver/usb
@@ -246,14 +253,15 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += library/gsoap
REQUIRED_PACKAGES += library/libvncserver
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/qt5
REQUIRED_PACKAGES += library/sdl
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += web/curl
components/sysutils/virtualbox/VirtualBox.sums
File was deleted
components/sysutils/virtualbox/hashes/SHA256SUMS
New file
@@ -0,0 +1,31 @@
29cf8410e2514ea4393f63f5e955b8311787873679fc23ae9a897fb70ef3f84a *Oracle_VM_VirtualBox_Extension_Pack-6.1.40-154048.vbox-extpack
29cf8410e2514ea4393f63f5e955b8311787873679fc23ae9a897fb70ef3f84a *Oracle_VM_VirtualBox_Extension_Pack-6.1.40.vbox-extpack
4400931b83d55efc1dce3fcd2134f40155ef4015bf97fad459b67ad2165b2fc3 *SDKRef.pdf
09a43b93bc46ca9b77431b957c34b82f5f46323e2bfe1794e63bfa60eee80b1f *UserManual.pdf
d456c559926f1a8fdd7259056e0a50f12339fd494122cf30db7736e2032970c6 *VBoxGuestAdditions_6.1.40.iso
23e8f060bd979ceadcfcde959bcf81461c9c54c4eb26ae8e876fe2f6c2625a05 *VirtualBox-6.1-6.1.40_154048_el6-1.x86_64.rpm
5f1fff70a1ed79d4be12bf0e1c08278385dfebb17ff08c19cf60f5bf696923ea *VirtualBox-6.1-6.1.40_154048_el7-1.x86_64.rpm
72e59a5602d3542ce0b6d8e42f65be02c6ac7f6a087c12b773b77cf609ae66fb *VirtualBox-6.1-6.1.40_154048_el8-1.x86_64.rpm
3ae69dc0451ad225230d74a344b161a8ccf32f698ea7be9aa3c31ab813212f55 *VirtualBox-6.1-6.1.40_154048_el9-1.x86_64.rpm
ca6a469f660c7cd40c37fe6a5b0a0d372d1ac262047e309710ff4745e828d97e *VirtualBox-6.1-6.1.40_154048_fedora32-1.x86_64.rpm
6d2015a3b9d92e338faca91505c7af6a827adde7bf6d861cbfd31c0dd310d281 *VirtualBox-6.1-6.1.40_154048_fedora33-1.x86_64.rpm
ab5644556685473031ddd2f9b8ded9775ad09649e7b511ba91c48c2a222b8fe3 *VirtualBox-6.1-6.1.40_154048_fedora35-1.x86_64.rpm
2cae30eea34a13a54ed9b5c269ac62e089998b9992491f323555b6998a104409 *VirtualBox-6.1-6.1.40_154048_fedora36-1.x86_64.rpm
bd0ab5ad273eda0c96326303085256258649dc4c6eace034793f2d3a437762d0 *VirtualBox-6.1-6.1.40_154048_openSUSE132-1.x86_64.rpm
38882b78ec8b1acf4f9e1227e7b29bc696e8b286c666e645b887668545fae9d2 *VirtualBox-6.1-6.1.40_154048_openSUSE150-1.x86_64.rpm
989f6c5650a29cb7b5b097a6e28ec241f6964dc8ab896a55867cf81da601e050 *VirtualBox-6.1-6.1.40_154048_openSUSE153-1.x86_64.rpm
4a6b781563dd9db7bd0c8759867fce6a6ff801ccfd97fb2febb9b5fe333f788d *VirtualBox-6.1.40-154048-Linux_amd64.run
bccf09995cd736a51d579dd12602eab4730df83bf4ac8196f31c4a22a6320936 *VirtualBox-6.1.40-154048-OSX.dmg
576a428c9bce42195c263d5f8e9e6322e2979825aec8c37580496f910af2c9c7 *VirtualBox-6.1.40-154048-Solaris.p5p
44ac49c4d323585a8026f0d6c20f42895702a61f001fa5e3fbf597c4e704062d *VirtualBox-6.1.40-154048-SunOS.tar.gz
d805bce302279414d0f35234c0fd2504053ce3c19668ab4670a52a662bd77240 *VirtualBox-6.1.40-154048-Win.exe
bc857555d3e836ad9350a8f7b03bb54d2fdc04dddb2043d09813f4634bca4814 *VirtualBox-6.1.40.tar.bz2
f0eb87d02ebbd39c95f3a572802d1e77a3e52a943a6f3d205d131a5bf75a31fb *VirtualBoxSDK-6.1.40-154048.zip
cd342688be67049d89ea753a5469c0ed2e207b52402298c023a48bca3bd65caf *virtualbox-6.1_6.1.40-154048~Debian~bullseye_amd64.deb
428c65cc740d1dc01fc696058b3da716c9d2c87ba54fe03703c1e847a8d264c6 *virtualbox-6.1_6.1.40-154048~Debian~buster_amd64.deb
61671c5c2dfefc47580a17570512a4cd840b5f29dd2e465abb5977fd5754309c *virtualbox-6.1_6.1.40-154048~Debian~stretch_amd64.deb
f03b0251bbfa590f2c02f7d6d3a284ef807cad909feb59c0dcb26ef7e2c6c4ea *virtualbox-6.1_6.1.40-154048~Ubuntu~bionic_amd64.deb
f3efe563b193e4f26e5c048db32a2ee93d822e87b0a98abc3430996faac56d04 *virtualbox-6.1_6.1.40-154048~Ubuntu~eoan_amd64.deb
f5815cb71f922a6fdfa185110683c3011790417e5f330bb96826f0200de85325 *virtualbox-6.1_6.1.40-154048~Ubuntu~focal_amd64.deb
f2c6d8923b6a73373095dce890523702accdde4cb1e3d96d4bbcdc2d969a85b7 *virtualbox-6.1_6.1.40-154048~Ubuntu~jammy_amd64.deb
7b7f74d9b71e40ddae7351756c6a36b084d3684dfe2d761ebde3dc9fcf8a0e33 *virtualbox-6.1_6.1.40-154048~Ubuntu~xenial_amd64.deb
tools/userland-fetch
@@ -525,10 +525,10 @@
def find_hash_in_file(filename,hash_file):
    splits = hash_file.split('.')
    regex = re.compile('([0-9a-fA-F]+)( [ \*].*/)('+os.path.basename(filename)+'$)')
    match = re.match("([a-z0-9]+)(sums?(.txt)?)",filename.lower())
    regex = re.compile('([0-9a-fA-F]+)( [ \*](.*/)?)('+os.path.basename(filename)+'$)')
    match = re.match("(^[a-z0-9]+)(sums?(.txt)?$)",hash_file.lower())
    if '.'.join(splits[:-1]) == filename:
        algo = re.match('([a-zA-Z0-9]+)(sum(s?)?)',hash_file.split('.')[-1]).group(1)
        algo = re.match('([a-zA-Z0-9]+)(sums?)',hash_file.split('.')[-1]).group(1)
    elif match:
        algo = match.group(1)
    else: