From 09654efd5c333828a050eb32593c1f0c06c57e48 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Oct 2016 11:51:32 +0000
Subject: testing/virtualbox-guest-additions: upgrade to 5.1.6 and use libressl

---
 testing/virtualbox-guest-additions/APKBUILD              | 16 ++++++++--------
 .../virtualbox-guest-additions/musl-sched_yield.patch    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'testing/virtualbox-guest-additions')

diff --git a/testing/virtualbox-guest-additions/APKBUILD b/testing/virtualbox-guest-additions/APKBUILD
index dd82383da7..feaff00785 100644
--- a/testing/virtualbox-guest-additions/APKBUILD
+++ b/testing/virtualbox-guest-additions/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=${FLAVOR:-grsec}
 
 pkgname=virtualbox-guest-additions
-pkgver=5.1.2
+pkgver=5.1.6
 
 pkgrel=0
 pkgdesc="VirtualBox Addtions userland components"
@@ -12,7 +12,7 @@ arch='x86_64'
 url='http://virtualbox.org'
 license="GPL custom"
 install="$pkgname.pre-install"
-makedepends="sed kbuild lvm2-dev yasm zlib-dev openssl-dev curl-dev"
+makedepends="sed kbuild lvm2-dev yasm zlib-dev libressl-dev curl-dev"
 depends="virtualbox-guest-modules-$_flavor"
 source="http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2
 	futimens.patch 
