diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-28 07:10:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-28 07:12:09 +0000 |
| commit | 9d947e571f1cf4a7bb540caec1425ec01373f930 (patch) | |
| tree | 2866d19a737581ff02272ea90a3b2b48671cf093 /community/virtualbox-guest-additions | |
| parent | c2890f4ac8afa8f41d0eb51e506fe1028c20887e (diff) | |
| download | aports-9d947e571f1cf4a7bb540caec1425ec01373f930.tar.bz2 aports-9d947e571f1cf4a7bb540caec1425ec01373f930.tar.xz | |
community/virtualbox-guest-additions: upgrade to 6.0.0
Diffstat (limited to 'community/virtualbox-guest-additions')
4 files changed, 46 insertions, 51 deletions
diff --git a/community/virtualbox-guest-additions/APKBUILD b/community/virtualbox-guest-additions/APKBUILD index e298f1b55f..6b01a6c5ba 100644 --- a/community/virtualbox-guest-additions/APKBUILD +++ b/community/virtualbox-guest-additions/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Ben Allen <bensallen@me.com> pkgname=virtualbox-guest-additions -pkgver=5.1.30 +pkgver=6.0.0 pkgrel=0 pkgdesc="VirtualBox Addtions userland components" @@ -10,7 +10,7 @@ arch='x86 x86_64' url='http://virtualbox.org' license="GPL custom" install="$pkgname.pre-install" -makedepends="sed kbuild lvm2-dev yasm nasm zlib-dev libressl-dev curl-dev" +makedepends="sed kbuild lvm2-dev yasm nasm zlib-dev openssl-dev curl-dev libxslt" depends="" source="https://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2 futimens.patch @@ -18,28 +18,22 @@ source="https://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta musl-no-glibc.patch musl-fix-stat-nsec.patch musl-sched_yield.patch - uclibc-gnu_linux.patch - vboxguestlib-makefile-nox11.patch + glibc-symvers.patch virtualbox-guest-additions-localconfig $pkgname.initd " -_builddir="$srcdir"/VirtualBox-$pkgver +builddir="$srcdir"/VirtualBox-$pkgver prepare() { - cd "$_builddir" - rm -rf $_builddir/kBuild/bin $_builddir/tools - local i - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + cd "$builddir" + default_prepare + rm -rf $builddir/kBuild/bin $builddir/tools cp $srcdir/$pkgname-localconfig LocalConfig.kmk } build() { - cd "$_builddir" + cd "$builddir" ./configure --nofatal \ --disable-dbus \ --disable-xpcom \ @@ -54,20 +48,19 @@ build() { } package() { - cd "$_builddir" - install -v -Dm755 "$_builddir"/out/linux.*/release/bin/additions/VBoxService "$pkgdir/usr/sbin/VBoxService" - install -v -Dm755 "$_builddir"/out/linux.*/release/bin/additions/VBoxControl "$pkgdir/usr/bin/VBoxControl" - install -v -Dm755 "$_builddir"/out/linux.*/release/bin/additions/mount.vboxsf "$pkgdir/usr/sbin/mount.vboxsf" + cd "$builddir" + install -v -Dm755 "$builddir"/out/linux.*/release/bin/additions/VBoxService "$pkgdir/usr/sbin/VBoxService" + install -v -Dm755 "$builddir"/out/linux.*/release/bin/additions/VBoxControl "$pkgdir/usr/bin/VBoxControl" + install -v -Dm755 "$builddir"/out/linux.*/release/bin/additions/mount.vboxsf "$pkgdir/usr/sbin/mount.vboxsf" install -v -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -sha512sums="6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee VirtualBox-5.1.30.tar.bz2 +sha512sums="fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561 VirtualBox-6.0.0.tar.bz2 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638 futimens.patch 0169a620d62aa3de8124e0084f4b747b602fbdcab7892fe075606459e0200d412321c86da4c5d98309f4d7479ae1b5267ed28bea6c6e64fd8be88cab74f8e94c musl-fix-headers.patch b1c47cb910ac751df7bd4bc10c5501e91d88a9b3e4fe181b02755d433df8e89a160a38422912266f0cc51ba0c09854dad513ba6f2634fc76c59cee7989b259eb musl-no-glibc.patch 2c329085915f0ffa43828a14d8b29d0d876e48e18a0190ad146cd0731af7eca11cdf41d2e533c9cc73aa75506b9b91e3a08f2272cd8884e0d929722730b99862 musl-fix-stat-nsec.patch 56c5c3a0becd8f1886010f5f231aa1d2e129bf188f8220e111fb9d51c191a429940edec700f5286b46dadbb45b62e67ee4e09fec6bcea61a344fb65afcbd6756 musl-sched_yield.patch -d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb uclibc-gnu_linux.patch -0ced8df03a354e211fd0631d3971246d75de3a60c2347b5fe33236405d55911422d53eb7c679ae6fc18dc8f57c245d5701fa02ae740d1f0bd1e1cbb0b715bf2f vboxguestlib-makefile-nox11.patch +2b907920c32b4385e80b81ec755cb0931d3bb1dff23184ddc49e457f9dfafb2ddbd810418c003c3be82433b06de800fce77a07883fa46e51e6870d565a485add glibc-symvers.patch 43555e442f85424c957d51a737394c6f2ec0782e5b8701e3bc6a08d17ae2e8e6e9e85734d69853f7151f91f951a9a921c4f0c5d5f6b72e8379526c49f070d49b virtualbox-guest-additions-localconfig ad6ff256def558f5c6b772c62a3e7a6ccd067ae208491e02ce6738a501d02bcac214056825b804c19fd21b33f3752c62bd8572eb8764f6c5eb10534fa668bd38 virtualbox-guest-additions.initd" diff --git a/community/virtualbox-guest-additions/glibc-symvers.patch b/community/virtualbox-guest-additions/glibc-symvers.patch new file mode 100644 index 0000000000..a95b7df34f --- /dev/null +++ b/community/virtualbox-guest-additions/glibc-symvers.patch @@ -0,0 +1,32 @@ +diff --git a/include/iprt/linux/symvers.h b/include/iprt/linux/symvers.h +index 7d552b1..e5edbeb 100644 +--- a/include/iprt/linux/symvers.h ++++ b/include/iprt/linux/symvers.h +@@ -37,12 +37,14 @@ + /* Use versions of glibc symbols which are available in 32-bit EL3 or + * 64-bit EL4. Currently only those symbols needed by the Additions, + * though this could probably be extended to work for host builds too. */ ++#if defined(__GLIBC__) + #if defined(RT_ARCH_AMD64) + __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); + __asm__(".symver posix_spawn,posix_spawn@GLIBC_2.2.5"); + #else /* RT_ARCH_X86 */ + __asm__(".symver posix_spawn,posix_spawn@GLIBC_2.2"); + #endif ++#endif + + /* Do not use *_chk functions */ + #undef _FORTIFY_SOURCE +@@ -65,10 +67,12 @@ __asm__(".symver posix_spawn,posix_spawn@GLIBC_2.2"); + #ifdef fnctl + # undef fcntl + #endif ++#if defined(__GLIBC__) + #if defined(RT_ARCH_AMD64) + __asm__(".symver fcntl64,fcntl@GLIBC_2.2.5"); + #else + __asm__(".symver fcntl64,fcntl@GLIBC_2.0"); + #endif ++#endif + + #endif /* ___iprt_linux_symvers_h */ diff --git a/community/virtualbox-guest-additions/uclibc-gnu_linux.patch b/community/virtualbox-guest-additions/uclibc-gnu_linux.patch deleted file mode 100644 index b227d55b1d..0000000000 --- a/community/virtualbox-guest-additions/uclibc-gnu_linux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/libs/kStuff/kStuff/include/k/kDefs.h.orig -+++ ./src/libs/kStuff/kStuff/include/k/kDefs.h -@@ -82,7 +82,7 @@ - # define K_OS K_OS_DRAGONFLY - # elif defined(__FreeBSD__) /*??*/ - # define K_OS K_OS_FREEBSD --# elif defined(__gnu_linux__) -+# elif defined(__linux__) - # define K_OS K_OS_LINUX - # elif defined(__NetBSD__) /*??*/ - # define K_OS K_OS_NETBSD diff --git a/community/virtualbox-guest-additions/vboxguestlib-makefile-nox11.patch b/community/virtualbox-guest-additions/vboxguestlib-makefile-nox11.patch deleted file mode 100644 index 44b2efddbf..0000000000 --- a/community/virtualbox-guest-additions/vboxguestlib-makefile-nox11.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -38,16 +38,6 @@ - LIBRARIES += \ - VBoxGuestR3Lib \ - VBoxGuestR3LibShared --ifndef VBOX_ONLY_VALIDATIONKIT -- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -- endif -- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) -- LIBRARIES += \ -- VBoxGuestR3LibXOrg -- endif --endif - LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 - - |