[arch-commits] Commit in virtualbox/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Thu Nov 23 19:33:40 UTC 2017
Date: Thursday, November 23, 2017 @ 19:33:39
Author: eworm
Revision: 268228
upgpkg: virtualbox 5.2.2-1
new upstream release
Modified:
virtualbox/trunk/002-dri-driver-path.patch
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/009-include-path.patch
virtualbox/trunk/010-linux-4-14.patch
---------------------------+
002-dri-driver-path.patch | 18 ++--
009-include-path.patch | 85 ---------------------
010-linux-4-14.patch | 172 --------------------------------------------
PKGBUILD | 12 +--
4 files changed, 14 insertions(+), 273 deletions(-)
Modified: 002-dri-driver-path.patch
===================================================================
--- 002-dri-driver-path.patch 2017-11-23 19:25:15 UTC (rev 268227)
+++ 002-dri-driver-path.patch 2017-11-23 19:33:39 UTC (rev 268228)
@@ -1,10 +1,12 @@
-# 2013 © Sébastien Luttringer
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-09-04 21:03:47.040743507 +0200
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-10-20 23:23:49.705371815 +0200
-@@ -58,23 +58,8 @@
+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...
+-/// @todo this could be different...
-#ifdef RT_ARCH_AMD64
-# ifdef RT_OS_FREEBSD
-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
@@ -11,8 +13,7 @@
-# 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_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#else
-# ifdef RT_OS_FREEBSD
@@ -20,7 +21,8 @@
-# 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_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
+ # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#endif
Deleted: 009-include-path.patch
===================================================================
--- 009-include-path.patch 2017-11-23 19:25:15 UTC (rev 268227)
+++ 009-include-path.patch 2017-11-23 19:33:39 UTC (rev 268228)
@@ -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
Deleted: 010-linux-4-14.patch
===================================================================
--- 010-linux-4-14.patch 2017-11-23 19:25:15 UTC (rev 268227)
+++ 010-linux-4-14.patch 2017-11-23 19:33:39 UTC (rev 268228)
@@ -1,172 +0,0 @@
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
-index c23e791..46d1f14 100644
---- a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -151,10 +151,6 @@ static int vbox_set_view(struct drm_crtc *crtc)
- return 0;
- }
-
--static void vbox_crtc_load_lut(struct drm_crtc *crtc)
--{
--}
--
- static void vbox_crtc_dpms(struct drm_crtc *crtc, int mode)
- {
- struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-@@ -348,7 +344,6 @@ static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = {
- .mode_set = vbox_crtc_mode_set,
- /* .mode_set_base = vbox_crtc_mode_set_base, */
- .disable = vbox_crtc_disable,
-- .load_lut = vbox_crtc_load_lut,
- .prepare = vbox_crtc_prepare,
- .commit = vbox_crtc_commit,
- };
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-index 057b7c6..28db48c 100644
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -737,9 +737,6 @@ static struct sk_buff *vboxNetFltLinuxSkBufFromSG(PVBOXNETFLTINS pThis, PINTNETS
- case PDMNETWORKGSOTYPE_IPV4_TCP:
- fGsoType = SKB_GSO_TCPV4;
- break;
-- case PDMNETWORKGSOTYPE_IPV4_UDP:
-- fGsoType = SKB_GSO_UDP;
-- break;
- case PDMNETWORKGSOTYPE_IPV6_TCP:
- fGsoType = SKB_GSO_TCPV6;
- break;
-@@ -1273,7 +1270,7 @@ static bool vboxNetFltLinuxCanForwardAsGso(PVBOXNETFLTINS pThis, struct sk_buff
- * Check the GSO properties of the socket buffer and make sure it fits.
- */
- /** @todo Figure out how to handle SKB_GSO_TCP_ECN! */
-- if (RT_UNLIKELY( skb_shinfo(pSkb)->gso_type & ~(SKB_GSO_UDP | SKB_GSO_DODGY | SKB_GSO_TCPV6 | SKB_GSO_TCPV4) ))
-+ if (RT_UNLIKELY( skb_shinfo(pSkb)->gso_type & ~(SKB_GSO_DODGY | SKB_GSO_TCPV6 | SKB_GSO_TCPV4) ))
- {
- Log5(("vboxNetFltLinuxCanForwardAsGso: gso_type=%#x\n", skb_shinfo(pSkb)->gso_type));
- return false;
-@@ -1523,7 +1520,7 @@ static void vboxNetFltLinuxForwardToIntNetInner(PVBOXNETFLTINS pThis, struct sk_
- }
- #endif /* !VBOXNETFLT_SG_SUPPORT */
- # ifdef VBOXNETFLT_WITH_GSO_RECV
-- if ( (skb_shinfo(pBuf)->gso_type & (SKB_GSO_UDP | SKB_GSO_TCPV6 | SKB_GSO_TCPV4))
-+ if ( (skb_shinfo(pBuf)->gso_type & (SKB_GSO_TCPV6 | SKB_GSO_TCPV4))
- && vboxNetFltLinuxCanForwardAsGso(pThis, pBuf, fSrc, &GsoCtx) )
- vboxNetFltLinuxForwardAsGso(pThis, pBuf, fSrc, &GsoCtx);
- else
-@@ -1699,17 +1696,9 @@ static void vboxNetFltLinuxReportNicGsoCapabilities(PVBOXNETFLTINS pThis)
- fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP);
- if (fFeatures & NETIF_F_TSO6)
- fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP);
--# if 0 /** @todo GSO: Test UDP offloading (UFO) on linux. */
-- if (fFeatures & NETIF_F_UFO)
-- fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP);
-- if (fFeatures & NETIF_F_UFO)
-- fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP);
--# endif
- Log3(("vboxNetFltLinuxReportNicGsoCapabilities: reporting wire %s%s%s%s\n",
- (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP)) ? "tso " : "",
-- (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)) ? "tso6 " : "",
-- (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP)) ? "ufo " : "",
-- (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP)) ? "ufo6 " : ""));
-+ (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)) ? "tso6 " : ""));
- pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, fGsoCapabilites, INTNETTRUNKDIR_WIRE);
- }
-
-@@ -2402,15 +2391,11 @@ int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
- */
- /** @todo duplicate work here now? Attach */
- #if defined(VBOXNETFLT_WITH_GSO_XMIT_HOST)
-- Log3(("vboxNetFltOsConnectIt: reporting host tso tso6 ufo\n"));
-+ Log3(("vboxNetFltOsConnectIt: reporting host tso tso6\n"));
- pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort,
- 0
- | RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP)
- | RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)
-- | RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP)
--# if 0 /** @todo GSO: Test UDP offloading (UFO) on linux. */
-- | RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP)
--# endif
- , INTNETTRUNKDIR_HOST);
-
- #endif
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.c b/src/VBox/Additions/linux/drm/vbox_drv.c
-index 54fd28f..affb5a0 100644
---- a/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -272,7 +272,9 @@ static struct drm_driver driver = {
- .master_set = vbox_master_set,
- .master_drop = vbox_master_drop,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- .set_busid = drm_pci_set_busid,
-+# endif
- #endif
-
- .fops = &vbox_fops,
-@@ -307,7 +309,7 @@ static struct drm_driver driver = {
-
- static int __init vbox_init(void)
- {
--#ifdef CONFIG_VGA_CONSOLE
-+#ifdef CONFIG_VGA_CONSOLE || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- if (vgacon_text_force() && vbox_modeset == -1)
- return -EINVAL;
- #endif
-@@ -315,12 +317,12 @@ static int __init vbox_init(void)
- if (vbox_modeset == 0)
- return -EINVAL;
-
-- return drm_pci_init(&driver, &vbox_pci_driver);
-+ return pci_register_driver(&vbox_pci_driver);
- }
-
- static void __exit vbox_exit(void)
- {
-- drm_pci_exit(&driver, &vbox_pci_driver);
-+ pci_unregister_driver(&vbox_pci_driver);
- }
-
- module_init(vbox_init);
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
-index 178a727..fa52335 100644
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -338,22 +338,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- return 0;
- }
-
--static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
-- u16 blue, int regno)
--{
--}
--
--static void vbox_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
-- u16 *blue, int regno)
--{
-- *red = regno;
-- *green = regno;
-- *blue = regno;
--}
--
- static struct drm_fb_helper_funcs vbox_fb_helper_funcs = {
-- .gamma_set = vbox_fb_gamma_set,
-- .gamma_get = vbox_fb_gamma_get,
- .fb_probe = vboxfb_create,
- };
-
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index 3a3f00a..e7b3a69 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -357,7 +357,11 @@ static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsign
-
- fs_save = get_fs();
- set_fs(get_ds());
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+ ret = kernel_write(file, data, size, &offset);
-+#else
- ret = vfs_write(file, data, size, &offset);
-+#endif
- set_fs(fs_save);
- if (ret < 0)
- printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-23 19:25:15 UTC (rev 268227)
+++ PKGBUILD 2017-11-23 19:33:39 UTC (rev 268228)
@@ -10,8 +10,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.2.0
-pkgrel=3
+pkgver=5.2.2
+pkgrel=1
arch=('x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -68,10 +68,8 @@
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
'008-no-vboxvideo.patch'
- '009-include-path.patch'
- '010-linux-4-14.patch'
)
-sha256sums=('26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54'
+sha256sums=('35ab0c307feedbd9191c14ed4056b46a85bea1918b0c0c40616f0470991bc017'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
'113f9b92141b85df01f1e74d22f01d1f1aa81650eb79b89ceefc3cae20afe2e2'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
@@ -83,13 +81,11 @@
'01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
'2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
- 'ee54fe188e27b6e80e2044ea9ba1874db2ca2c026ad04f393be1be69c18d440d'
+ 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
'7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
'5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
'6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
- '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
- '23b525a7dde26b81aabe4699069872c43d502c2ca957646b7d75f22cd8afd535'
)
prepare() {
More information about the arch-commits
mailing list