[ndiswrapper] Update to 1.60

[Leigh Scott]

commit 6c0917037322bffb04ac12003e74358f6a3eb624
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Jun 19 23:35:54 2016 +0100

    Update to 1.60

 Fixed-compilation-issue-with-utils.patch | 47 ++++++++++++++++++++++++++++++++
 ndiswrapper.spec                         |  7 ++++-
 sources                                  |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/Fixed-compilation-issue-with-utils.patch b/Fixed-compilation-issue-with-utils.patch
new file mode 100644
index 0000000..3b29677
--- /dev/null
+++ b/Fixed-compilation-issue-with-utils.patch
@@ -0,0 +1,47 @@
+From 1a9cc0063e7c1842d565037f6b358823ea7bb1c0 Mon Sep 17 00:00:00 2001
+From: pgiri <pgiri at yahoo.com>
+Date: Sat, 14 May 2016 10:22:25 -0400
+Subject: [PATCH] Fixed compilation issue with 'utils'.
+
+loadndisdriver uses 'loader.h' which has KERNEL_VERSION macro that
+is not defined for user space. To fix this, moved the block that
+loads vmalloc.h when compiling with > 4.0 kernels in to
+ntoskernel.h (that is used only in 'driver').
+---
+ ndiswrapper/driver/loader.h     | 4 ----
+ ndiswrapper/driver/ntoskernel.h | 4 ++++
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ndiswrapper/driver/loader.h b/ndiswrapper/driver/loader.h
+index 1ea5e0c..7c3b3b0 100644
+--- a/ndiswrapper/driver/loader.h
++++ b/ndiswrapper/driver/loader.h
+@@ -16,10 +16,6 @@
+ #ifndef _LOADER_H_
+ #define _LOADER_H_
+ 
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0)
+-#include <linux/vmalloc.h>
+-#endif
+-
+ #include "ndiswrapper.h"
+ 
+ #ifndef __KERNEL__
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index 7713a78..79503f0 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -47,6 +47,10 @@
+ #include <linux/kthread.h>
+ #include <linux/workqueue.h>
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0)
++#include <linux/vmalloc.h>
++#endif
++
+ #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+ #error "this module is for x86 or x86_64 architectures only"
+ #endif
+-- 
+2.7.4
+
diff --git a/ndiswrapper.spec b/ndiswrapper.spec
index 28be758..b3f7cee 100644
--- a/ndiswrapper.spec
+++ b/ndiswrapper.spec
@@ -2,13 +2,14 @@
 
 Summary:	Ndiswrapper wraps around Windows WLAN drivers within Linux
 Name: 		ndiswrapper
-Version: 	1.59
+Version: 	1.60
 Release: 	1%{?pre}%{?dist}
 License: 	GPLv2
 Group: 		System Environment/Kernel
 URL:		http://ndiswrapper.sourceforge.net
 Source0: 	http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         Fixed-compilation-issue-with-utils.patch
 
 Provides:	%{name}-kmod-common = %{version}
 Requires:	%{name}-kmod >= %{version}
@@ -29,6 +30,7 @@ http:/ndiswrapper.sourceforge.net
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
+%patch0 -p2
 
 
 %build
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 19 2016 Leigh Scott <leigh123linux at googlemail.com> - 1.60-1
+- Update to 1.60
+
 * Sun Dec 01 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.59-1
 - Update to 1.59
 
diff --git a/sources b/sources
index 00a70a9..c76f780 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e26a7213468ccd6b0bb4c211c7aadeaa  ndiswrapper-1.59.tar.gz
+c534d8d5b0c584fabf7d397f6922c5d4  ndiswrapper-1.60.tar.gz