$ git diff --patch-with-stat --summary 047898b1e3d15e914bfc201cdeec86b49d621f5b..770ca16af74e0c8e65bc10fb8ac9a1b5d1c425a1
.abf.yml | 4 +-
VirtualBox-4.1.8-kernelrelease.patch | 30 ---------
VirtualBox-5.0.18-xserver_guest.patch | 116 --------------------------------
virtualbox-fix-vboxadd-req.patch | 14 ++--
virtualbox-no-prehistoric-xfree86.patch | 35 ++++++++++
virtualbox.spec | 17 ++---
6 files changed, 52 insertions(+), 164 deletions(-)
delete mode 100644 VirtualBox-4.1.8-kernelrelease.patch
delete mode 100644 VirtualBox-5.0.18-xserver_guest.patch
create mode 100644 virtualbox-no-prehistoric-xfree86.patch
diff --git a/.abf.yml b/.abf.yml
index 308e3c3..0de10bd 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- UserManual.pdf: fa7f4ea3ae30bc2b575f16f2c568f5210ceaef26
- VirtualBox-5.1.26.tar.bz2: a99c032f72a3d106029a5c90032da55b25093f72
+ VirtualBox-5.2.0.tar.bz2: 875704b2bbea3eb8161b7277b10df3dea5a748e2
+ UserManual.pdf: eff48e6d26604f96e440ffb1899daae328640076
diff --git a/VirtualBox-4.1.8-kernelrelease.patch b/VirtualBox-4.1.8-kernelrelease.patch
deleted file mode 100644
index 049f327..0000000
--- a/VirtualBox-4.1.8-kernelrelease.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nurp VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile
---- VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile 2011-12-19 15:01:06.000000000 +0200
-+++ VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile 2011-12-24 15:22:08.487043179 +0200
-@@ -165,7 +165,7 @@ ifeq ($(KERNELRELEASE),)
- # kernel base directory
- ifndef KERN_DIR
- # build for the current kernel, version check
-- KERN_DIR := /lib/modules/$(shell uname -r)/build
-+ KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- KERN_DIR := /usr/src/linux
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-@@ -194,7 +194,7 @@ ifeq ($(KERNELRELEASE),)
- # module install dir, only for current kernel
- ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
- ifndef MODULE_DIR
-- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-+ MODULE_DIR_TST := /lib/modules/$(KERNELRELEASE)
- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
- MODULE_DIR := $(MODULE_DIR_TST)/misc
- else
-@@ -286,7 +286,7 @@ install_rpm: $(MODULE)
- else # eq ($(MAKECMDGOALS),clean)
-
- ifndef KERN_DIR
-- KERN_DIR := /lib/modules/$(shell uname -r)/build
-+ KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
- ifeq ($(wildcard $(KERN_DIR)/Makefile),)
- KERN_DIR := /usr/src/linux
- endif
diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
deleted file mode 100644
index 300f09a..0000000
--- a/VirtualBox-5.0.18-xserver_guest.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Copyright (c) 2016 Sérgio Basto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The MIT License is to allow be in included in VirtualBox source code.
-
-Using also VBOX_USE_SYSTEM_XORG_HEADERS to build guest additions parts,
-just compile with X11 system source and we may remove all bundle X11 source code.
-
-when we use VBOX_USE_SYSTEM_XORG_HEADERS, we don't need compile the very old
-VBoxGuestR3LibXFree86 for use with old servers where the C library is not
-available and becasue fail to build when we unbundle all X11 sources, files like
-xf86_ansic.h doesn't exist anymore.
-
---- ./Config.kmk.orig 2016-10-12 02:27:19.650378571 +0100
-+++ ./Config.kmk 2016-10-12 02:29:40.308912309 +0100
-@@ -2362,6 +2362,7 @@ ifdef VBOX_WITH_CROGL
- endif
-
- if1of ($(KBUILD_TARGET), freebsd linux solaris)
-+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
- VBOX_MESA_INCS = \
-@@ -2372,6 +2373,7 @@ ifdef VBOX_WITH_CROGL
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
- endif
-+ endif
-
- VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
- VBOX_DARWIN_OPENGL_HEADERS = gl.h glu.h
---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-10-15 16:06:41.137161024 +0100
-+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-10-15 16:09:48.477540551 +0100
-@@ -67,6 +67,7 @@ endif
- VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
- VBoxOGL_INCS = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
- VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-@@ -81,6 +82,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
- $(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
-+ endif
- endif
-
- ifdef VBoxOGL_DRI
-@@ -213,11 +215,15 @@ VBoxOGL_LIBS.win += \
- $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
-
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-- VBoxOGL_LIBS += \
-+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
-+ VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
-+ else
-+ VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
-+endif
- ifdef VBoxOGL_FAKEDRI
- ifeq ($(KBUILD_TARGET), freebsd)
- VBoxOGL_LIBS += \
-@@ -709,7 +715,9 @@ $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_
-
- VBoxEGL_TEMPLATE = VBOXCROGLR3GUESTDLL
- VBoxEGL_SOURCES = egl.c
-+ifndef VBOX_USE_SYSTEM_XORG_HEADERS
- VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
-+endif
- VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
- VBoxEGL_SONAME.linux = libEGL.so.1
-
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100
-@@ -40,9 +40,11 @@ LIBRARIES += \
- VBoxGuestR3LibShared
- ifndef VBOX_ONLY_VALIDATIONKIT
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
- LIBRARIES += \
- VBoxGuestR3LibXFree86
- endif
-+ endif
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- LIBRARIES += \
- VBoxGuestR3LibXOrg
---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100
-+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100
-@@ -384,7 +384,6 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
- vboxvideo_drv_system_INCS += \
- $(PATH_ROOT)/src/VBox/Runtime/include \
-- /usr/include/x11 \
- /usr/include/xorg \
- /usr/include/pixman-1
- vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
diff --git a/virtualbox-fix-vboxadd-req.patch b/virtualbox-fix-vboxadd-req.patch
index edeafed..0007277 100644
--- a/virtualbox-fix-vboxadd-req.patch
+++ b/virtualbox-fix-vboxadd-req.patch
@@ -1,17 +1,15 @@
---- VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh.0004~ 2011-08-15 14:28:49.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh 2011-08-17 21:33:39.000000000 +0200
-@@ -18,10 +18,12 @@
+--- VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh.0004~ 2017-10-31 11:49:42.519439224 +0100
++++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh 2017-10-31 11:51:47.959301310 +0100
+@@ -21,8 +21,10 @@
#
### BEGIN INIT INFO
# Provides: vboxadd-service
-# Required-Start: vboxadd
-# Required-Stop: vboxadd
+# Should-Start: dkms
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
+# Required-Start:
+# Required-Stop:
+# Short-Description: VirtualBox Additions Service
- # Description: VirtualBox Additions Service
- ### END INIT INFO
-
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # X-Conflicts-With: systemd-timesyncd.service
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..e3fcbf5 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.2.0
Release: 1
License: GPLv2
Group: Emulators
@@ -56,7 +56,6 @@ Source6: vboxweb.service
Source100: virtualbox.rpmlintrc
# (tpg) dkms is used to build kernel modules, so use it everywhere
Patch1: virtualbox-fix-modules-rebuild-command.patch
-Patch2: VirtualBox-4.1.8-kernelrelease.patch
Patch3: VirtualBox-4.1.8-futex.patch
Patch4: virtualbox-fix-vboxadd-req.patch
# (tmb) disable update notification (OpenSuSe)
@@ -68,7 +67,7 @@ Patch9: VirtualBox-5.0.0_BETA3-dont-check-for-mkisofs-or-makeself.patch
Patch16: virtualbox-default-to-mandriva.patch
Patch18: VirtualBox-5.1.8-gsoap-2.8.13.patch
-Patch21: VirtualBox-5.0.18-xserver_guest.patch
+Patch22: virtualbox-no-prehistoric-xfree86.patch
Patch23: VirtualBox-5.0.10-no-bundles.patch
Patch24: VirtualBox-5.0.18-xserver_guest_xorg19.patch
@@ -204,7 +203,7 @@ mv src/VBox/Additions/x11/mesa-7.2 src/VBox/Additions/x11/x11include/
rm -rf src/VBox/Additions/x11/x11stubs
rm -rf src/libs/boost-1.37.0/
#rm -rf src/libs/liblzf-3.4/
-rm -rf src/libs/libxml2-2.9.2/
+rm -rf src/libs/libxml2-2.9.4/
rm -rf src/libs/libpng-1.2.54/
rm -rf src/libs/zlib-1.2.8/
@@ -220,6 +219,7 @@ VBOX_WITH_TESTSUITE:=
VBOX_JAVA_HOME := %{java_home}
VBOX_WITHOUT_ADDITIONS_ISO := 1
VBOX_USE_SYSTEM_XORG_HEADERS := 1
+VBOX_USE_SYSTEM_GL_HEADERS := 1
XSERVER_VERSION := %{x11_server_majorver}
VBOX_BLD_PYTHON:=/usr/bin/python2
VBOX_GTAR:=
@@ -246,10 +246,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 $(pkg-config --cflags pixman-1) | sed -e 's/-fPIC//' -e 's/-Werror=format-security//'`" >> LocalConfig.kmk
+#ifarch %{ix86}
%global ldflags %{ldflags} -fuse-ld=bfd
-%endif
+#endif
echo TOOL_GCC_LDFLAGS="%{ldflags}" >> LocalConfig.kmk
%if %{build_additions}
@@ -260,7 +260,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
@@ -537,6 +537,7 @@ set -x
%{vboxlibdir}/components
%{vboxlibdir}/*.so
%{vboxlibdir}/iPxeBaseBin
+%{vboxlibdir}/UnattendedTemplates
%{vboxlibdir}/VBoxAutostart
%{vboxlibdir}/VBoxBalloonCtrl
%{vboxlibdir}/VBoxBugReport