diff --git a/srcpkgs/virtualbox-ose/patches/006-rdesktop-vrdp-keymap-path.patch b/srcpkgs/virtualbox-ose/patches/006-rdesktop-vrdp-keymap-path.patch deleted file mode 100644 index d26677b6b07..00000000000 --- a/srcpkgs/virtualbox-ose/patches/006-rdesktop-vrdp-keymap-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/VBox/RDP/client-1.8.3/Makefile.kmk.orig 2015-05-14 07:23:17.351248014 +0200 -+++ src/VBox/RDP/client-1.8.3/Makefile.kmk 2015-05-14 07:23:34.138442785 +0200 -@@ -41,7 +41,7 @@ rdesktop-vrdp_DEFS = \ - 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 diff --git a/srcpkgs/virtualbox-ose/patches/adjust-time.patch b/srcpkgs/virtualbox-ose/patches/adjust-time.patch deleted file mode 100644 index ded11eb4148..00000000000 --- a/srcpkgs/virtualbox-ose/patches/adjust-time.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f37b5b726afbac660c60260b6b4cddc34da73226 Mon Sep 17 00:00:00 2001 -From: vboxsync -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 ---- - trunk/include/iprt/time.h | 8 ++++++++ - trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c | 11 ++++++++++- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/trunk/include/iprt/time.h b/trunk/include/iprt/time.h -index 080accf968..44b5f4f73b 100644 ---- include/iprt/time.h -+++ 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/trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c -index 5b1baadcdd..1a9b56d339 100644 ---- src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c -+++ 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); diff --git a/srcpkgs/virtualbox-ose/patches/fix-network.patch b/srcpkgs/virtualbox-ose/patches/fix-network.patch deleted file mode 100644 index 5ba116f3c9c..00000000000 --- a/srcpkgs/virtualbox-ose/patches/fix-network.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ffc1396e3e550960da9944488e173bd0049b4825 Mon Sep 17 00:00:00 2001 -From: vboxsync -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/trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c -index 881103a12f..16d8996623 100644 ---- src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c -+++ 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) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index daaceaf562c..db55c63bda6 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,7 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=5.2.22 -revision=2 +version=6.0.2 +revision=1 wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " @@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0" homepage="https://www.virtualbox.org" changelog="https://www.virtualbox.org/wiki/Changelog" distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2" -checksum=5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4 +checksum=fa31b4c6cf94ac908cf89d290cab5795c86d6307cd3857b31ae85faa1eaf0c81 nopie=yes lib32disabled=yes @@ -75,11 +75,11 @@ do_install() { install -m0644 *.rc *.r0 *.fd ${DESTDIR}/usr/lib/virtualbox # setuid - install -m4755 VBoxHeadless VBoxSDL VBoxNetDHCP VBoxNetAdpCtl \ - VirtualBox -t ${DESTDIR}/usr/lib/virtualbox + install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl \ + VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox - install -m0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD \ - VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \ + install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \ + VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \ -t ${DESTDIR}/usr/lib/virtualbox # locales