Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35086b64d6663922705731cab27400bdfbd62315
commit 35086b64d6663922705731cab27400bdfbd62315 Author: crazy <[email protected]> Date: Sat Nov 25 15:24:51 2017 +0100 virtualbox-5.2.2-1-x86_64 * Version bump diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 4031b45..14b3e17 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -11,9 +11,9 @@ USE_VBOX_DEBUG=${USE_VBOX_DEBUG:-"n"} pkgname=virtualbox realname=VirtualBox -pkgver=5.2.0 +pkgver=5.2.2 pkgextra= -pkgrel=12 +pkgrel=1 pkgdesc="Oracle VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'libidl' 'sdl' \ @@ -32,7 +32,6 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver 60-vboxguest.rules \ vboxservice.service \ virtualbox-guest-utils.conf \ - fixes_for_4.14.patch \ depmod.patch) _F_kernelmod_scriptlet="$startdir/$pkgname.install" @@ -48,13 +47,12 @@ Finclude kernel-module options=('scriptlet' 'nostrip' 'genscriptlet') ## we strip manually in build() _F_cd_path="${realname}-${pkgver}" -sha1sums=('875704b2bbea3eb8161b7277b10df3dea5a748e2' \ +sha1sums=('d523d30d36cc4a4456eb7ab50f33a58a3f87c022' \ 'aa931ae19edd8585150738f0efd8fedf5175a6d3' \ '1ecb406b349e519be28a16353682d3cd5dad175a' \ '08199d8e7906cb793277b798805d38ce386460d8' \ '28fb53322691d32a82de87e63672229ea5b7159e' \ '80ba54b1e13f0e8f53a84ca3f25df617fb53ae4c' \ - '2b3c5c1bd60e2d98a6406a5b9e87d6de883f77e4' \ '4cd9c9ca67626d184136d95d82c28556e5e3e55e') subpkgs=("$pkgname-modules") diff --git a/source/xapps-extra/virtualbox/fixes_for_4.14.patch b/source/xapps-extra/virtualbox/fixes_for_4.14.patch deleted file mode 100644 index 2eb47a9..0000000 --- a/source/xapps-extra/virtualbox/fixes_for_4.14.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2017-10-18 09:12:45.000000000 +0200 -+++ VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2017-11-13 11:39:13.752215042 +0100 -@@ -139,6 +139,10 @@ - # define bstats stats - # define qstats stats - # endif -+#endif -+ -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+#define SKB_GSO_UDP 0 - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -@@ -737,9 +741,11 @@ - case PDMNETWORKGSOTYPE_IPV4_TCP: - fGsoType = SKB_GSO_TCPV4; - break; -+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) - case PDMNETWORKGSOTYPE_IPV4_UDP: - fGsoType = SKB_GSO_UDP; - break; -+#endif - case PDMNETWORKGSOTYPE_IPV6_TCP: - fGsoType = SKB_GSO_TCPV6; - break; -diff -Naur VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ---- VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c 2017-10-18 09:12:46.000000000 +0200 -+++ VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c 2017-11-13 11:39:13.501215050 +0100 -@@ -353,12 +353,17 @@ - static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size) - { - int ret; -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ -+ ret = kernel_write(file, data, size, &offset); -+#else - mm_segment_t fs_save; - - fs_save = get_fs(); - set_fs(get_ds()); - ret = vfs_write(file, data, size, &offset); - set_fs(fs_save); -+#endif - if (ret < 0) - printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret); - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
