virtualbox_guest_additions: bump version

app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-5.1.22.patchset

@@ -1,14 +1,14 @@
-From 1123a48d5af3c496133d14498f94b0937857ee21 Mon Sep 17 00:00:00 2001
+From 0cbfe8bc78300319f291cbcae6791a2c86ef8779 Mon Sep 17 00:00:00 2001
 From: Segey Reznikov <diver@gelios.net>
 Date: Wed, 18 Jan 2017 00:26:11 +0000
 Subject: Haiku fixes
 
 
 diff --git a/Config.kmk b/Config.kmk
-index 8637671..9f61407 100644
+index 3ff6865..252ee26 100644
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -2746,8 +2746,8 @@ if   $(KBUILD_TARGET) == "linux" \
+@@ -2740,8 +2740,8 @@ if   $(KBUILD_TARGET) == "linux" \
   VBOX_GCC_WARN_PEDANTIC += $(VBOX_GCC_WARN_MASOCHISTIC)
  endif
  
@@ -19,7 +19,7 @@ index 8637671..9f61407 100644
  
  VBOX_GCC_NON_PEDANTIC_CXX ?= -Wno-sign-compare
  VBOX_GCC_NON_PEDANTIC_C   ?= -Wno-sign-compare -Werror-implicit-function-declaration
-@@ -4474,8 +4474,8 @@ TEMPLATE_VBOXR0DRV_LDTOOL              = $(VBOX_GCC_TOOL)
+@@ -4376,8 +4376,8 @@ TEMPLATE_VBOXR0DRV_LDTOOL              = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXR0DRV_DEFS                = _KERNEL_MODE=1 _STRICT_STDC IN_RING0 IN_RT_R0
  TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_HAIKU_SYS_INCS)
  #TODO: sort this out
@@ -30,7 +30,7 @@ index 8637671..9f61407 100644
  	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
  TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-@@ -4483,7 +4483,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3
+@@ -4385,7 +4385,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3
  TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
  	-fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
  	-Wno-sign-compare
@@ -39,7 +39,7 @@ index 8637671..9f61407 100644
  	-Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
  	-Wformat \
  	-O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
-@@ -4664,9 +4664,9 @@ TEMPLATE_VBOXR3EXE_LIBS                = network iconv stdc++ supc++
+@@ -4566,9 +4566,9 @@ TEMPLATE_VBOXR3EXE_LIBS                = network iconv stdc++ supc++
  TEMPLATE_VBOXR3EXE_LIBPATH            += \
  	/boot/common/lib
  # Haiku uses PIC by default...
@@ -52,7 +52,7 @@ index 8637671..9f61407 100644
   else if1of ($(KBUILD_TARGET), freebsd openbsd)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3
  TEMPLATE_VBOXR3EXE_LIBS                = pthread
-@@ -4724,9 +4724,9 @@ ifn1of ($(KBUILD_TARGET), darwin win os2)
+@@ -4626,9 +4626,9 @@ ifn1of ($(KBUILD_TARGET), darwin win os2)
  endif
  ifeq ($(KBUILD_TARGET),haiku)
   # Haiku uses PIC by default...
@@ -279,6 +279,19 @@ index b15afdb..4b3797e 100644
      return B_ERROR;
  }
  
+diff --git a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
+index 561eab6..d6d1c11 100644
+--- a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
++++ b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
+@@ -86,7 +86,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_t cb) RT_NO_THROW_DEF
+      * Allocate the memory and ensure that the API is still providing
+      * memory that's always below 4GB.
+      */
+-    cb = RT_ALIGN_Z(cb, PAGE_SIZE);
++    cb = RT_ALIGN_Z(cb, B_PAGE_SIZE);
+     void *pv;
+     area_id area = create_area("VirtualBox Contig Alloc", &pv, B_ANY_KERNEL_ADDRESS, cb, B_32_BIT_CONTIGUOUS,
+                                B_READ_AREA | B_WRITE_AREA);
 diff --git a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
 index 7fc3a43..2d3b957 100644
 --- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
@@ -321,5 +334,5 @@ index f805cc3..3207d50 100644
  #  error "Port Me"
  # endif
 -- 
-2.11.0
+2.12.2
 

app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-5.1.22.recipe

@@ -13,7 +13,7 @@ LICENSE="
 	"
 REVISION="1"
 SOURCE_URI="http://download.virtualbox.org/virtualbox/$portVersion/VirtualBox-$portVersion.tar.bz2"
-CHECKSUM_SHA256="8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"
+CHECKSUM_SHA256="fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899"
 SOURCE_DIR="VirtualBox-$portVersion"
 PATCHES="virtualbox_guest_additions-$portVersion.patchset"
 
@@ -55,7 +55,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	export USER=user
-	export KBUILD_PATH=/system/package-links/kbuild-0.1.9998svn~git-1/.self/data
+	export KBUILD_PATH=/system/data/kBuild
 	./configure --only-additions
 	source env.sh
 	kmk VBOX_ONLY_ADDITIONS=1 VBOX_WITH_ADDITION_DRIVERS=1 BUILD_TYPE=strict all