$ git diff --patch-with-stat --summary 047898b1e3d15e914bfc201cdeec86b49d621f5b..bc81b94b9f2f5fb924f812319579aa6f2bb87fa9
.abf.yml | 6 ++++--
virtualbox-5.1.30-glibc-2.26.patch | 12 +++++++++++
virtualbox-no-prehistoric-xfree86.patch | 35 +++++++++++++++++++++++++++++++++
virtualbox.spec | 11 ++++++-----
4 files changed, 57 insertions(+), 7 deletions(-)
create mode 100644 virtualbox-5.1.30-glibc-2.26.patch
create mode 100644 virtualbox-no-prehistoric-xfree86.patch
diff --git a/.abf.yml b/.abf.yml
index 308e3c3..ef3835a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,5 @@
+removed_sources:
+ VirtualBox-5.2.0.tar.bz2: 875704b2bbea3eb8161b7277b10df3dea5a748e2
sources:
- UserManual.pdf: fa7f4ea3ae30bc2b575f16f2c568f5210ceaef26
- VirtualBox-5.1.26.tar.bz2: a99c032f72a3d106029a5c90032da55b25093f72
+ UserManual.pdf: eff48e6d26604f96e440ffb1899daae328640076
+ VirtualBox-5.1.30.tar.bz2: 85fbf2471887dbb275aece68dde117802e0d0ef0
diff --git a/virtualbox-5.1.30-glibc-2.26.patch b/virtualbox-5.1.30-glibc-2.26.patch
new file mode 100644
index 0000000..0088cc9
--- /dev/null
+++ b/virtualbox-5.1.30-glibc-2.26.patch
@@ -0,0 +1,12 @@
+--- VirtualBox-5.1.30/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h 2017-10-16 10:49:22.000000000 +0100
++++ VirtualBox-5.1.30/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h.0025~ 2017-11-08 18:03:55.832261207 +0000
+@@ -57,7 +57,9 @@
+ typedef uint32_t zoneid_t;
+ #endif
+ #if (!defined(__NGREG) && !defined(NGREG)) || !defined(RT_OS_LINUX)
++#ifndef _SYS_UCONTEXT_H // sys/context.h defines greg_t
+ typedef RTCCINTREG greg_t;
++#endif
+ #else
+ AssertCompileSize(greg_t, sizeof(RTCCINTREG));
+ #endif
diff --git a/virtualbox-no-prehistoric-xfree86.patch b/virtualbox-no-prehistoric-xfree86.patch
new file mode 100644
index 0000000..ee21f91
--- /dev/null
+++ b/virtualbox-no-prehistoric-xfree86.patch
@@ -0,0 +1,35 @@
+--- VirtualBox-5.2.0/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp.0022~ 2017-10-18 09:06:44.000000000 +0200
++++ VirtualBox-5.2.0/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp 2017-10-31 13:31:27.646597617 +0100
+@@ -36,16 +36,14 @@
+ #if defined(VBOX_VBGLR3_XFREE86)
+ extern "C" {
+ # define XFree86LOADER
+-# include <xf86_ansic.h>
+ # undef size_t
+ }
+-#else
+-# include <stdarg.h>
+-# include <stdlib.h>
+-# define xalloc malloc
+-# define xfree free
+-extern "C" void ErrorF(const char *f, ...);
+ #endif
++#include <stdarg.h>
++#include <stdlib.h>
++#define xalloc malloc
++#define xfree free
++extern "C" void ErrorF(const char *f, ...);
+
+ RTDECL(void) RTAssertMsg1Weak(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
+ {
+--- VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h.0022~ 2017-10-18 09:06:50.000000000 +0200
++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h 2017-10-31 13:36:20.635971573 +0100
+@@ -52,7 +52,7 @@ RT_C_DECLS_BEGIN
+ RT_C_DECLS_END
+ #endif /* defined(IN_XF86_MODULE) && !defined(NO_ANSIC) */
+ #define __STDC_LIMIT_MACROS /* define *INT*_MAX on C++ too. */
+-#include "compiler.h" /* Can pull in <sdtint.h>. Must come after xf86_ansic.h on XFree86. */
++#include <xorg/compiler.h> /* Can pull in <stdint.h>. Must come after xf86_ansic.h on XFree86. */
+ #include <X11/Xfuncproto.h>
+ #include <stdint.h>
+ #if defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
diff --git a/virtualbox.spec b/virtualbox.spec
index da7ef23..e2558ff 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -42,7 +42,7 @@
Summary: A general-purpose full virtualizer for x86 hardware
Name: virtualbox
-Version: 5.1.26
+Version: 5.1.30
Release: 1
License: GPLv2
Group: Emulators
@@ -71,6 +71,7 @@ Patch18: VirtualBox-5.1.8-gsoap-2.8.13.patch
Patch21: VirtualBox-5.0.18-xserver_guest.patch
Patch23: VirtualBox-5.0.10-no-bundles.patch
Patch24: VirtualBox-5.0.18-xserver_guest_xorg19.patch
+Patch25: virtualbox-5.1.30-glibc-2.26.patch
ExclusiveArch: %{ix86} x86_64
BuildRequires: dev86
@@ -246,10 +247,10 @@ export LIBPATH_LIB="%{_lib}"
|| (cat configure.log && exit 1)
# remove fPIC to avoid causing issues
-echo VBOX_GCC_OPT="`echo %{optflags} -fpermissive | sed 's/-fPIC//'`" >> LocalConfig.kmk
-%ifarch %{ix86}
+echo VBOX_GCC_OPT="`echo %{optflags} -fpermissive -g0 -Wno-format-security | sed 's/-fPIC//'`" >> LocalConfig.kmk
+#ifarch %{ix86}
%global ldflags %{ldflags} -fuse-ld=bfd
-%endif
+#endif
echo TOOL_GCC_LDFLAGS="%{ldflags}" >> LocalConfig.kmk
%if %{build_additions}
@@ -260,7 +261,7 @@ echo VBOX_WITHOUT_ADDITIONS=1 >> LocalConfig.kmk
%endif
. ./env.sh
-kmk %{_smp_mflags} all
+kmk %{_smp_mflags} all VERBOSE=1
%install
# install vbox components