Date: Monday, September 11, 2017 @ 04:57:18
Author: felixonmars
Revision: 256868
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
ndiswrapper-dkms/repos/community-testing-i686/
ndiswrapper-dkms/repos/community-testing-i686/PKGBUILD
(from rev 256867, ndiswrapper-dkms/trunk/PKGBUILD)
ndiswrapper-dkms/repos/community-testing-i686/dkms.conf
(from rev 256867, ndiswrapper-dkms/trunk/dkms.conf)
ndiswrapper-dkms/repos/community-testing-i686/linux-4.11.patch
(from rev 256867, ndiswrapper-dkms/trunk/linux-4.11.patch)
ndiswrapper-dkms/repos/community-testing-i686/linux-4.13.patch
(from rev 256867, ndiswrapper-dkms/trunk/linux-4.13.patch)
ndiswrapper-dkms/repos/community-testing-x86_64/
ndiswrapper-dkms/repos/community-testing-x86_64/PKGBUILD
(from rev 256867, ndiswrapper-dkms/trunk/PKGBUILD)
ndiswrapper-dkms/repos/community-testing-x86_64/dkms.conf
(from rev 256867, ndiswrapper-dkms/trunk/dkms.conf)
ndiswrapper-dkms/repos/community-testing-x86_64/linux-4.11.patch
(from rev 256867, ndiswrapper-dkms/trunk/linux-4.11.patch)
ndiswrapper-dkms/repos/community-testing-x86_64/linux-4.13.patch
(from rev 256867, ndiswrapper-dkms/trunk/linux-4.13.patch)
-------------------------------------------+
community-testing-i686/PKGBUILD | 40 ++++++++++++++++++++
community-testing-i686/dkms.conf | 24 ++++++++++++
community-testing-i686/linux-4.11.patch | 55 ++++++++++++++++++++++++++++
community-testing-i686/linux-4.13.patch | 27 +++++++++++++
community-testing-x86_64/PKGBUILD | 40 ++++++++++++++++++++
community-testing-x86_64/dkms.conf | 24 ++++++++++++
community-testing-x86_64/linux-4.11.patch | 55 ++++++++++++++++++++++++++++
community-testing-x86_64/linux-4.13.patch | 27 +++++++++++++
8 files changed, 292 insertions(+)
Copied: ndiswrapper-dkms/repos/community-testing-i686/PKGBUILD (from rev
256867, ndiswrapper-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-09-11 04:57:18 UTC (rev 256868)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: maz-1 <loveayaw...@gmail.com>
+
+pkgname=ndiswrapper-dkms
+pkgver=1.61
+pkgrel=3
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors.Use with DKMS"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/ndiswrapper/";
+license=('GPL')
+depends=('dkms')
+#optdepends=('ndisgtk: GTK+ based frontend for ndiswrapper.')
+provides=('ndiswrapper')
+conflicts=('ndiswrapper')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pgiri/ndiswrapper/archive/v$pkgver.tar.gz";
+ 'dkms.conf' 'linux-4.11.patch' 'linux-4.13.patch')
+sha512sums=('85f550f2952137529e0e9855f4d94b7bbc64cbf8a84a31c1b75a4be09d97478a997e64fa6e1ff4e0d29a97a79fc3d4dab1ebdaa9edb3d627a215f47aa4d52823'
+
'9fce255fc02ddf6e939dc61a5e29c0ea5fa1a31ecc3c390081bc53aa1cd48eddf5db621f0a1cb909634529d4ccc2995eea8827be8eb5807b34dc17e15045ecf4'
+
'5350308406457658fb31c378d6f3dd2a34c7331aebe5bdc80744bf955f1144e88181441704ccc7532f55d6fbe8d410440fb8838c2955d688dde4b55f74fc6ba5'
+
'de026a271cbfbefee99bc00a13c50be87294e5e2c5407d23cff6ce2d2a0c853542ce4f7e3e150741c7e8e32466fb1ab7cab266957da5bcca8376fb0f38e94482')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch -p1 -i ../linux-4.11.patch
+ patch -p1 -i ../linux-4.13.patch
+}
+
+build() {
+ cd ndiswrapper-$pkgver/ndiswrapper
+ make -C utils
+}
+
+package() {
+ cd ndiswrapper-$pkgver/ndiswrapper
+ mkdir -p "$pkgdir"/usr/src
+ cp -RL ./driver "$pkgdir"/usr/src/ndiswrapper-$pkgver
+ cp "$srcdir"/dkms.conf "$pkgdir"/usr/src/ndiswrapper-$pkgver
+ make -C utils sbindir=/usr/bin usrsbindir=/usr/bin DESTDIR="$pkgdir" install
+}
Copied: ndiswrapper-dkms/repos/community-testing-i686/dkms.conf (from rev
256867, ndiswrapper-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-i686/dkms.conf (rev 0)
+++ community-testing-i686/dkms.conf 2017-09-11 04:57:18 UTC (rev 256868)
@@ -0,0 +1,24 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2010 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="ndiswrapper"
+PACKAGE_VERSION=1.60.20160717
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="ndiswrapper"
+DEST_MODULE_LOCATION[0]="/kernel/net/ndiswrapper"
+MAKE[0]="make KVERS_UNAME=${kernelver}"
+
Copied: ndiswrapper-dkms/repos/community-testing-i686/linux-4.11.patch (from
rev 256867, ndiswrapper-dkms/trunk/linux-4.11.patch)
===================================================================
--- community-testing-i686/linux-4.11.patch (rev 0)
+++ community-testing-i686/linux-4.11.patch 2017-09-11 04:57:18 UTC (rev
256868)
@@ -0,0 +1,55 @@
+commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Tue May 16 01:32:56 2017 +0800
+
+ Add support for Linux 4.11+
+
+diff --git a/ndiswrapper/driver/ndis.c b/ndiswrapper/driver/ndis.c
+index c1913a05..2ab4dd21 100644
+--- a/ndiswrapper/driver/ndis.c
++++ b/ndiswrapper/driver/ndis.c
+@@ -2258,7 +2258,9 @@ wstdcall void NdisMIndicateReceivePacket(struct
ndis_mp_block *nmb,
+ WARNING("empty packet ignored");
+ continue;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ /* get total number of bytes in packet */
+ NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
+ &length, &total_length,
+@@ -2346,7 +2348,9 @@ wstdcall void EthRxIndicateHandler(struct ndis_mp_block
*nmb, void *rx_ctx,
+ ERROR("nmb is NULL");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+
+ if (look_ahead_size < packet_size) {
+ struct ndis_packet *packet;
+@@ -2461,7 +2465,9 @@ wstdcall void NdisMTransferDataComplete(struct
ndis_mp_block *nmb,
+ WARNING("illegal packet");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ oob_data = NDIS_PACKET_OOB_DATA(packet);
+ skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
+ bytes_txed;
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index 3c4c6ff0..f1c52e51 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -296,6 +296,10 @@ static inline void (INIT_WORK)(struct work_struct *work,
work_func_t func)
+ #define add_taint(flag, lockdep_ok) add_taint(flag)
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
++
+ #include "winnt_types.h"
+ #include "ndiswrapper.h"
+ #include "pe_linker.h"
Copied: ndiswrapper-dkms/repos/community-testing-i686/linux-4.13.patch (from
rev 256867, ndiswrapper-dkms/trunk/linux-4.13.patch)
===================================================================
--- community-testing-i686/linux-4.13.patch (rev 0)
+++ community-testing-i686/linux-4.13.patch 2017-09-11 04:57:18 UTC (rev
256868)
@@ -0,0 +1,27 @@
+commit eeac7ab831b3097005dadc64dd323f54ade30323
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Mon Sep 11 12:52:36 2017 +0800
+
+ Add support for linux 4.13+
+
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index f1c52e51..1422bd4d 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS];
+ */
+ #include <asm/dma-mapping.h>
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)
\
+ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
+ GFP_KERNEL | __GFP_REPEAT)
++#else
++#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)
\
++ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
++ GFP_KERNEL | __GFP_RETRY_MAYFAIL)
++#endif
++
+ #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle)
\
+ dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+ #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \
Copied: ndiswrapper-dkms/repos/community-testing-x86_64/PKGBUILD (from rev
256867, ndiswrapper-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-09-11 04:57:18 UTC (rev 256868)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: maz-1 <loveayaw...@gmail.com>
+
+pkgname=ndiswrapper-dkms
+pkgver=1.61
+pkgrel=3
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors.Use with DKMS"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/ndiswrapper/";
+license=('GPL')
+depends=('dkms')
+#optdepends=('ndisgtk: GTK+ based frontend for ndiswrapper.')
+provides=('ndiswrapper')
+conflicts=('ndiswrapper')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pgiri/ndiswrapper/archive/v$pkgver.tar.gz";
+ 'dkms.conf' 'linux-4.11.patch' 'linux-4.13.patch')
+sha512sums=('85f550f2952137529e0e9855f4d94b7bbc64cbf8a84a31c1b75a4be09d97478a997e64fa6e1ff4e0d29a97a79fc3d4dab1ebdaa9edb3d627a215f47aa4d52823'
+
'9fce255fc02ddf6e939dc61a5e29c0ea5fa1a31ecc3c390081bc53aa1cd48eddf5db621f0a1cb909634529d4ccc2995eea8827be8eb5807b34dc17e15045ecf4'
+
'5350308406457658fb31c378d6f3dd2a34c7331aebe5bdc80744bf955f1144e88181441704ccc7532f55d6fbe8d410440fb8838c2955d688dde4b55f74fc6ba5'
+
'de026a271cbfbefee99bc00a13c50be87294e5e2c5407d23cff6ce2d2a0c853542ce4f7e3e150741c7e8e32466fb1ab7cab266957da5bcca8376fb0f38e94482')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch -p1 -i ../linux-4.11.patch
+ patch -p1 -i ../linux-4.13.patch
+}
+
+build() {
+ cd ndiswrapper-$pkgver/ndiswrapper
+ make -C utils
+}
+
+package() {
+ cd ndiswrapper-$pkgver/ndiswrapper
+ mkdir -p "$pkgdir"/usr/src
+ cp -RL ./driver "$pkgdir"/usr/src/ndiswrapper-$pkgver
+ cp "$srcdir"/dkms.conf "$pkgdir"/usr/src/ndiswrapper-$pkgver
+ make -C utils sbindir=/usr/bin usrsbindir=/usr/bin DESTDIR="$pkgdir" install
+}
Copied: ndiswrapper-dkms/repos/community-testing-x86_64/dkms.conf (from rev
256867, ndiswrapper-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-x86_64/dkms.conf (rev 0)
+++ community-testing-x86_64/dkms.conf 2017-09-11 04:57:18 UTC (rev 256868)
@@ -0,0 +1,24 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2010 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="ndiswrapper"
+PACKAGE_VERSION=1.60.20160717
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="ndiswrapper"
+DEST_MODULE_LOCATION[0]="/kernel/net/ndiswrapper"
+MAKE[0]="make KVERS_UNAME=${kernelver}"
+
Copied: ndiswrapper-dkms/repos/community-testing-x86_64/linux-4.11.patch (from
rev 256867, ndiswrapper-dkms/trunk/linux-4.11.patch)
===================================================================
--- community-testing-x86_64/linux-4.11.patch (rev 0)
+++ community-testing-x86_64/linux-4.11.patch 2017-09-11 04:57:18 UTC (rev
256868)
@@ -0,0 +1,55 @@
+commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Tue May 16 01:32:56 2017 +0800
+
+ Add support for Linux 4.11+
+
+diff --git a/ndiswrapper/driver/ndis.c b/ndiswrapper/driver/ndis.c
+index c1913a05..2ab4dd21 100644
+--- a/ndiswrapper/driver/ndis.c
++++ b/ndiswrapper/driver/ndis.c
+@@ -2258,7 +2258,9 @@ wstdcall void NdisMIndicateReceivePacket(struct
ndis_mp_block *nmb,
+ WARNING("empty packet ignored");
+ continue;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ /* get total number of bytes in packet */
+ NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
+ &length, &total_length,
+@@ -2346,7 +2348,9 @@ wstdcall void EthRxIndicateHandler(struct ndis_mp_block
*nmb, void *rx_ctx,
+ ERROR("nmb is NULL");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+
+ if (look_ahead_size < packet_size) {
+ struct ndis_packet *packet;
+@@ -2461,7 +2465,9 @@ wstdcall void NdisMTransferDataComplete(struct
ndis_mp_block *nmb,
+ WARNING("illegal packet");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ oob_data = NDIS_PACKET_OOB_DATA(packet);
+ skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
+ bytes_txed;
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index 3c4c6ff0..f1c52e51 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -296,6 +296,10 @@ static inline void (INIT_WORK)(struct work_struct *work,
work_func_t func)
+ #define add_taint(flag, lockdep_ok) add_taint(flag)
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
++
+ #include "winnt_types.h"
+ #include "ndiswrapper.h"
+ #include "pe_linker.h"
Copied: ndiswrapper-dkms/repos/community-testing-x86_64/linux-4.13.patch (from
rev 256867, ndiswrapper-dkms/trunk/linux-4.13.patch)
===================================================================
--- community-testing-x86_64/linux-4.13.patch (rev 0)
+++ community-testing-x86_64/linux-4.13.patch 2017-09-11 04:57:18 UTC (rev
256868)
@@ -0,0 +1,27 @@
+commit eeac7ab831b3097005dadc64dd323f54ade30323
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Mon Sep 11 12:52:36 2017 +0800
+
+ Add support for linux 4.13+
+
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index f1c52e51..1422bd4d 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS];
+ */
+ #include <asm/dma-mapping.h>
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)
\
+ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
+ GFP_KERNEL | __GFP_REPEAT)
++#else
++#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)
\
++ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
++ GFP_KERNEL | __GFP_RETRY_MAYFAIL)
++#endif
++
+ #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle)
\
+ dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+ #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \
