commit ee709a95bcbbee07259c92d88bd95a37250f40e5 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Mon Aug 31 16:06:49 2020 +0100 Update to 1.63 kernel-5.3.patch | 69 ----------------------------------------- kernel-5.4.patch | 22 ------------- kernel-5.5.patch | 72 ------------------------------------------- kernel-5.6.patch | 85 --------------------------------------------------- kernel-5.8.patch | 45 +++++++++++++++++++++++++++ ndiswrapper-kmod.spec | 16 +++++----- sources | 2 +- 7 files changed, 53 insertions(+), 258 deletions(-) --- diff --git a/kernel-5.8.patch b/kernel-5.8.patch new file mode 100644 index 0000000..95b9f2a --- /dev/null +++ b/kernel-5.8.patch @@ -0,0 +1,45 @@ +--- a/driver/loader.c 2020-05-03 13:18:33.000000000 +0100 ++++ b/driver/loader.c 2020-08-31 15:43:53.379776002 +0100 +@@ -155,8 +155,12 @@ static int load_sys_files(struct wrap_dr + #elif defined PAGE_KERNEL_EXEC + pe_image->image = + __vmalloc(load_driver->sys_files[i].size, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++ GFP_KERNEL | __GFP_HIGHMEM); ++#else + GFP_KERNEL | __GFP_HIGHMEM, + PAGE_KERNEL_EXEC); ++#endif + #else + #error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC + #endif +--- a/driver/pe_linker.c 2020-05-03 13:18:33.000000000 +0100 ++++ b/driver/pe_linker.c 2020-08-31 15:49:48.147882380 +0100 +@@ -417,8 +417,12 @@ static int fix_pe_image(struct pe_image + image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM, + PAGE_KERNEL_EXECUTABLE); + #elif defined PAGE_KERNEL_EXEC ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM); ++#else + image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM, + PAGE_KERNEL_EXEC); ++#endif + #else + #error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC + #endif +--- a/driver/ntoskernel.c 2020-05-03 13:18:33.000000000 +0100 ++++ b/driver/ntoskernel.c 2020-08-31 15:55:47.458977337 +0100 +@@ -821,8 +821,12 @@ wstdcall void *WIN_FUNC(ExAllocatePoolWi + addr = kmalloc(size, irql_gfp()); + else { + if (irql_gfp() & GFP_ATOMIC) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++ addr = __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM); ++#else + addr = __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM, + PAGE_KERNEL); ++#endif + TRACE1("%p, %zu", addr, size); + } else { + addr = vmalloc(size); diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec index 8d83b0a..17fb3af 100644 --- a/ndiswrapper-kmod.spec +++ b/ndiswrapper-kmod.spec @@ -12,17 +12,14 @@ Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod -Version: 1.62 -Release: 2%{?pre}%{?dist} +Version: 1.63 +Release: 1%{?pre}%{?dist} License: GPLv2 URL: http://ndiswrapper.sourceforge.net Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz Source11: ndiswrapper-kmodtool-excludekernel-filterfile Patch0: ndiswrapper-kmod-nomodinfo.patch -Patch1: kernel-5.3.patch -Patch2: kernel-5.4.patch -Patch3: kernel-5.5.patch -Patch4: kernel-5.6.patch +Patch1: kernel-5.8.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -54,9 +51,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi (cd ndiswrapper-%{version}%{?pre} ; %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig -%patch3 -p1 -b .orig -%patch4 -p1 -b .orig ) sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile for kernel_version in %{?kernel_versions} ; do @@ -79,6 +73,10 @@ done %changelog +* Mon Aug 31 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.63-1 +- Update to 1.63 +- Patch for 5.8 kernel + * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.62-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 649f4c6..0b44e12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ndiswrapper-1.62.tar.gz) = a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783 +SHA512 (ndiswrapper-1.63.tar.gz) = 694802655d775ba55cfc0ec0b8c4d0cbdb659ead613d46f158eed79c8985393cf22ded757fff06b0e1a6e3c94bdaace7dd4cb1059d2960244e9f955f097fb7ad