[arch-commits] Commit in ndiswrapper-arch/trunk (PKGBUILD kernel-5.5.patch)

[Jan Steffens]

    Date: Monday, January 27, 2020 @ 22:41:33
  Author: heftig
Revision: 556602

1.62-24: linux 5.5.arch1-1

Added:
  ndiswrapper-arch/trunk/kernel-5.5.patch
Modified:
  ndiswrapper-arch/trunk/PKGBUILD

------------------+
 PKGBUILD         |    8 +++--
 kernel-5.5.patch |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-27 22:41:32 UTC (rev 556601)
+++ PKGBUILD	2020-01-27 22:41:33 UTC (rev 556602)
@@ -3,7 +3,7 @@
 
 pkgname=ndiswrapper-arch
 pkgver=1.62
-pkgrel=23
+pkgrel=24
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors, kernel module for Arch kernel"
 arch=('x86_64')
 url="https://sourceforge.net/projects/ndiswrapper/"
@@ -12,15 +12,17 @@
 provides=('NDISWRAPPER-MODULE')
 replaces=('ndiswrapper-module')
 source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz"
-        'kernel-5.3.patch' 'kernel-5.4.patch')
+        'kernel-5.3.patch' 'kernel-5.4.patch' 'kernel-5.5.patch')
 sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
             'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d'
-            '36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429')
+            '36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429'
+            'ed543cbfb236de0a20e1f164c22c83cd19aec416b5f50a58cee731857231c667d166c36814047174bddda36261af71e92ecdb2944e5b818a603085af279fbd89')
 
 prepare() {
   cd ndiswrapper-$pkgver
   patch --no-backup-if-mismatch -p2 -i "$srcdir"/kernel-5.3.patch
   patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.4.patch
+  patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.5.patch
 }
 
 build() {

Added: kernel-5.5.patch
===================================================================
--- kernel-5.5.patch	                        (rev 0)
+++ kernel-5.5.patch	2020-01-27 22:41:33 UTC (rev 556602)
@@ -0,0 +1,72 @@
+diff -u -r ndiswrapper-1.62-5.4/driver/lin2win.S ndiswrapper-1.62-5.5/driver/lin2win.S
+--- ndiswrapper-1.62-5.4/driver/lin2win.S	2019-02-11 04:11:14.000000000 +0000
++++ ndiswrapper-1.62-5.5/driver/lin2win.S	2020-01-27 22:33:17.363779223 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <linux/linkage.h>
++#include <linux/version.h>
+ 
+ 	.text
+ 
+@@ -71,8 +72,12 @@
+  * We get (ARGC + 1) arguments.
+  */
+ .macro lin2win name, argc
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+ 	.type \name, @function
+ 	ENTRY(\name)
++#else
++	SYM_FUNC_START(\name)
++#endif
+ 
+ 	/* Create a call frame - it's optional, but good for debugging */
+ 	.cfi_startproc
+@@ -125,7 +130,11 @@
+ 	.cfi_restore %rbp
+ 	ret
+ 	.cfi_endproc
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+ 	.size	\name, (. - \name)
++#else
++	SYM_FUNC_END(\name)
++#endif
+ .endm
+ 
+ /* Define lin2winN functions */
+diff -u -r ndiswrapper-1.62-5.4/driver/win2lin_stubs.S ndiswrapper-1.62-5.5/driver/win2lin_stubs.S
+--- ndiswrapper-1.62-5.4/driver/win2lin_stubs.S	2019-02-11 04:11:14.000000000 +0000
++++ ndiswrapper-1.62-5.5/driver/win2lin_stubs.S	2020-01-27 22:33:20.867163026 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <linux/linkage.h>
++#include <linux/version.h>
+ 
+ #ifdef CONFIG_X86_64
+ 
+@@ -141,8 +142,12 @@
+ 
+ /* Declare function LONGNAME, call function SHORTNAME with ARGC arguments */
+ .macro win2linm longname, shortname, argc
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+ 	.type \longname, @function
+ 	ENTRY(\longname)
++#else
++	SYM_FUNC_START(\longname)
++#endif
+ 
+ 	/* Create a call frame - it's optional, but good for debugging */
+ 	.cfi_startproc
+@@ -243,7 +248,11 @@
+ 	.cfi_restore %rbp
+ 	ret
+ 	.cfi_endproc
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+ 	.size \longname, (. - \longname)
++#else
++	SYM_FUNC_END(\longname)
++#endif
+ .endm
+ 
+ #define win2lin(name, argc) win2linm win2lin_ ## name ## _ ## argc, name, argc