Date: Tuesday, December 25, 2018 @ 23:37:43
Author: eworm
Revision: 418104
archrelease: copy trunk to community-x86_64
Added:
virtualbox/repos/community-x86_64/002-dri-driver-path.patch
(from rev 418103, virtualbox/trunk/002-dri-driver-path.patch)
virtualbox/repos/community-x86_64/005-gsoap-build.patch
(from rev 418103, virtualbox/trunk/005-gsoap-build.patch)
virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch
(from rev 418103, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch)
virtualbox/repos/community-x86_64/008-no-vboxvideo.patch
(from rev 418103, virtualbox/trunk/008-no-vboxvideo.patch)
virtualbox/repos/community-x86_64/009-include-path.patch
(from rev 418103, virtualbox/trunk/009-include-path.patch)
virtualbox/repos/community-x86_64/010-qt-5.11.patch
(from rev 418103, virtualbox/trunk/010-qt-5.11.patch)
virtualbox/repos/community-x86_64/011-python-3-7.patch
(from rev 418103, virtualbox/trunk/011-python-3-7.patch)
virtualbox/repos/community-x86_64/012-linux-4-20.patch
(from rev 418103, virtualbox/trunk/012-linux-4-20.patch)
virtualbox/repos/community-x86_64/101-vboxsf-automount.patch
(from rev 418103, virtualbox/trunk/101-vboxsf-automount.patch)
virtualbox/repos/community-x86_64/60-vboxdrv.rules
(from rev 418103, virtualbox/trunk/60-vboxdrv.rules)
virtualbox/repos/community-x86_64/60-vboxguest.rules
(from rev 418103, virtualbox/trunk/60-vboxguest.rules)
virtualbox/repos/community-x86_64/LocalConfig.kmk
(from rev 418103, virtualbox/trunk/LocalConfig.kmk)
virtualbox/repos/community-x86_64/PKGBUILD
(from rev 418103, virtualbox/trunk/PKGBUILD)
virtualbox/repos/community-x86_64/build.sh
(from rev 418103, virtualbox/trunk/build.sh)
virtualbox/repos/community-x86_64/mount.vboxsf
(from rev 418103, virtualbox/trunk/mount.vboxsf)
virtualbox/repos/community-x86_64/vboxreload
(from rev 418103, virtualbox/trunk/vboxreload)
virtualbox/repos/community-x86_64/vboxservice-nox.service
(from rev 418103, virtualbox/trunk/vboxservice-nox.service)
virtualbox/repos/community-x86_64/vboxservice.service
(from rev 418103, virtualbox/trunk/vboxservice.service)
virtualbox/repos/community-x86_64/vboxweb.service
(from rev 418103, virtualbox/trunk/vboxweb.service)
virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install
(from rev 418103, virtualbox/trunk/virtualbox-ext-vnc.install)
virtualbox/repos/community-x86_64/virtualbox-guest-dkms.conf
(from rev 418103, virtualbox/trunk/virtualbox-guest-dkms.conf)
virtualbox/repos/community-x86_64/virtualbox-guest-dkms.install
(from rev 418103, virtualbox/trunk/virtualbox-guest-dkms.install)
virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers
(from rev 418103, virtualbox/trunk/virtualbox-guest-utils.sysusers)
virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf
(from rev 418103, virtualbox/trunk/virtualbox-host-dkms.conf)
virtualbox/repos/community-x86_64/virtualbox-host-dkms.install
(from rev 418103, virtualbox/trunk/virtualbox-host-dkms.install)
virtualbox/repos/community-x86_64/virtualbox-vboxsf-dkms.conf
(from rev 418103, virtualbox/trunk/virtualbox-vboxsf-dkms.conf)
virtualbox/repos/community-x86_64/virtualbox.install
(from rev 418103, virtualbox/trunk/virtualbox.install)
virtualbox/repos/community-x86_64/virtualbox.sysusers
(from rev 418103, virtualbox/trunk/virtualbox.sysusers)
Deleted:
virtualbox/repos/community-x86_64/002-dri-driver-path.patch
virtualbox/repos/community-x86_64/005-gsoap-build.patch
virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch
virtualbox/repos/community-x86_64/008-no-vboxvideo.patch
virtualbox/repos/community-x86_64/009-include-path.patch
virtualbox/repos/community-x86_64/010-qt-5.11.patch
virtualbox/repos/community-x86_64/011-python-3-7.patch
virtualbox/repos/community-x86_64/012-vboxsf-automount.patch
virtualbox/repos/community-x86_64/60-vboxdrv.rules
virtualbox/repos/community-x86_64/60-vboxguest.rules
virtualbox/repos/community-x86_64/LocalConfig.kmk
virtualbox/repos/community-x86_64/PKGBUILD
virtualbox/repos/community-x86_64/build.sh
virtualbox/repos/community-x86_64/mount.vboxsf
virtualbox/repos/community-x86_64/vboxreload
virtualbox/repos/community-x86_64/vboxservice-nox.service
virtualbox/repos/community-x86_64/vboxservice.service
virtualbox/repos/community-x86_64/vboxweb.service
virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install
virtualbox/repos/community-x86_64/virtualbox-guest-dkms.conf
virtualbox/repos/community-x86_64/virtualbox-guest-dkms.install
virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers
virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf
virtualbox/repos/community-x86_64/virtualbox-host-dkms.install
virtualbox/repos/community-x86_64/virtualbox-vboxsf-dkms.conf
virtualbox/repos/community-x86_64/virtualbox.install
virtualbox/repos/community-x86_64/virtualbox.sysusers
-------------------------------------+
002-dri-driver-path.patch | 60 +-
005-gsoap-build.patch | 22
006-rdesktop-vrdp-keymap-path.patch | 24 -
008-no-vboxvideo.patch | 24 -
009-include-path.patch | 170 +++----
010-qt-5.11.patch | 22
011-python-3-7.patch | 52 +-
012-linux-4-20.patch | 131 +++++
012-vboxsf-automount.patch | 20
101-vboxsf-automount.patch | 20
60-vboxdrv.rules | 16
60-vboxguest.rules | 4
LocalConfig.kmk | 64 +-
PKGBUILD | 812 +++++++++++++++++-----------------
build.sh | 6
mount.vboxsf | 34 -
vboxreload | 74 +--
vboxservice-nox.service | 22
vboxservice.service | 24 -
vboxweb.service | 22
virtualbox-ext-vnc.install | 54 +-
virtualbox-guest-dkms.conf | 68 +-
virtualbox-guest-dkms.install | 24 -
virtualbox-guest-utils.sysusers | 2
virtualbox-host-dkms.conf | 70 +-
virtualbox-host-dkms.install | 24 -
virtualbox-vboxsf-dkms.conf | 20
virtualbox.install | 24 -
virtualbox.sysusers | 2
29 files changed, 1022 insertions(+), 889 deletions(-)
Deleted: 002-dri-driver-path.patch
===================================================================
--- 002-dri-driver-path.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 002-dri-driver-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,30 +0,0 @@
-diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-index 92b4ffc..1a1c467 100644
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-@@ -56,24 +56,8 @@ typedef enum {
-
- //#define DEBUG_DRI_CALLS
-
--/// @todo this could be different...
--#ifdef RT_ARCH_AMD64
--# ifdef RT_OS_FREEBSD
--# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--# define DRI_DEFAULT_DRIVER_DIR
"/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#else
--# ifdef RT_OS_FREEBSD
--# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--# define DRI_DEFAULT_DRIVER_DIR
"/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#endif
-
- #ifdef DEBUG_DRI_CALLS
- #define SWDRI_SHOWNAME(pext, func) \
Copied: virtualbox/repos/community-x86_64/002-dri-driver-path.patch (from rev
418103, virtualbox/trunk/002-dri-driver-path.patch)
===================================================================
--- 002-dri-driver-path.patch (rev 0)
+++ 002-dri-driver-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,30 @@
+diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+index 92b4ffc..1a1c467 100644
+--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+@@ -56,24 +56,8 @@ typedef enum {
+
+ //#define DEBUG_DRI_CALLS
+
+-/// @todo this could be different...
+-#ifdef RT_ARCH_AMD64
+-# ifdef RT_OS_FREEBSD
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+-# else
+-# define DRI_DEFAULT_DRIVER_DIR
"/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
+-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-# endif
+-#else
+-# ifdef RT_OS_FREEBSD
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+-# else
+-# define DRI_DEFAULT_DRIVER_DIR
"/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
+ # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-# endif
+-#endif
+
+ #ifdef DEBUG_DRI_CALLS
+ #define SWDRI_SHOWNAME(pext, func) \
Deleted: 005-gsoap-build.patch
===================================================================
--- 005-gsoap-build.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 005-gsoap-build.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,11 +0,0 @@
---- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628
+0100
-+++ b/src/VBox/Main/webservice/Makefile.kmk 2016-08-18 15:16:05.803599026
+0100
-@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
- $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
- $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
- $(RM) -f $@
-- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
-+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
- ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
- $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
- $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output
"$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
Copied: virtualbox/repos/community-x86_64/005-gsoap-build.patch (from rev
418103, virtualbox/trunk/005-gsoap-build.patch)
===================================================================
--- 005-gsoap-build.patch (rev 0)
+++ 005-gsoap-build.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,11 @@
+--- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628
+0100
++++ b/src/VBox/Main/webservice/Makefile.kmk 2016-08-18 15:16:05.803599026
+0100
+@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
+ $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+ $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
+ $(RM) -f $@
+- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
++ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
+ ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+ $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
+ $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output
"$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
Deleted: 006-rdesktop-vrdp-keymap-path.patch
===================================================================
--- 006-rdesktop-vrdp-keymap-path.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 006-rdesktop-vrdp-keymap-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-# 2015 © Sébastien Luttringer
---- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901
+0100
-+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600
+0100
-@@ -41,7 +41,7 @@
- EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
- HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
- HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
-- KEYMAP_PATH=$(if $(findstring
RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\"
\
-+ KEYMAP_PATH=$(if $(findstring
RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\"
\
- RDESKTOP=1
- ifdef WITH_BIRD_VD_HACKS
- rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS
Copied: virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch
(from rev 418103, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch)
===================================================================
--- 006-rdesktop-vrdp-keymap-path.patch (rev 0)
+++ 006-rdesktop-vrdp-keymap-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+# 2015 © Sébastien Luttringer
+--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901
+0100
++++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600
+0100
+@@ -41,7 +41,7 @@
+ EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
+ HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
+ HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
+- KEYMAP_PATH=$(if $(findstring
RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\"
\
++ KEYMAP_PATH=$(if $(findstring
RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\"
\
+ RDESKTOP=1
+ ifdef WITH_BIRD_VD_HACKS
+ rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS
Deleted: 008-no-vboxvideo.patch
===================================================================
--- 008-no-vboxvideo.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 008-no-vboxvideo.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
---- ./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
-@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
-
- ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
-- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
-+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
- SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_system_CFLAGS := \
Copied: virtualbox/repos/community-x86_64/008-no-vboxvideo.patch (from rev
418103, virtualbox/trunk/008-no-vboxvideo.patch)
===================================================================
--- 008-no-vboxvideo.patch (rev 0)
+++ 008-no-vboxvideo.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
+--- ./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
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+ # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
+ SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+ vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_system_CFLAGS := \
Deleted: 009-include-path.patch
===================================================================
--- 009-include-path.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 009-include-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,85 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/linux/Makefile
b/src/VBox/HostDrivers/Support/linux/Makefile
-index d199047..34d895f 100644
---- a/src/VBox/HostDrivers/Support/linux/Makefile
-+++ b/src/VBox/HostDrivers/Support/linux/Makefile
-@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
- MOD_OBJS += SUPDrvDTrace.o
- endif
-
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
- ifdef VBOX_WITH_NATIVE_DTRACE
- MOD_INCL += -I/usr/include/linux -I/usr/include
- endif
-@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
- endif
-
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
- -fno-omit-frame-pointer -fno-pie
-
- include $(obj)/Makefile.include.footer
-diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-index 694cb5c..8487820 100644
---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
- math/gcc/umoddi3.o
- endif
-
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
- -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
- -Wno-declaration-after-statement
-@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
-
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include
$(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
-
- include $(obj)/Makefile.include.footer
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-index e262c61..ca956d5 100644
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
- math/gcc/umoddi3.o
- endif
-
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
- -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
- -Wno-declaration-after-statement
-@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
-
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include
$(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie
-
- include $(obj)/Makefile.include.footer
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-index 6b3878a..7b8a8a2 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
- math/gcc/umoddi3.o
- endif
-
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
- -DRT_WITH_VBOX -DVBOX_WITH_HARDENING
- ifeq ($(BUILD_TARGET_ARCH),amd64)
-@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
-
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h
-fno-pie
-
- include $(obj)/Makefile.include.footer
Copied: virtualbox/repos/community-x86_64/009-include-path.patch (from rev
418103, virtualbox/trunk/009-include-path.patch)
===================================================================
--- 009-include-path.patch (rev 0)
+++ 009-include-path.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,85 @@
+diff --git a/src/VBox/HostDrivers/Support/linux/Makefile
b/src/VBox/HostDrivers/Support/linux/Makefile
+index d199047..34d895f 100644
+--- a/src/VBox/HostDrivers/Support/linux/Makefile
++++ b/src/VBox/HostDrivers/Support/linux/Makefile
+@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
+ MOD_OBJS += SUPDrvDTrace.o
+ endif
+
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
+ ifdef VBOX_WITH_NATIVE_DTRACE
+ MOD_INCL += -I/usr/include/linux -I/usr/include
+ endif
+@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
+ endif
+
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
++MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
+ -fno-omit-frame-pointer -fno-pie
+
+ include $(obj)/Makefile.include.footer
+diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+index 694cb5c..8487820 100644
+--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
+ MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
+ -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
+ -Wno-declaration-after-statement
+@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
+ endif
+
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
++MOD_CFLAGS = -include
$(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
+
+ include $(obj)/Makefile.include.footer
+diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+index e262c61..ca956d5 100644
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
+ MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
+ -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
+ -Wno-declaration-after-statement
+@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE
+ endif
+
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
++MOD_CFLAGS = -include
$(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie
+
+ include $(obj)/Makefile.include.footer
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+index 6b3878a..7b8a8a2 100644
+--- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux)
+ MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
+ -DRT_WITH_VBOX -DVBOX_WITH_HARDENING
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
+@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE
+ endif
+
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
++MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h
-fno-pie
+
+ include $(obj)/Makefile.include.footer
Deleted: 010-qt-5.11.patch
===================================================================
--- 010-qt-5.11.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 010-qt-5.11.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,11 +0,0 @@
-diff -u -r
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
----
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
2018-05-09 18:38:05.000000000 +0200
-+++
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
2018-06-05 21:51:18.401913367 +0200
-@@ -21,6 +21,7 @@
-
- /* Qt includes: */
- # include <QRegExpValidator>
-+# include <QButtonGroup>
-
- /* GUI includes: */
- # include "QIWidgetValidator.h"
Copied: virtualbox/repos/community-x86_64/010-qt-5.11.patch (from rev 418103,
virtualbox/trunk/010-qt-5.11.patch)
===================================================================
--- 010-qt-5.11.patch (rev 0)
+++ 010-qt-5.11.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,11 @@
+diff -u -r
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+---
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
2018-05-09 18:38:05.000000000 +0200
++++
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
2018-06-05 21:51:18.401913367 +0200
+@@ -21,6 +21,7 @@
+
+ /* Qt includes: */
+ # include <QRegExpValidator>
++# include <QButtonGroup>
+
+ /* GUI includes: */
+ # include "QIWidgetValidator.h"
Deleted: 011-python-3-7.patch
===================================================================
--- 011-python-3-7.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 011-python-3-7.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index 128da55c..c4bb08c4 100755
---- a/configure
-+++ b/configure
-@@ -1969,7 +1969,7 @@ extern "C" int main(void)
- }
- EOF
- found=
-- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4
python3.4m python3.5 python3.5m python3.6 python3.6m"
-+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
- for p in $PYTHONDIR; do
- for d in $SUPPYTHONLIBS; do
- for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
-diff --git a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-index f211c7a9..fd6811c0 100644
---- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-@@ -440,7 +440,7 @@ char *PyTraceback_AsString(PyObject *exc_tb)
- #if PY_MAJOR_VERSION <= 2
- char *tempResult = PyString_AsString(obResult);
- #else
-- char *tempResult = PyUnicode_AsUTF8(obResult);
-+ const char *tempResult = PyUnicode_AsUTF8(obResult);
- #endif
- result = (char *)PyMem_Malloc(strlen(tempResult)+1);
- if (result==NULL)
Copied: virtualbox/repos/community-x86_64/011-python-3-7.patch (from rev
418103, virtualbox/trunk/011-python-3-7.patch)
===================================================================
--- 011-python-3-7.patch (rev 0)
+++ 011-python-3-7.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,26 @@
+diff --git a/configure b/configure
+index 128da55c..c4bb08c4 100755
+--- a/configure
++++ b/configure
+@@ -1969,7 +1969,7 @@ extern "C" int main(void)
+ }
+ EOF
+ found=
+- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4
python3.4m python3.5 python3.5m python3.6 python3.6m"
++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
+ for p in $PYTHONDIR; do
+ for d in $SUPPYTHONLIBS; do
+ for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
+diff --git a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+index f211c7a9..fd6811c0 100644
+--- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+@@ -440,7 +440,7 @@ char *PyTraceback_AsString(PyObject *exc_tb)
+ #if PY_MAJOR_VERSION <= 2
+ char *tempResult = PyString_AsString(obResult);
+ #else
+- char *tempResult = PyUnicode_AsUTF8(obResult);
++ const char *tempResult = PyUnicode_AsUTF8(obResult);
+ #endif
+ result = (char *)PyMem_Malloc(strlen(tempResult)+1);
+ if (result==NULL)
Copied: virtualbox/repos/community-x86_64/012-linux-4-20.patch (from rev
418103, virtualbox/trunk/012-linux-4-20.patch)
===================================================================
--- 012-linux-4-20.patch (rev 0)
+++ 012-linux-4-20.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,131 @@
+From f37b5b726afbac660c60260b6b4cddc34da73226 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 22 Nov 2018 14:08:09 +0000
+Subject: [PATCH] iprt: adjust time-r0drv-linux.c for Linux 4.20. bugref:4567:
+ Linux kernel driver maintainance. Routine ktime_get_real_ts() must be
+ replaced by ktime_get_real_ts64(). Thank you Larry Finger for the patch.
+ (Adjusted before applying.)
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@75665
cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ include/iprt/time.h | 8 ++++++++
+ src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/include/iprt/time.h b/include/iprt/time.h
+index 080accf968..44b5f4f73b 100644
+--- a/include/iprt/time.h
++++ b/include/iprt/time.h
+@@ -428,6 +428,14 @@ DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec(PRTTIMESPEC
pTime, const struct ti
+ {
+ return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimespec->tv_sec),
pTimespec->tv_nsec);
+ }
++
++
++# ifdef _LINUX_TIME64_H
++DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const
struct timespec64 *pTimeval)
++{
++ return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec),
pTimeval->tv_nsec);
++}
++# endif
+ #endif /* various ways of detecting struct timespec */
+
+
+diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
+index 5b1baadcdd..1a9b56d339 100644
+--- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
+@@ -171,11 +171,20 @@ RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
+ {
+ IPRT_LINUX_SAVE_EFL_AC();
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
++/* On Linux 4.20, time.h includes time64.h and we have to use 64-bit times. */
++# ifdef _LINUX_TIME64_H
++ struct timespec64 Ts;
++ ktime_get_real_ts64(&Ts);
++# else
+ struct timespec Ts;
+ ktime_get_real_ts(&Ts);
++# endif
+ IPRT_LINUX_RESTORE_EFL_AC();
++# ifdef _LINUX_TIME64_H
++ return RTTimeSpecSetTimespec64(pTime, &Ts);
++#else
+ return RTTimeSpecSetTimespec(pTime, &Ts);
+-
++#endif
+ #else /* < 2.6.16 */
+ struct timeval Tv;
+ do_gettimeofday(&Tv);
+From ffc1396e3e550960da9944488e173bd0049b4825 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Fri, 23 Nov 2018 11:17:22 +0000
+Subject: [PATCH] NetAdp: Linux 4.20 compatibility fix (bugref:4567) In struct
+ ethtool_ops, the get_settings member is renamed get_link_ksettings. Inspired
+ by Larry Finger's patch. Thank you Larry Finger
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@75684
cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ .../VBoxNetAdp/linux/VBoxNetAdp-linux.c | 26 +++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+index 881103a12f..16d8996623 100644
+--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
++++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+@@ -84,7 +84,11 @@ static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
+
+ static void vboxNetAdpEthGetDrvinfo(struct net_device *dev, struct
ethtool_drvinfo *info);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
++static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct
ethtool_link_ksettings *pLinkSettings);
++#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+ static int vboxNetAdpEthGetSettings(struct net_device *dev, struct
ethtool_cmd *cmd);
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+
+
+
/*********************************************************************************************************************************
+@@ -133,7 +137,11 @@ static struct ethtool_ops gEthToolOpsVBoxNetAdp =
+ # endif
+ {
+ .get_drvinfo = vboxNetAdpEthGetDrvinfo,
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
++ .get_link_ksettings = vboxNetAdpEthGetLinkSettings,
++# else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+ .get_settings = vboxNetAdpEthGetSettings,
++# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+ .get_link = ethtool_op_get_link,
+ };
+
+@@ -205,6 +213,23 @@ static void vboxNetAdpEthGetDrvinfo(struct net_device
*pNetDev, struct ethtool_d
+ }
+
+
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
++/* ethtool_ops::get_link_ksettings */
++static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct
ethtool_link_ksettings *pLinkSettings)
++{
++ /* We just need to set field we care for, the rest is done by
ethtool_get_link_ksettings() helper in ethtool. */
++ ethtool_link_ksettings_zero_link_mode(pLinkSettings, supported);
++ ethtool_link_ksettings_zero_link_mode(pLinkSettings, advertising);
++ ethtool_link_ksettings_zero_link_mode(pLinkSettings, lp_advertising);
++ pLinkSettings->base.speed = SPEED_10;
++ pLinkSettings->base.duplex = DUPLEX_FULL;
++ pLinkSettings->base.port = PORT_TP;
++ pLinkSettings->base.phy_address = 0;
++ pLinkSettings->base.transceiver = XCVR_INTERNAL;
++ pLinkSettings->base.autoneg = AUTONEG_DISABLE;
++ return 0;
++}
++#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+ /* ethtool_ops::get_settings */
+ static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct
ethtool_cmd *cmd)
+ {
+@@ -224,6 +249,7 @@ static int vboxNetAdpEthGetSettings(struct net_device
*pNetDev, struct ethtool_c
+ cmd->maxrxpkt = 0;
+ return 0;
+ }
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
+
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
Deleted: 012-vboxsf-automount.patch
===================================================================
--- 012-vboxsf-automount.patch 2018-12-25 23:37:30 UTC (rev 418103)
+++ 012-vboxsf-automount.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,20 +0,0 @@
-This ghetto patch attempts to fix shared folder automounting for guests running
-Linux 4.16, and also suggests an alternative to mount.vboxsf.
-
-diff -uprb
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
----
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
2018-02-26 17:57:30.000000000 +0200
-+++
VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
2018-04-07 21:00:05.785735622 +0300
-@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
- "vboxsf",
- fFlags,
- &mntinf);
-+ if (r == -1 && errno == EINVAL)
-+ {
-+ /* Mainline vboxsf accepts regular mount opts. */
-+ char mount_opts[1024];
-+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770",
mntinf.gid);
-+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags,
mount_opts);
-+ }
- if (r == 0)
- {
- VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was
mounted to '%s'\n", pszShareName, pszMountPoint);
Copied: virtualbox/repos/community-x86_64/101-vboxsf-automount.patch (from rev
418103, virtualbox/trunk/101-vboxsf-automount.patch)
===================================================================
--- 101-vboxsf-automount.patch (rev 0)
+++ 101-vboxsf-automount.patch 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,20 @@
+This ghetto patch attempts to fix shared folder automounting for guests running
+Linux 4.16, and also suggests an alternative to mount.vboxsf.
+
+diff -uprb
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+---
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
2018-02-26 17:57:30.000000000 +0200
++++
VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
2018-04-07 21:00:05.785735622 +0300
+@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
+ "vboxsf",
+ fFlags,
+ &mntinf);
++ if (r == -1 && errno == EINVAL)
++ {
++ /* Mainline vboxsf accepts regular mount opts. */
++ char mount_opts[1024];
++ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770",
mntinf.gid);
++ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags,
mount_opts);
++ }
+ if (r == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was
mounted to '%s'\n", pszShareName, pszMountPoint);
Deleted: 60-vboxdrv.rules
===================================================================
--- 60-vboxdrv.rules 2018-12-25 23:37:30 UTC (rev 418103)
+++ 60-vboxdrv.rules 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,8 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
-KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root",
MODE="0600"
-
-SUBSYSTEM=="usb_device", ACTION=="add",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor
$attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor
$attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
Copied: virtualbox/repos/community-x86_64/60-vboxdrv.rules (from rev 418103,
virtualbox/trunk/60-vboxdrv.rules)
===================================================================
--- 60-vboxdrv.rules (rev 0)
+++ 60-vboxdrv.rules 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,8 @@
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root",
MODE="0600"
+
+SUBSYSTEM=="usb_device", ACTION=="add",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor
$attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor
$attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device",
RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
Deleted: 60-vboxguest.rules
===================================================================
--- 60-vboxguest.rules 2018-12-25 23:37:30 UTC (rev 418103)
+++ 60-vboxguest.rules 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root",
MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
Copied: virtualbox/repos/community-x86_64/60-vboxguest.rules (from rev 418103,
virtualbox/trunk/60-vboxguest.rules)
===================================================================
--- 60-vboxguest.rules (rev 0)
+++ 60-vboxguest.rules 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root",
MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
Deleted: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2018-12-25 23:37:30 UTC (rev 418103)
+++ LocalConfig.kmk 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,32 +0,0 @@
-# do not build test cases
-VBOX_WITH_TESTCASES :=
-VBOX_WITH_TESTSUITE :=
-VBOX_WITH_VALIDATIONKIT :=
-
-# no legacy X.org - use KMS
-VBOX_USE_SYSTEM_XORG_HEADERS = 1
-VBOX_NO_LEGACY_XORG_X11 = 1
-
-# archlinux path
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_BLD_PYTHON = python
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-
-# do not fail on warning
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
-
-# fix gsoap missing zlib include and produce errors with --as-needed
-VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
-
-# use system xorg
-VBOX_USE_SYSTEM_XORG_HEADERS = 1
-
-# no update request. update are handled via pacman
-VBOX_WITH_UPDATE_REQUEST := 0
Copied: virtualbox/repos/community-x86_64/LocalConfig.kmk (from rev 418103,
virtualbox/trunk/LocalConfig.kmk)
===================================================================
--- LocalConfig.kmk (rev 0)
+++ LocalConfig.kmk 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,32 @@
+# do not build test cases
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
+
+# no legacy X.org - use KMS
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+VBOX_NO_LEGACY_XORG_X11 = 1
+
+# archlinux path
+VBOX_WITH_ORIGIN :=
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
+VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
+VBOX_BLD_PYTHON = python
+VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+
+# do not fail on warning
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
+
+# fix gsoap missing zlib include and produce errors with --as-needed
+VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+
+# use system xorg
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+
+# no update request. update are handled via pacman
+VBOX_WITH_UPDATE_REQUEST := 0
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-25 23:37:30 UTC (rev 418103)
+++ PKGBUILD 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,405 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Ionut Biru <ib...@archlinux.org>
-
-pkgbase=virtualbox
-pkgname=('virtualbox'
- 'virtualbox-host-dkms'
- 'virtualbox-guest-dkms'
- 'virtualbox-sdk'
- 'virtualbox-guest-utils'
- 'virtualbox-guest-utils-nox'
- 'virtualbox-ext-vnc')
-pkgver=5.2.22
-pkgrel=1
-_vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
-arch=('x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('alsa-lib'
- 'bin86'
- 'cdrkit'
- 'curl'
- 'dev86'
- 'device-mapper'
- 'git'
- 'glu'
- 'gsoap'
- 'iasl'
- 'jdk7-openjdk'
- 'libidl2'
- 'libpulse'
- 'libstdc++5'
- 'libvncserver'
- 'libvpx'
- 'libxcomposite'
- 'libxcursor'
- 'libxinerama'
- 'libxml2'
- 'libxmu'
- 'libxrandr'
- 'libxslt'
- 'libxtst'
- 'linux-headers'
- 'mesa'
- 'opus'
- 'python'
- 'qt5-base'
- 'qt5-x11extras'
- 'qt5-tools'
- 'sdl'
- 'sdl_ttf'
- 'vde2'
- 'xalan-c'
- 'xf86driproto'
- 'xorg-server-devel')
-makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
-source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2";
- # We need to build a modified version of vboxsf for Linux 4.16
- # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
- "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit";
- 'virtualbox-host-dkms.conf'
- 'virtualbox-guest-dkms.conf'
- 'virtualbox-vboxsf-dkms.conf'
- 'virtualbox.sysusers'
- 'virtualbox-guest-utils.sysusers'
- '60-vboxdrv.rules'
- '60-vboxguest.rules'
- 'LocalConfig.kmk'
- 'vboxservice.service'
- 'vboxservice-nox.service'
- 'vboxweb.service'
- 'vboxreload'
- '002-dri-driver-path.patch'
- '005-gsoap-build.patch'
- '006-rdesktop-vrdp-keymap-path.patch'
- '008-no-vboxvideo.patch'
- '009-include-path.patch'
- '010-qt-5.11.patch'
- '011-python-3-7.patch'
- # The following patch and mount.vboxsf wrapper should be removed
- # once support for mainline-style options string gets upstreamed
- '012-vboxsf-automount.patch'
- 'mount.vboxsf')
-sha256sums=('5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4'
- 'SKIP'
- 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
- 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
- '43a97d07edd6f3f0e1181e84483759ad0a20c4e57ee93ca1a18530918979f9d8'
- '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
- 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
- '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
- '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
- '918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01'
- '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
- '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
- 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
- '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
- 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
- '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
- '5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
- '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
- '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
- 'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
- '9535774f1858c0ad92f0edee99875dcf683e41a4c7c95494c8aeb81591426e5a'
- 'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
- 'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
-
-prepare() {
- cd "VirtualBox-$pkgver"
-
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
- done
-
- msg2 'Applying local config'
- cp "$srcdir/LocalConfig.kmk" .
-
- msg2 'Use our CFLAGS'
- echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
-
- msg2 'Use system GL headers'
- echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-
- msg2 'Remove gcc version censorship'
- sed -i 's/^check_gcc$/#check_gcc/' configure
-}
-
-build() {
- cd "VirtualBox-$pkgver"
-
- msg2 'Build virtualbox'
- ./configure \
- --disable-docs \
- --enable-webservice \
- --enable-vde \
- --enable-vnc \
- --disable-kmods \
- --with-makeself=/usr/bin/echo
- # fake makeself binary to compile without nofatal
- # makeself is used by linux installer. we don't need it.
- source ./env.sh
- kmk
-
- msg2 'Build rdesktop-vrdp'
- kmk -C src/VBox/RDP/client-1.8.3
-
- msg2 'Build VNC extension pack'
- kmk -C src/VBox/ExtPacks/VNC packing
-}
-
-package_virtualbox() {
- pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
- depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
- 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
- 'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
- 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES')
- optdepends=('vde2: Virtual Distributed Ethernet support'
- 'virtualbox-guest-iso: Guest Additions CD image'
- 'virtualbox-ext-vnc: VNC server support'
- 'virtualbox-sdk: Developer kit')
- backup=('etc/vbox/vbox.cfg')
- replaces=('virtualbox-ose')
- conflicts=('virtualbox-ose')
- install=virtualbox.install
-
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
- # binaries
- install -dm755 "$pkgdir/usr/bin"
- install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
- for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv
VBoxBalloonCtrl; do
- ln -sf VBox "$pkgdir/usr/bin/$i"
- ln -sf VBox "$pkgdir/usr/bin/${i,,}"
- done
- install -m755 VBoxTunctl "$pkgdir/usr/bin"
- install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
-
- # libraries
- install -dm755 "$pkgdir/usr/lib/virtualbox"
- install -m755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
- ## setuid root binaries
- install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl
VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
- ## other binaries
- install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD
VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
- # components
- install -dm755 "$pkgdir/usr/lib/virtualbox/components"
- install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
- # extensions packs
- ## as virtualbox install itself stuff in this directory, move it to /var
and
- ## trick it with a symlink
- ## FIXME: trick is disabled for now
- #install -dm755 "$pkgdir/var/lib/virtualbox/extensions"
- #install -dm755 "$pkgdir/usr/share/virtualbox/extensions"
- #ln -s ../../../var/lib/virtualbox/extensions
"$pkgdir/usr/lib/virtualbox/ExtensionPacks"
- install -dm755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
-
- # languages
- install -dm755 "$pkgdir/usr/share/virtualbox/nls"
- install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
- # rdesktop keymaps
- install -dm755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
- install -m644 rdesktop-vrdp-keymaps/*
"$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-
- # useless scripts
- install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t
"$pkgdir/usr/share/virtualbox"
-
- # icons
- install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
- pushd icons >/dev/null
- for i in *; do
- install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
- cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
- done
- popd >/dev/null
-
- #desktop
- install -Dm644 virtualbox.desktop
"$pkgdir/usr/share/applications/virtualbox.desktop"
- install -Dm644 virtualbox.xml
"$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
- #install configuration
- install -dm755 "$pkgdir/etc/vbox"
- echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
- # back to srcdir
- cd "$srcdir"
-
- #licence
- install -Dm644 VirtualBox-$pkgver/COPYING
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- # install systemd stuff
- install -Dm644 60-vboxdrv.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
- install -Dm644 vboxweb.service
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
- install -Dm644 virtualbox.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
-
- # install module reloading shortcut (with a symlink with default helper)
- install -Dm755 vboxreload "$pkgdir/usr/bin"
- ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
-}
-
-package_virtualbox-sdk() {
- pkgdesc='VirtualBox Software Developer Kit (SDK)'
- depends=('python')
-
- install -dm755 "$pkgdir/usr/lib/virtualbox"
-
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
- install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
- # python sdk
- pushd sdk/installer
- VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install
--root "$pkgdir"
- popd
- cp -r sdk "$pkgdir/usr/lib/virtualbox"
- rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
- # licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_virtualbox-host-dkms() {
- pkgdesc='VirtualBox Host kernel modules sources'
- depends=('dkms' 'gcc' 'make')
- replaces=('virtualbox-source'
- 'virtualbox-host-source'
- 'virtualbox-host-modules-lts')
- conflicts=('virtualbox-source' 'virtualbox-host-source')
- provides=('VIRTUALBOX-HOST-MODULES')
- optdepends=('linux-headers: build modules against Arch kernel'
- 'linux-lts-headers: build modules against LTS kernel'
- 'linux-zen-headers: build modules against ZEN kernel')
- install=virtualbox-host-dkms.install
-
- install -dm755 "$pkgdir/usr/src"
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE"
- # licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- # module loading
- local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- install -Dm644 /dev/null "$_p"
- printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p"
- # starting vbox 5.1, dkms.conf file was dropped
- local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/$pkgname.conf" "$_p"
- sed -i "s,@VERSION@,$pkgver," "$_p"
-}
-
-package_virtualbox-guest-dkms() {
- pkgdesc='VirtualBox Guest kernel modules sources'
- depends=('dkms' 'gcc' 'make')
- replaces=('virtualbox-archlinux-source'
- 'virtualbox-guest-source'
- 'virtualbox-guest-modules-lts')
- provides=('VIRTUALBOX-GUEST-MODULES')
- conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
- optdepends=('linux-headers: build modules against Arch kernel'
- 'linux-lts-headers: build modules against LTS kernel'
- 'linux-zen-headers: build modules against ZEN kernel')
- install=virtualbox-guest-dkms.install
-
- install -dm755 "$pkgdir/usr/src"
- source "VirtualBox-$pkgver/env.sh"
- cd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
- cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
- # licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- # module loading
- local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- install -Dm644 /dev/null "$_p"
- printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
- # starting vbox 5.1, dkms.conf file was dropped
- local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/$pkgname.conf" "$_p"
- sed -i "s,@VERSION@,$pkgver," "$_p"
-
- # vboxsf module for Linux 4.16 and later
- install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
- cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
- rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"
- echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
- local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
- sed -i "s,@VERSION@,$pkgver," "$_p"
-}
-
-package_virtualbox-guest-utils() {
- pkgdesc='VirtualBox Guest userspace utilities'
- depends=('glibc' 'pam' 'libx11' 'libxcomposite'
- 'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
- 'VIRTUALBOX-GUEST-MODULES')
- replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
- conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions'
'virtualbox-guest-utils-nox')
-
- source "VirtualBox-$pkgver/env.sh"
- pushd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
- install -d "$pkgdir/usr/bin"
- install -m755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf"
"$pkgdir/usr/bin"
- install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
- install -m755 -D
"$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient
\
- "$pkgdir"/usr/bin/VBoxClient-all
- install -m644 -D
"$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop
\
- "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
- install -d "$pkgdir/usr/lib/xorg/modules/dri"
- install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
- ln -s /usr/lib/VBoxOGL.so
"$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
- install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
- popd
- # systemd stuff
- install -Dm644 60-vboxguest.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- install -Dm644 vboxservice.service
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
- install -Dm644 virtualbox-guest-utils.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
- # licence
- install -Dm644 VirtualBox-$pkgver/COPYING
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_virtualbox-guest-utils-nox() {
- pkgdesc='VirtualBox Guest userspace utilities without X support'
- depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
- conflicts=('virtualbox-guest-utils')
-
- source "VirtualBox-$pkgver/env.sh"
- pushd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
- install -d "$pkgdir/usr/bin"
- install -m755 VBoxControl VBoxService "$srcdir/mount.vboxsf"
"$pkgdir/usr/bin"
- install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
- install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
- popd
- # systemd stuff
- install -Dm644 60-vboxguest.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- install -Dm644 vboxservice-nox.service
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
- install -Dm644 virtualbox-guest-utils.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
- # licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_virtualbox-ext-vnc() {
- pkgdesc='VirtualBox VNC extension pack'
- depends=('virtualbox' 'libvncserver')
- optdepends=('tigervnc: vnc client')
- install=virtualbox-ext-vnc.install
-
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
- install -Dm644 VNC-*.vbox-extpack
"$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
- # licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=4 sw=4 et:
Copied: virtualbox/repos/community-x86_64/PKGBUILD (from rev 418103,
virtualbox/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,407 @@
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgbase=virtualbox
+pkgname=('virtualbox'
+ 'virtualbox-host-dkms'
+ 'virtualbox-guest-dkms'
+ 'virtualbox-sdk'
+ 'virtualbox-guest-utils'
+ 'virtualbox-guest-utils-nox'
+ 'virtualbox-ext-vnc')
+pkgver=5.2.22
+pkgrel=2
+_vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
+arch=('x86_64')
+url='http://virtualbox.org'
+license=('GPL' 'custom')
+makedepends=('alsa-lib'
+ 'bin86'
+ 'cdrkit'
+ 'curl'
+ 'dev86'
+ 'device-mapper'
+ 'git'
+ 'glu'
+ 'gsoap'
+ 'iasl'
+ 'jdk7-openjdk'
+ 'libidl2'
+ 'libpulse'
+ 'libstdc++5'
+ 'libvncserver'
+ 'libvpx'
+ 'libxcomposite'
+ 'libxcursor'
+ 'libxinerama'
+ 'libxml2'
+ 'libxmu'
+ 'libxrandr'
+ 'libxslt'
+ 'libxtst'
+ 'linux-headers'
+ 'mesa'
+ 'opus'
+ 'python'
+ 'qt5-base'
+ 'qt5-x11extras'
+ 'qt5-tools'
+ 'sdl'
+ 'sdl_ttf'
+ 'vde2'
+ 'xalan-c'
+ 'xf86driproto'
+ 'xorg-server-devel')
+makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
+source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2";
+ # We need to build a modified version of vboxsf for Linux 4.16
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
+ "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit";
+ 'virtualbox-host-dkms.conf'
+ 'virtualbox-guest-dkms.conf'
+ 'virtualbox-vboxsf-dkms.conf'
+ 'virtualbox.sysusers'
+ 'virtualbox-guest-utils.sysusers'
+ '60-vboxdrv.rules'
+ '60-vboxguest.rules'
+ 'LocalConfig.kmk'
+ 'vboxservice.service'
+ 'vboxservice-nox.service'
+ 'vboxweb.service'
+ 'vboxreload'
+ '002-dri-driver-path.patch'
+ '005-gsoap-build.patch'
+ '006-rdesktop-vrdp-keymap-path.patch'
+ '008-no-vboxvideo.patch'
+ '009-include-path.patch'
+ '010-qt-5.11.patch'
+ '011-python-3-7.patch'
+ '012-linux-4-20.patch'
+ # The following patch and mount.vboxsf wrapper should be removed
+ # once support for mainline-style options string gets upstreamed
+ '101-vboxsf-automount.patch'
+ 'mount.vboxsf')
+sha256sums=('5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4'
+ 'SKIP'
+ 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
+ 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
+ '43a97d07edd6f3f0e1181e84483759ad0a20c4e57ee93ca1a18530918979f9d8'
+ '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
+ 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
+ '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
+ '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
+ '918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01'
+ '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
+ '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
+ 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
+ '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
+ 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
+ '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
+ '5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
+ '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
+ '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
+ 'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
+ '9535774f1858c0ad92f0edee99875dcf683e41a4c7c95494c8aeb81591426e5a'
+ 'c9057b9846737044d2eadd7bc52c74e3a0b3598941eb3c8b06511f58227ae5bf'
+ 'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
+ 'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
+
+prepare() {
+ cd "VirtualBox-$pkgver"
+
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch ${filename##*/}"
+ patch -p1 -N -i "$srcdir/${filename##*/}"
+ fi
+ done
+
+ msg2 'Applying local config'
+ cp "$srcdir/LocalConfig.kmk" .
+
+ msg2 'Use our CFLAGS'
+ echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
+
+ msg2 'Use system GL headers'
+ echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+
+ msg2 'Remove gcc version censorship'
+ sed -i 's/^check_gcc$/#check_gcc/' configure
+}
+
+build() {
+ cd "VirtualBox-$pkgver"
+
+ msg2 'Build virtualbox'
+ ./configure \
+ --disable-docs \
+ --enable-webservice \
+ --enable-vde \
+ --enable-vnc \
+ --disable-kmods \
+ --with-makeself=/usr/bin/echo
+ # fake makeself binary to compile without nofatal
+ # makeself is used by linux installer. we don't need it.
+ source ./env.sh
+ kmk
+
+ msg2 'Build rdesktop-vrdp'
+ kmk -C src/VBox/RDP/client-1.8.3
+
+ msg2 'Build VNC extension pack'
+ kmk -C src/VBox/ExtPacks/VNC packing
+}
+
+package_virtualbox() {
+ pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
+ depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
+ 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
+ 'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
+ 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES')
+ optdepends=('vde2: Virtual Distributed Ethernet support'
+ 'virtualbox-guest-iso: Guest Additions CD image'
+ 'virtualbox-ext-vnc: VNC server support'
+ 'virtualbox-sdk: Developer kit')
+ backup=('etc/vbox/vbox.cfg')
+ replaces=('virtualbox-ose')
+ conflicts=('virtualbox-ose')
+ install=virtualbox.install
+
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+
+ # binaries
+ install -dm755 "$pkgdir/usr/bin"
+ install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
+ for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv
VBoxBalloonCtrl; do
+ ln -sf VBox "$pkgdir/usr/bin/$i"
+ ln -sf VBox "$pkgdir/usr/bin/${i,,}"
+ done
+ install -m755 VBoxTunctl "$pkgdir/usr/bin"
+ install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
+
+ # libraries
+ install -dm755 "$pkgdir/usr/lib/virtualbox"
+ install -m755 *.so "$pkgdir/usr/lib/virtualbox"
+ install -m644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+ ## setuid root binaries
+ install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl
VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
+ ## other binaries
+ install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD
VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+
+ # components
+ install -dm755 "$pkgdir/usr/lib/virtualbox/components"
+ install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+
+ # extensions packs
+ ## as virtualbox install itself stuff in this directory, move it to /var
and
+ ## trick it with a symlink
+ ## FIXME: trick is disabled for now
+ #install -dm755 "$pkgdir/var/lib/virtualbox/extensions"
+ #install -dm755 "$pkgdir/usr/share/virtualbox/extensions"
+ #ln -s ../../../var/lib/virtualbox/extensions
"$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+ install -dm755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+
+ # languages
+ install -dm755 "$pkgdir/usr/share/virtualbox/nls"
+ install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+
+ # rdesktop keymaps
+ install -dm755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+ install -m644 rdesktop-vrdp-keymaps/*
"$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+
+ # useless scripts
+ install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t
"$pkgdir/usr/share/virtualbox"
+
+ # icons
+ install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
+
+ pushd icons >/dev/null
+ for i in *; do
+ install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
+ cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
+ done
+ popd >/dev/null
+
+ #desktop
+ install -Dm644 virtualbox.desktop
"$pkgdir/usr/share/applications/virtualbox.desktop"
+ install -Dm644 virtualbox.xml
"$pkgdir/usr/share/mime/packages/virtualbox.xml"
+
+ #install configuration
+ install -dm755 "$pkgdir/etc/vbox"
+ echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
+
+ # back to srcdir
+ cd "$srcdir"
+
+ #licence
+ install -Dm644 VirtualBox-$pkgver/COPYING
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # install systemd stuff
+ install -Dm644 60-vboxdrv.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
+ install -Dm644 vboxweb.service
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
+ install -Dm644 virtualbox.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
+
+ # install module reloading shortcut (with a symlink with default helper)
+ install -Dm755 vboxreload "$pkgdir/usr/bin"
+ ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
+}
+
+package_virtualbox-sdk() {
+ pkgdesc='VirtualBox Software Developer Kit (SDK)'
+ depends=('python')
+
+ install -dm755 "$pkgdir/usr/lib/virtualbox"
+
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+
+ install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
+ # python sdk
+ pushd sdk/installer
+ VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install
--root "$pkgdir"
+ popd
+ cp -r sdk "$pkgdir/usr/lib/virtualbox"
+ rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-host-dkms() {
+ pkgdesc='VirtualBox Host kernel modules sources'
+ depends=('dkms' 'gcc' 'make')
+ replaces=('virtualbox-source'
+ 'virtualbox-host-source'
+ 'virtualbox-host-modules-lts')
+ conflicts=('virtualbox-source' 'virtualbox-host-source')
+ provides=('VIRTUALBOX-HOST-MODULES')
+ optdepends=('linux-headers: build modules against Arch kernel'
+ 'linux-lts-headers: build modules against LTS kernel'
+ 'linux-zen-headers: build modules against ZEN kernel')
+ install=virtualbox-host-dkms.install
+
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # module loading
+ local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ install -Dm644 /dev/null "$_p"
+ printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p"
+ # starting vbox 5.1, dkms.conf file was dropped
+ local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf"
+ install -Dm644 "$srcdir/$pkgname.conf" "$_p"
+ sed -i "s,@VERSION@,$pkgver," "$_p"
+}
+
+package_virtualbox-guest-dkms() {
+ pkgdesc='VirtualBox Guest kernel modules sources'
+ depends=('dkms' 'gcc' 'make')
+ replaces=('virtualbox-archlinux-source'
+ 'virtualbox-guest-source'
+ 'virtualbox-guest-modules-lts')
+ provides=('VIRTUALBOX-GUEST-MODULES')
+ conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
+ optdepends=('linux-headers: build modules against Arch kernel'
+ 'linux-lts-headers: build modules against LTS kernel'
+ 'linux-zen-headers: build modules against ZEN kernel')
+ install=virtualbox-guest-dkms.install
+
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # module loading
+ local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ install -Dm644 /dev/null "$_p"
+ printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
+ # starting vbox 5.1, dkms.conf file was dropped
+ local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
+ install -Dm644 "$srcdir/$pkgname.conf" "$_p"
+ sed -i "s,@VERSION@,$pkgver," "$_p"
+
+ # vboxsf module for Linux 4.16 and later
+ install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
+ cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
+ rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"
+ echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
+ local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
+ install -Dm644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
+ sed -i "s,@VERSION@,$pkgver," "$_p"
+}
+
+package_virtualbox-guest-utils() {
+ pkgdesc='VirtualBox Guest userspace utilities'
+ depends=('glibc' 'pam' 'libx11' 'libxcomposite'
+ 'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
+ 'VIRTUALBOX-GUEST-MODULES')
+ replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
+ conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions'
'virtualbox-guest-utils-nox')
+
+ source "VirtualBox-$pkgver/env.sh"
+ pushd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ install -d "$pkgdir/usr/bin"
+ install -m755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf"
"$pkgdir/usr/bin"
+ install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+ install -m755 -D
"$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient
\
+ "$pkgdir"/usr/bin/VBoxClient-all
+ install -m644 -D
"$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop
\
+ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
+ install -d "$pkgdir/usr/lib/xorg/modules/dri"
+ install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
+ ln -s /usr/lib/VBoxOGL.so
"$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
+ install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+ popd
+ # systemd stuff
+ install -Dm644 60-vboxguest.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm644 vboxservice.service
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm644 virtualbox-guest-utils.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+ # licence
+ install -Dm644 VirtualBox-$pkgver/COPYING
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-guest-utils-nox() {
+ pkgdesc='VirtualBox Guest userspace utilities without X support'
+ depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
+ conflicts=('virtualbox-guest-utils')
+
+ source "VirtualBox-$pkgver/env.sh"
+ pushd
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ install -d "$pkgdir/usr/bin"
+ install -m755 VBoxControl VBoxService "$srcdir/mount.vboxsf"
"$pkgdir/usr/bin"
+ install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+ install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+ popd
+ # systemd stuff
+ install -Dm644 60-vboxguest.rules
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm644 vboxservice-nox.service
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm644 virtualbox-guest-utils.sysusers
"$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-ext-vnc() {
+ pkgdesc='VirtualBox VNC extension pack'
+ depends=('virtualbox' 'libvncserver')
+ optdepends=('tigervnc: vnc client')
+ install=virtualbox-ext-vnc.install
+
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
+ install -Dm644 VNC-*.vbox-extpack
"$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=4 sw=4 et:
Deleted: build.sh
===================================================================
--- build.sh 2018-12-25 23:37:30 UTC (rev 418103)
+++ build.sh 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-multilib-build "$@" && extra-i686-build "$@"
Copied: virtualbox/repos/community-x86_64/build.sh (from rev 418103,
virtualbox/trunk/build.sh)
===================================================================
--- build.sh (rev 0)
+++ build.sh 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+multilib-build "$@" && extra-i686-build "$@"
Deleted: mount.vboxsf
===================================================================
--- mount.vboxsf 2018-12-25 23:37:30 UTC (rev 418103)
+++ mount.vboxsf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Hopefully this works as intented, supporting both pre-4.16 and newer kernels
-# https://bugs.archlinux.org/task/58272#comment168687
-
-kver_major=$(uname -r | cut -d. -f1)
-kver_minor=$(uname -r | cut -d. -f2)
-
-if ((kver_major * 100 + kver_minor < 416)); then
- exec /usr/lib/virtualbox/mount.vboxsf "$@"
-fi
-
-# mount(1) annoyingly prepends the current directory to the source
-name=${1#$PWD/}; shift
-
-# Mainline vboxsf accepts regular mount opts
-exec /usr/bin/mount -cit vboxsf "$name" "$@"
Copied: virtualbox/repos/community-x86_64/mount.vboxsf (from rev 418103,
virtualbox/trunk/mount.vboxsf)
===================================================================
--- mount.vboxsf (rev 0)
+++ mount.vboxsf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Hopefully this works as intented, supporting both pre-4.16 and newer kernels
+# https://bugs.archlinux.org/task/58272#comment168687
+
+kver_major=$(uname -r | cut -d. -f1)
+kver_minor=$(uname -r | cut -d. -f2)
+
+if ((kver_major * 100 + kver_minor < 416)); then
+ exec /usr/lib/virtualbox/mount.vboxsf "$@"
+fi
+
+# mount(1) annoyingly prepends the current directory to the source
+name=${1#$PWD/}; shift
+
+# Mainline vboxsf accepts regular mount opts
+exec /usr/bin/mount -cit vboxsf "$name" "$@"
Deleted: vboxreload
===================================================================
--- vboxreload 2018-12-25 23:37:30 UTC (rev 418103)
+++ vboxreload 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# vboxreload: shortcut to reload virtualbox host modules
-#
-# Copyright © 2016 Sébastien Luttringer
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
-
-(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
-
-modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
-
-echo -n 'Unloading modules: '
-for _m in "${modules[@]}"; do
- lsmod|grep -q "$_m" && rmmod "$_m" && echo -n "$_m "
-done
-echo
-
-echo -n 'Loading modules: '
-for _m in "${modules[@]}"; do
- modprobe "$_m" && echo -n "$_m "
-done
-echo
-
-# vim:set ts=2 sw=2 ai et:
Copied: virtualbox/repos/community-x86_64/vboxreload (from rev 418103,
virtualbox/trunk/vboxreload)
===================================================================
--- vboxreload (rev 0)
+++ vboxreload 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# vboxreload: shortcut to reload virtualbox host modules
+#
+# Copyright © 2016 Sébastien Luttringer
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+
+(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
+
+modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
+
+echo -n 'Unloading modules: '
+for _m in "${modules[@]}"; do
+ lsmod|grep -q "$_m" && rmmod "$_m" && echo -n "$_m "
+done
+echo
+
+echo -n 'Loading modules: '
+for _m in "${modules[@]}"; do
+ modprobe "$_m" && echo -n "$_m "
+done
+echo
+
+# vim:set ts=2 sw=2 ai et:
Deleted: vboxservice-nox.service
===================================================================
--- vboxservice-nox.service 2018-12-25 23:37:30 UTC (rev 418103)
+++ vboxservice-nox.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStartPre=-/usr/bin/modprobe vboxguest
-ExecStartPre=-/usr/bin/modprobe vboxsf
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
Copied: virtualbox/repos/community-x86_64/vboxservice-nox.service (from rev
418103, virtualbox/trunk/vboxservice-nox.service)
===================================================================
--- vboxservice-nox.service (rev 0)
+++ vboxservice-nox.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,11 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxsf
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target
Deleted: vboxservice.service
===================================================================
--- vboxservice.service 2018-12-25 23:37:30 UTC (rev 418103)
+++ vboxservice.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStartPre=-/usr/bin/modprobe vboxguest
-ExecStartPre=-/usr/bin/modprobe vboxvideo
-ExecStartPre=-/usr/bin/modprobe vboxsf
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
Copied: virtualbox/repos/community-x86_64/vboxservice.service (from rev 418103,
virtualbox/trunk/vboxservice.service)
===================================================================
--- vboxservice.service (rev 0)
+++ vboxservice.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxvideo
+ExecStartPre=-/usr/bin/modprobe vboxsf
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target
Deleted: vboxweb.service
===================================================================
--- vboxweb.service 2018-12-25 23:37:30 UTC (rev 418103)
+++ vboxweb.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Web Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/vboxweb.pid
-ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
-
-[Install]
-WantedBy=multi-user.target
Copied: virtualbox/repos/community-x86_64/vboxweb.service (from rev 418103,
virtualbox/trunk/vboxweb.service)
===================================================================
--- vboxweb.service (rev 0)
+++ vboxweb.service 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,11 @@
+[Unit]
+Description=VirtualBox Web Service
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/vboxweb.pid
+ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
+
+[Install]
+WantedBy=multi-user.target
Deleted: virtualbox-ext-vnc.install
===================================================================
--- virtualbox-ext-vnc.install 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-ext-vnc.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-post_install() {
- EXTPACK="/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack"
- ACCEPT="$(bsdtar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt |
sha256sum | head --bytes=64)"
- VBoxManage extpack install "${EXTPACK}" --accept-license="${ACCEPT}"
>/dev/null
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- pre_remove "$2"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install "$1"
-}
-
-# arg 1: the old package version
-pre_remove() {
- VBoxManage extpack uninstall 'VNC' >/dev/null
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install (from rev
418103, virtualbox/trunk/virtualbox-ext-vnc.install)
===================================================================
--- virtualbox-ext-vnc.install (rev 0)
+++ virtualbox-ext-vnc.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ EXTPACK="/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack"
+ ACCEPT="$(bsdtar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt |
sha256sum | head --bytes=64)"
+ VBoxManage extpack install "${EXTPACK}" --accept-license="${ACCEPT}"
>/dev/null
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ VBoxManage extpack uninstall 'VNC' >/dev/null
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox-guest-dkms.conf
===================================================================
--- virtualbox-guest-dkms.conf 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-guest-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,34 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="vboxguest"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-# Build only for kernels before Linux 4.16
-BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
-
-BUILT_MODULE_NAME[0]="vboxguest"
-BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
-
-BUILT_MODULE_NAME[1]="vboxsf"
-BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
-
-BUILT_MODULE_NAME[2]="vboxvideo"
-BUILT_MODULE_LOCATION[2]="vboxvideo"
-DEST_MODULE_LOCATION[2]="/kernel/misc"
Copied: virtualbox/repos/community-x86_64/virtualbox-guest-dkms.conf (from rev
418103, virtualbox/trunk/virtualbox-guest-dkms.conf)
===================================================================
--- virtualbox-guest-dkms.conf (rev 0)
+++ virtualbox-guest-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,34 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxguest"
+PACKAGE_VERSION=@VERSION@_OSE
+AUTOINSTALL=yes
+
+# Build only for kernels before Linux 4.16
+BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
+
+BUILT_MODULE_NAME[0]="vboxguest"
+BUILT_MODULE_LOCATION[0]="vboxguest"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+
+BUILT_MODULE_NAME[1]="vboxsf"
+BUILT_MODULE_LOCATION[1]="vboxsf"
+DEST_MODULE_LOCATION[1]="/kernel/misc"
+
+BUILT_MODULE_NAME[2]="vboxvideo"
+BUILT_MODULE_LOCATION[2]="vboxvideo"
+DEST_MODULE_LOCATION[2]="/kernel/misc"
Deleted: virtualbox-guest-dkms.install
===================================================================
--- virtualbox-guest-dkms.install 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-guest-dkms.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( $(vercmp $2 5.0.16-3) < 0 )); then
- echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by
systemd-modules-load.'
- echo '==> Read modules-load.d man page to disable them.'
- fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox/repos/community-x86_64/virtualbox-guest-dkms.install (from
rev 418103, virtualbox/trunk/virtualbox-guest-dkms.install)
===================================================================
--- virtualbox-guest-dkms.install (rev 0)
+++ virtualbox-guest-dkms.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( $(vercmp $2 5.0.16-3) < 0 )); then
+ echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by
systemd-modules-load.'
+ echo '==> Read modules-load.d man page to disable them.'
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox-guest-utils.sysusers
===================================================================
--- virtualbox-guest-utils.sysusers 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-guest-utils.sysusers 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1 +0,0 @@
-g vboxsf 109 -
Copied: virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers (from
rev 418103, virtualbox/trunk/virtualbox-guest-utils.sysusers)
===================================================================
--- virtualbox-guest-utils.sysusers (rev 0)
+++ virtualbox-guest-utils.sysusers 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1 @@
+g vboxsf 109 -
Deleted: virtualbox-host-dkms.conf
===================================================================
--- virtualbox-host-dkms.conf 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-host-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,35 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="vboxhost"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-BUILT_MODULE_NAME[0]="vboxdrv"
-BUILT_MODULE_LOCATION[0]="vboxdrv"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
-
-BUILT_MODULE_NAME[1]="vboxnetflt"
-BUILT_MODULE_LOCATION[1]="vboxnetflt"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
-
-BUILT_MODULE_NAME[2]="vboxnetadp"
-BUILT_MODULE_LOCATION[2]="vboxnetadp"
-DEST_MODULE_LOCATION[2]="/kernel/misc"
-
-BUILT_MODULE_NAME[3]="vboxpci"
-BUILT_MODULE_LOCATION[3]="vboxpci"
-DEST_MODULE_LOCATION[3]="/kernel/misc"
Copied: virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf (from rev
418103, virtualbox/trunk/virtualbox-host-dkms.conf)
===================================================================
--- virtualbox-host-dkms.conf (rev 0)
+++ virtualbox-host-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,35 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxhost"
+PACKAGE_VERSION=@VERSION@_OSE
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="vboxdrv"
+BUILT_MODULE_LOCATION[0]="vboxdrv"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+
+BUILT_MODULE_NAME[1]="vboxnetflt"
+BUILT_MODULE_LOCATION[1]="vboxnetflt"
+DEST_MODULE_LOCATION[1]="/kernel/misc"
+
+BUILT_MODULE_NAME[2]="vboxnetadp"
+BUILT_MODULE_LOCATION[2]="vboxnetadp"
+DEST_MODULE_LOCATION[2]="/kernel/misc"
+
+BUILT_MODULE_NAME[3]="vboxpci"
+BUILT_MODULE_LOCATION[3]="vboxpci"
+DEST_MODULE_LOCATION[3]="/kernel/misc"
Deleted: virtualbox-host-dkms.install
===================================================================
--- virtualbox-host-dkms.install 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-host-dkms.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( $(vercmp $2 5.0.16-3) < 0 )); then
- echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by
systemd-modules-load.'
- echo '==> Read modules-load.d man page to disable them.'
- fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox/repos/community-x86_64/virtualbox-host-dkms.install (from
rev 418103, virtualbox/trunk/virtualbox-host-dkms.install)
===================================================================
--- virtualbox-host-dkms.install (rev 0)
+++ virtualbox-host-dkms.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( $(vercmp $2 5.0.16-3) < 0 )); then
+ echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by
systemd-modules-load.'
+ echo '==> Read modules-load.d man page to disable them.'
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox-vboxsf-dkms.conf
===================================================================
--- virtualbox-vboxsf-dkms.conf 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox-vboxsf-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,10 +0,0 @@
-PACKAGE_NAME="vboxsf"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-# Build only for Linux 4.16 and later (until it gets upstreamed...)
-BUILD_EXCLUSIVE_KERNEL="^(4\.1[6-9]\..*|5\..*)"
-
-BUILT_MODULE_NAME[0]="vboxsf"
-BUILT_MODULE_LOCATION[0]="vboxsf"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
Copied: virtualbox/repos/community-x86_64/virtualbox-vboxsf-dkms.conf (from rev
418103, virtualbox/trunk/virtualbox-vboxsf-dkms.conf)
===================================================================
--- virtualbox-vboxsf-dkms.conf (rev 0)
+++ virtualbox-vboxsf-dkms.conf 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,10 @@
+PACKAGE_NAME="vboxsf"
+PACKAGE_VERSION=@VERSION@_OSE
+AUTOINSTALL=yes
+
+# Build only for Linux 4.16 and later (until it gets upstreamed...)
+BUILD_EXCLUSIVE_KERNEL="^(4\.1[6-9]\..*|5\..*)"
+
+BUILT_MODULE_NAME[0]="vboxsf"
+BUILT_MODULE_LOCATION[0]="vboxsf"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
Deleted: virtualbox.install
===================================================================
--- virtualbox.install 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( $(vercmp $2 5.0.16-1) < 0 )); then
- echo '==> Since version 5.0.14-2 kernel modules are provided via dkms'
- echo '==> Check you have the headers matching your kernel installed'
- fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox/repos/community-x86_64/virtualbox.install (from rev 418103,
virtualbox/trunk/virtualbox.install)
===================================================================
--- virtualbox.install (rev 0)
+++ virtualbox.install 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( $(vercmp $2 5.0.16-1) < 0 )); then
+ echo '==> Since version 5.0.14-2 kernel modules are provided via dkms'
+ echo '==> Check you have the headers matching your kernel installed'
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox.sysusers
===================================================================
--- virtualbox.sysusers 2018-12-25 23:37:30 UTC (rev 418103)
+++ virtualbox.sysusers 2018-12-25 23:37:43 UTC (rev 418104)
@@ -1 +0,0 @@
-g vboxusers 108 -
Copied: virtualbox/repos/community-x86_64/virtualbox.sysusers (from rev 418103,
virtualbox/trunk/virtualbox.sysusers)
===================================================================
--- virtualbox.sysusers (rev 0)
+++ virtualbox.sysusers 2018-12-25 23:37:43 UTC (rev 418104)
@@ -0,0 +1 @@
+g vboxusers 108 -
