[arch-commits] Commit in ndiswrapper-arch/trunk (PKGBUILD linux-5.0.patch)

[Jan Steffens]

    Date: Monday, March 4, 2019 @ 21:10:35
  Author: heftig
Revision: 437631

1.61-14: kernel 5.0.arch1-1

Added:
  ndiswrapper-arch/trunk/linux-5.0.patch
Modified:
  ndiswrapper-arch/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 ++++++------
 linux-5.0.patch |   25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-04 21:10:24 UTC (rev 437630)
+++ PKGBUILD	2019-03-04 21:10:35 UTC (rev 437631)
@@ -4,7 +4,7 @@
 pkgname=ndiswrapper-arch
 pkgver=1.61
 _extramodules=extramodules-ARCH
-pkgrel=13
+pkgrel=14
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors, kernel module for Arch kernel"
 arch=('x86_64')
 url="http://sourceforge.net/projects/ndiswrapper/"
@@ -14,19 +14,19 @@
 provides=('NDISWRAPPER-MODULE')
 replaces=('ndiswrapper-module')
 source=("ndiswrapper-$pkgver.tar.gz::https://github.com/pgiri/ndiswrapper/archive/v$pkgver.tar.gz"
-        'linux-4.11.patch' 'linux-4.13.patch' 'linux-4.15.patch')
+        'linux-4.11.patch' 'linux-4.13.patch' 'linux-4.15.patch' 'linux-5.0.patch')
 sha512sums=('85f550f2952137529e0e9855f4d94b7bbc64cbf8a84a31c1b75a4be09d97478a997e64fa6e1ff4e0d29a97a79fc3d4dab1ebdaa9edb3d627a215f47aa4d52823'
             '5350308406457658fb31c378d6f3dd2a34c7331aebe5bdc80744bf955f1144e88181441704ccc7532f55d6fbe8d410440fb8838c2955d688dde4b55f74fc6ba5'
             'de026a271cbfbefee99bc00a13c50be87294e5e2c5407d23cff6ce2d2a0c853542ce4f7e3e150741c7e8e32466fb1ab7cab266957da5bcca8376fb0f38e94482'
-            '52bd3d2025ffb8a3f6a4a1a1fee1b87d3811f30a210a54aaa7b37838eb256cd766bc1aeda24e4b4f4829992584931ecd97a042794c9b854bd1ebbf452dce2abf')
+            '52bd3d2025ffb8a3f6a4a1a1fee1b87d3811f30a210a54aaa7b37838eb256cd766bc1aeda24e4b4f4829992584931ecd97a042794c9b854bd1ebbf452dce2abf'
+            '4918dcebd62ae577401469719f1a8866edd3dc97667aa3de287af1530aa68f50dc2508c883ecd2c9d1fe20f226ecd342b04b08f7a2cace0e531e5f49bbc12f2c')
 
 prepare() {
   cd ndiswrapper-$pkgver
   patch --no-backup-if-mismatch -p1 -i "$srcdir"/linux-4.11.patch
   patch --no-backup-if-mismatch -p1 -i "$srcdir"/linux-4.13.patch
-
-  cd ndiswrapper
-  patch --no-backup-if-mismatch -p1 -i "$srcdir"/linux-4.15.patch
+  patch --no-backup-if-mismatch -p1 -i "$srcdir"/linux-4.15.patch -d ndiswrapper
+  patch --no-backup-if-mismatch -p1 -i "$srcdir"/linux-5.0.patch
 }
 
 build() {

Added: linux-5.0.patch
===================================================================
--- linux-5.0.patch	                        (rev 0)
+++ linux-5.0.patch	2019-03-04 21:10:35 UTC (rev 437631)
@@ -0,0 +1,25 @@
+diff -u -r ndiswrapper-1.61/ndiswrapper/driver/ntoskernel.c ndiswrapper-1.61-5.0/ndiswrapper/driver/ntoskernel.c
+--- ndiswrapper-1.61/ndiswrapper/driver/ntoskernel.c	2019-03-04 20:22:58.095332763 +0000
++++ ndiswrapper-1.61-5.0/ndiswrapper/driver/ntoskernel.c	2019-03-04 20:24:48.698777448 +0000
+@@ -2498,7 +2498,7 @@
+ 
+ int ntoskernel_init(void)
+ {
+-	struct timeval now;
++	struct timespec64 now;
+ 
+ 	spin_lock_init(&dispatcher_lock);
+ 	spin_lock_init(&ntoskernel_lock);
+@@ -2518,10 +2518,10 @@
+ 	INIT_WORK(&ntos_work, ntos_work_worker);
+ 	wrap_timer_slist.next = NULL;
+ 
+-	do_gettimeofday(&now);
++	ktime_get_real_ts64(&now);
+ 	wrap_ticks_to_boot = TICKS_1601_TO_1970;
+ 	wrap_ticks_to_boot += (u64)now.tv_sec * TICKSPERSEC;
+-	wrap_ticks_to_boot += now.tv_usec * 10;
++	wrap_ticks_to_boot += now.tv_nsec / 100;
+ 	wrap_ticks_to_boot -= jiffies * TICKSPERJIFFY;
+ 	TRACE2("%llu", wrap_ticks_to_boot);
+