fix build kernel-4.2

kernel/drivers/ndiswrapper/actions.py

@@ -14,7 +14,8 @@ KDIR = kerneltools.getKernelVersion()
 
 def build():
     shelltools.system("patch -p1 < ndiswrapper-1.59.patch")
-
+    shelltools.system("patch -p1 < kernel-4.2.patch")
+    
     autotools.make("-C driver KVERS_UNAME=%s" % KDIR)
 
     autotools.make("-C utils")

kernel/drivers/ndiswrapper/files/kernel-4.2.patch

@@ -0,0 +1,33 @@
+diff -Npur "ndiswrapper-1 .59.orig/driver/loader.c" "ndiswrapper-1 .59/driver/loader.c"
+--- "ndiswrapper-1 .59.orig/driver/loader.c"	2013-11-28 20:42:35.000000000 +0100
++++ "ndiswrapper-1 .59/driver/loader.c"	2015-08-01 18:25:08.302141265 +0200
+@@ -22,6 +22,7 @@
+ #include <linux/kmod.h>
+ #include <linux/miscdevice.h>
+ #include <asm/uaccess.h>
++#include <linux/vmalloc.h>
+ 
+ /*
+   Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318}
+diff -Npur "ndiswrapper-1 .59.orig/driver/ntoskernel.c" "ndiswrapper-1 .59/driver/ntoskernel.c"
+--- "ndiswrapper-1 .59.orig/driver/ntoskernel.c"	2013-11-28 20:42:36.000000000 +0100
++++ "ndiswrapper-1 .59/driver/ntoskernel.c"	2015-08-01 18:24:55.895942032 +0200
+@@ -19,6 +19,7 @@
+ #include "pnp.h"
+ #include "loader.h"
+ #include "ntoskernel_exports.h"
++#include <linux/vmalloc.h>
+ 
+ /* MDLs describe a range of virtual address with an array of physical
+  * pages right after the header. For different ranges of virtual
+diff -Npur "ndiswrapper-1 .59.orig/driver/pe_linker.c" "ndiswrapper-1 .59/driver/pe_linker.c"
+--- "ndiswrapper-1 .59.orig/driver/pe_linker.c"	2013-11-28 20:42:36.000000000 +0100
++++ "ndiswrapper-1 .59/driver/pe_linker.c"	2015-08-01 18:28:37.992752176 +0200
+@@ -25,6 +25,7 @@
+ //#define DEBUGLINKER 2
+ 
+ #include "ntoskernel.h"
++#include <linux/vmalloc.h>
+ 
+ #endif
+ 

kernel/drivers/ndiswrapper/pspec.xml

@@ -15,20 +15,21 @@
         <Description>module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers.</Description>
         <Archive sha1sum="75fbbda677fe91ee07a6f6a8e19b1f3e2479540f" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz</Archive>
         <BuildDependencies>
-             <Dependency version="4.1.8">kernel-module-headers</Dependency>
+             <Dependency version="4.2.2">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch>support_kernel-4.0.patch</Patch>
         </Patches>
          <AdditionalFiles>
             <AdditionalFile target="ndiswrapper-1.59.patch">ndiswrapper-1.59.patch</AdditionalFile>
+            <AdditionalFile target="kernel-4.2.patch">kernel-4.2.patch</AdditionalFile>
         </AdditionalFiles>
     </Source>
 
     <Package>
         <Name>ndiswrapper</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.8">kernel</Dependency>
+            <Dependency version="4.2.2">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -43,7 +44,14 @@
         </BuildFlags>
     </Package>
 
-    <History>
+    <History>        
+        <Update release="4">
+            <Date>2014-10-01</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2014-09-23</Date>
             <Version>1.59</Version>