[arch-commits] Commit in ndiswrapper-dkms/repos (8 files)
Felix Yan
felixonmars at archlinux.org
Mon May 15 17:58:32 UTC 2017
Date: Monday, May 15, 2017 @ 17:58:30
Author: felixonmars
Revision: 228144
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 228143, ndiswrapper-dkms/trunk/PKGBUILD)
ndiswrapper-dkms/repos/community-testing-i686/dkms.conf
(from rev 228143, ndiswrapper-dkms/trunk/dkms.conf)
ndiswrapper-dkms/repos/community-testing-i686/linux-4.11.patch
(from rev 228143, ndiswrapper-dkms/trunk/linux-4.11.patch)
ndiswrapper-dkms/repos/community-testing-x86_64/
ndiswrapper-dkms/repos/community-testing-x86_64/PKGBUILD
(from rev 228143, ndiswrapper-dkms/trunk/PKGBUILD)
ndiswrapper-dkms/repos/community-testing-x86_64/dkms.conf
(from rev 228143, ndiswrapper-dkms/trunk/dkms.conf)
ndiswrapper-dkms/repos/community-testing-x86_64/linux-4.11.patch
(from rev 228143, ndiswrapper-dkms/trunk/linux-4.11.patch)
-------------------------------------------+
community-testing-i686/PKGBUILD | 38 +++++++++++++++++++
community-testing-i686/dkms.conf | 24 ++++++++++++
community-testing-i686/linux-4.11.patch | 55 ++++++++++++++++++++++++++++
community-testing-x86_64/PKGBUILD | 38 +++++++++++++++++++
community-testing-x86_64/dkms.conf | 24 ++++++++++++
community-testing-x86_64/linux-4.11.patch | 55 ++++++++++++++++++++++++++++
6 files changed, 234 insertions(+)
Copied: ndiswrapper-dkms/repos/community-testing-i686/PKGBUILD (from rev 228143, ndiswrapper-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-05-15 17:58:30 UTC (rev 228144)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: maz-1 <loveayawaka at gmail.com>
+
+pkgname=ndiswrapper-dkms
+pkgver=1.61
+pkgrel=2
+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')
+md5sums=('1267784d65a8ba6a92884cf6f3bffb9a'
+ '801e409f0b93a0434e5c923831c49d50'
+ 'c471bffbfb1f9256a33ca40284856bfc')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch -p1 -i ../linux-4.11.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 228143, ndiswrapper-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-i686/dkms.conf (rev 0)
+++ community-testing-i686/dkms.conf 2017-05-15 17:58:30 UTC (rev 228144)
@@ -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 228143, ndiswrapper-dkms/trunk/linux-4.11.patch)
===================================================================
--- community-testing-i686/linux-4.11.patch (rev 0)
+++ community-testing-i686/linux-4.11.patch 2017-05-15 17:58:30 UTC (rev 228144)
@@ -0,0 +1,55 @@
+commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
+Author: Felix Yan <felixonmars at 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/PKGBUILD (from rev 228143, ndiswrapper-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-05-15 17:58:30 UTC (rev 228144)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: maz-1 <loveayawaka at gmail.com>
+
+pkgname=ndiswrapper-dkms
+pkgver=1.61
+pkgrel=2
+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')
+md5sums=('1267784d65a8ba6a92884cf6f3bffb9a'
+ '801e409f0b93a0434e5c923831c49d50'
+ 'c471bffbfb1f9256a33ca40284856bfc')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch -p1 -i ../linux-4.11.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 228143, ndiswrapper-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-x86_64/dkms.conf (rev 0)
+++ community-testing-x86_64/dkms.conf 2017-05-15 17:58:30 UTC (rev 228144)
@@ -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 228143, 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-05-15 17:58:30 UTC (rev 228144)
@@ -0,0 +1,55 @@
+commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
+Author: Felix Yan <felixonmars at 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"
More information about the arch-commits
mailing list