Hello community,
here is the log from the commit of package ndiswrapper for openSUSE:Factory
checked in at Mon May 30 16:09:38 CEST 2011.
--------
--- ndiswrapper/ndiswrapper.changes 2011-03-22 18:49:36.000000000 +0100
+++ ndiswrapper/ndiswrapper.changes 2011-05-27 16:26:25.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 27 14:26:07 UTC 2011 - co...@novell.com
+
+- update ndiswrapper.diff to what upstream did in SVN
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ndiswrapper.spec ++++++
--- /var/tmp/diff_new_pack.EmQjr2/_old 2011-05-30 16:08:37.000000000 +0200
+++ /var/tmp/diff_new_pack.EmQjr2/_new 2011-05-30 16:08:37.000000000 +0200
@@ -24,7 +24,7 @@
AutoReqProv: on
Summary: Use Microsoft NDIS Network Drivers for WLAN Cards
Version: 1.56
-Release: 2
+Release: 3
Requires: pciutils
Requires: ndiswrapper-kmp
Source0: %name-%version.tar.bz2
++++++ ndiswrapper.diff ++++++
--- /var/tmp/diff_new_pack.EmQjr2/_old 2011-05-30 16:08:37.000000000 +0200
+++ /var/tmp/diff_new_pack.EmQjr2/_new 2011-05-30 16:08:37.000000000 +0200
@@ -1,7 +1,7 @@
Index: utils/Makefile
===================================================================
--- utils/Makefile.orig 2010-02-11 03:09:32.000000000 +0100
-+++ utils/Makefile 2010-09-09 12:53:57.348385587 +0200
++++ utils/Makefile 2011-05-27 16:16:21.345205964 +0200
@@ -5,7 +5,7 @@ usrsbindir = $(DESTDIR)/usr/sbin
DRIVER_DIR ?= ../driver
@@ -14,7 +14,7 @@
Index: utils/loadndisdriver.c
===================================================================
--- utils/loadndisdriver.c.orig 2010-02-11 03:09:32.000000000 +0100
-+++ utils/loadndisdriver.c 2010-09-09 12:53:57.348385587 +0200
++++ utils/loadndisdriver.c 2011-05-27 16:16:21.345205964 +0200
@@ -505,7 +505,7 @@ static int get_ioctl_device()
int main(int argc, char *argv[0])
@@ -27,16 +27,8 @@
Index: driver/loader.c
===================================================================
--- driver/loader.c.orig 2010-02-11 03:09:32.000000000 +0100
-+++ driver/loader.c 2010-09-09 13:15:48.148260473 +0200
-@@ -21,6 +21,7 @@
- #include <linux/module.h>
- #include <linux/kmod.h>
- #include <linux/miscdevice.h>
-+#include <linux/smp_lock.h>
- #include <asm/uaccess.h>
-
- /*
-@@ -750,7 +751,7 @@ struct wrap_device *get_wrap_device(void
++++ driver/loader.c 2011-05-27 16:20:20.886627925 +0200
+@@ -750,7 +750,7 @@ struct wrap_device *get_wrap_device(void
}
/* called with loader_mutex is down */
@@ -45,23 +37,7 @@
unsigned int cmd, unsigned long arg)
{
struct load_driver *load_driver;
-@@ -759,6 +760,7 @@ static int wrapper_ioctl(struct inode *i
- int ret;
- void __user *addr = (void __user *)arg;
-
-+ lock_kernel();
- ENTER1("cmd: %u", cmd);
-
- ret = 0;
-@@ -820,6 +822,7 @@ static int wrapper_ioctl(struct inode *i
- break;
- }
- complete(&loader_complete);
-+ unlock_kernel();
- EXIT1(return ret);
- }
-
-@@ -831,7 +834,7 @@ static int wrapper_ioctl_release(struct
+@@ -831,7 +831,7 @@ static int wrapper_ioctl_release(struct
static struct file_operations wrapper_fops = {
.owner = THIS_MODULE,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