@@ -63,32 +63,32 @@ package() {
         install -v -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="aff1647170dd92914cddfbd0254b9773  VirtualBox-5.1.2.tar.bz2
+md5sums="8c2331a718cfc038963c1214c2ba9811  VirtualBox-5.1.6.tar.bz2
 10f65154d3ff17d88fad5ed384e20276  futimens.patch
 81a2ebe27e166219a03858f87eb57518  musl-fix-headers.patch
 2d8119cc2bb88a1dc8e1bcd2a6abf36e  musl-no-glibc.patch
 9b6a45f250956232f33911ea26d1355e  musl-fix-stat-nsec.patch
-00f38b765810aaa7f8c652ca81106126  musl-sched_yield.patch
+5de14e453e1e7c92afdd73ef60bd4fe9  musl-sched_yield.patch
 072ee2114b3771e7bdbff5211f342755  uclibc-gnu_linux.patch
 b5e6069e20db86cb2e00f1431b202ca4  vboxguestlib-makefile-nox11.patch
 8a6525395f4791b8261f245be1eec552  virtualbox-guest-additions-localconfig
 867c31d95544f25deb3dfbac038d4cb0  virtualbox-guest-additions.initd"
-sha256sums="03c92e3000d4b905d5b18a6abed757998125a37e5efa7864e62eae2baeabe010  VirtualBox-5.1.2.tar.bz2
+sha256sums="2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911  VirtualBox-5.1.6.tar.bz2
 deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb  futimens.patch
 d5085e8921b5fa7dca26d2a8da6d1174f7971491c356b6bea5126e6dda0d863c  musl-fix-headers.patch
 d0bc2e84675741a54b42b59c9746f255799264512b11a565ce3d435f1398a874  musl-no-glibc.patch
 aab58b5dd854551c52063876e8b4186892ba0b3cf9d907c3abe9cff93b8be7fc  musl-fix-stat-nsec.patch
-a7cb381cdf405d25112fd245e7cdb6728a87361896ce545be3cb8e2d234e4d9d  musl-sched_yield.patch
+5f478eee88c170b502f5d73181e282e8f4306b1609243bbe152642e3410a641f  musl-sched_yield.patch
 1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae  uclibc-gnu_linux.patch
 19d156225f205245abeca94aac72b90d6dec2d830b4fb30b6c6ce790011e97ac  vboxguestlib-makefile-nox11.patch
 555a92cc4741419f7ffd6b9698600b85dc14ddfc6fed6df792d13caf7116e2af  virtualbox-guest-additions-localconfig
 f1c39ecf58e6dc8162066adbda6d5cec5a5fe4f5f1f6003b6201269b3f52f456  virtualbox-guest-additions.initd"
-sha512sums="99919f2a8c5625ecd1cda766396cc9302fe81585bb15243d969b6a6bdd8f89cd029c5696e0160ca6c965bf43edb7f9ead6608304f20467fd0a6980a25ae84e68  VirtualBox-5.1.2.tar.bz2
+sha512sums="7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4  VirtualBox-5.1.6.tar.bz2
 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638  futimens.patch
 0169a620d62aa3de8124e0084f4b747b602fbdcab7892fe075606459e0200d412321c86da4c5d98309f4d7479ae1b5267ed28bea6c6e64fd8be88cab74f8e94c  musl-fix-headers.patch
 b1c47cb910ac751df7bd4bc10c5501e91d88a9b3e4fe181b02755d433df8e89a160a38422912266f0cc51ba0c09854dad513ba6f2634fc76c59cee7989b259eb  musl-no-glibc.patch
 2c329085915f0ffa43828a14d8b29d0d876e48e18a0190ad146cd0731af7eca11cdf41d2e533c9cc73aa75506b9b91e3a08f2272cd8884e0d929722730b99862  musl-fix-stat-nsec.patch
-31cd99ccb5e609ec598d78f0402a5c6522731ce3e84e52c4318441acdc27d3537abfcb2ab136bf8de1f614a1c81bff1200fbed986daebd5d30b8590d115c4edb  musl-sched_yield.patch
+ddeca1cf8dd7d749e3c649b7861d3b12d246882dc0fbd2a980efc2c5a33dac94c5b40b07a49d26cd3ea1bb9917ce0485abc4ee8ff3e6291534433263a54050d4  musl-sched_yield.patch
 d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb  uclibc-gnu_linux.patch
 0ced8df03a354e211fd0631d3971246d75de3a60c2347b5fe33236405d55911422d53eb7c679ae6fc18dc8f57c245d5701fa02ae740d1f0bd1e1cbb0b715bf2f  vboxguestlib-makefile-nox11.patch
 1b14e0239e91d2d1515250272eb485b442d785dac98bdd7b1cca2fad123f853fe138b6cfad2566c8cb35cab3b77151a49a9422fbad3c13489fa12f3f43d550b9  virtualbox-guest-additions-localconfig
diff --git a/testing/virtualbox-guest-additions/musl-sched_yield.patch b/testing/virtualbox-guest-additions/musl-sched_yield.patch
index 9a807ac8f6..b3012e5c1a 100644
--- a/testing/virtualbox-guest-additions/musl-sched_yield.patch
+++ b/testing/virtualbox-guest-additions/musl-sched_yield.patch
@@ -1,7 +1,7 @@
---- VirtualBox-5.0.12/src/VBox/Runtime/r3/posix/thread2-posix.cpp.orig
-+++ VirtualBox-5.0.12/src/VBox/Runtime/r3/posix/thread2-posix.cpp
-@@ -65,7 +65,7 @@
- #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+--- ./src/VBox/Runtime/r3/posix/thread2-posix.cpp.orig
++++ ./src/VBox/Runtime/r3/posix/thread2-posix.cpp
+@@ -63,7 +63,7 @@
+ #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
          sched_yield();
  #else
 -        if (!pthread_yield())
@@ -9,8 +9,8 @@
  #endif
          {
              LogFlow(("RTThreadSleep: returning %Rrc (cMillies=%d)\n", VINF_SUCCESS, cMillies));
-@@ -104,7 +104,7 @@
- #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+@@ -100,7 +100,7 @@
+ #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
          sched_yield();
  #else
 -        if (!pthread_yield())
@@ -18,11 +18,11 @@
  #endif
              return VINF_SUCCESS;
      }
-@@ -130,10 +130,8 @@
+@@ -126,10 +126,8 @@
  #endif
  #ifdef RT_OS_DARWIN
      pthread_yield_np();
--#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
 -    sched_yield();
  #else
 -    pthread_yield();
-- 
cgit v1.2.3