11:16 p.m.
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27394
Modified Files:
ndiswrapper-kmod.spec ndiswrapper_3.3_kernel.patch
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.57-3
- patch for 3.7 kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ndiswrapper-kmod.spec 17 Jan 2013 09:23:26 -0000 1.100
+++ ndiswrapper-kmod.spec 19 Jan 2013 23:16:32 -0000 1.101
@@ -3,14 +3,14 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 2%{?dist}.44
+Release: 3%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.57-3
+- patch for 3.7 kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.44
- Rebuilt for updated kernel
ndiswrapper_3.3_kernel.patch:
Makefile | 5 ++++-
iw_ndis.c | 4 ++++
ndis.c | 6 ++++++
ntoskernel.h | 17 ++++-------------
wrapndis.c | 4 ++++
5 files changed, 22 insertions(+), 14 deletions(-)
Index: ndiswrapper_3.3_kernel.patch
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper_3.3_kernel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:43:21 -0000 1.3
+++ ndiswrapper_3.3_kernel.patch 19 Jan 2013 23:16:32 -0000 1.4
@@ -1,3 +1,75 @@
+Description: version.h is in a different location for 3.7
+Author: Dmitrijs Ledkovs <dmitrij.ledkov(a)ubuntu.com>
+
+--- a/driver/Makefile
++++ b/driver/Makefile
+@@ -123,6 +123,9 @@
+ OBJS += workqueue.o
+ endif
+
++ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
++EXTRA_CFLAGS += -DUAPI
++endif
+
+ all: config_check modules
+
+@@ -157,7 +160,7 @@
+
+
+ config_check:
+- @if [ ! -f $(KBUILD)/include/linux/version.h ]; then \
++ @if [ ! -f $(KBUILD)/include/linux/version.h ] && [ ! -f
$(KBUILD)/include/generated/uapi/linux/version.h ]; then \
+ echo; echo; \
+ echo "Cannot find kernel build files in $(KBUILD)"; \
+ echo "Please give the path to kernel build directory with" ; \
+--- a/driver/ntoskernel.h
++++ b/driver/ntoskernel.h
+@@ -36,7 +36,11 @@
+ #include <linux/usb.h>
+ #include <linux/spinlock.h>
+ #include <asm/mman.h>
++#ifdef UAPI
++#include <generated/uapi/linux/version.h>
++#else
+ #include <linux/version.h>
++#endif
+ #include <linux/etherdevice.h>
+ #include <net/iw_handler.h>
+ #include <linux/ethtool.h>
+@@ -204,19 +208,6 @@
+ void wrap_cancel_work(struct work_struct *work);
+ void wrap_flush_wq(struct workqueue_struct *workq);
+
+-#else // WRAP_WQ
+-
+-/* Compatibility for Linux before 2.6.20 where INIT_WORK takes 3 arguments */
+-#if !defined(INIT_WORK_NAR) && !defined(INIT_DELAYED_WORK_DEFERRABLE)
+-typedef void (*compat_work_func_t)(void *work);
+-typedef void (*work_func_t)(struct work_struct *work);
+-static inline void (INIT_WORK)(struct work_struct *work, work_func_t func)
+-{
+- INIT_WORK(work, (compat_work_func_t)func, work);
+-}
+-#undef INIT_WORK
+-#endif
+-
+ #endif // WRAP_WQ
+
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
+--- a/driver/iw_ndis.c
++++ b/driver/iw_ndis.c
+@@ -13,7 +13,11 @@
+ *
+ */
+
++#ifdef UAPI
++#include <generated/uapi/linux/version.h>
++#else
+ #include <linux/version.h>
++#endif
+ #include <linux/wireless.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
@@ -1675,6 +1675,7 @@