[arch-commits] Commit in ndiswrapper/trunk (3 files)

Thomas Baechler thomas at archlinux.org
Fri Oct 10 11:32:55 EDT 2008


    Date: Friday, October 10, 2008 @ 11:32:55
  Author: thomas
Revision: 14768

upgpkg: ndiswrapper 1.53-2

Added:
  ndiswrapper/trunk/kernel-2.6.27.patch
Modified:
  ndiswrapper/trunk/PKGBUILD
  ndiswrapper/trunk/ndiswrapper.install

---------------------+
 PKGBUILD            |   15 +++---
 kernel-2.6.27.patch |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 ndiswrapper.install |    6 +-
 3 files changed, 128 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-10 15:32:50 UTC (rev 14767)
+++ PKGBUILD	2008-10-10 15:32:55 UTC (rev 14768)
@@ -2,21 +2,25 @@
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=ndiswrapper
-_kernver=2.6.26-ARCH
+_kernver=2.6.27-ARCH
 pkgver=1.53
-pkgrel=1
+pkgrel=2
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For stock arch 2.6 kernel."
 license=('GPL')
 arch=(i686 x86_64)
 url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
-depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.26-1' 'kernel26<2.6.27')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
+depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.27' 'kernel26<2.6.28')
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
+        kernel-2.6.27.patch)
+md5sums=('393c6e6ab0803963148e18538601cdec'
+         'cd09562c4afdbd20a0237a5e6d976b31')
 
 build()
 {
   cd $startdir/src/ndiswrapper-$pkgver/driver
-  make KVERS=$_kernver 
+  patch -Np1 -i ../../kernel-2.6.27.patch || return 1
+  make KVERS=$_kernver || return 1
   make DESTDIR=$startdir/pkg KVERS=$_kernver install || return 1
   rm $startdir/pkg/lib/modules/$_kernver/modules.* #wtf?
 
@@ -26,4 +30,3 @@
   mv $startdir/pkg/lib/modules/$_kernver/misc/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper/
   rm -r $startdir/pkg/lib/modules/$_kernver/misc/
 }
-md5sums=('393c6e6ab0803963148e18538601cdec')

Added: kernel-2.6.27.patch
===================================================================
--- kernel-2.6.27.patch	                        (rev 0)
+++ kernel-2.6.27.patch	2008-10-10 15:32:55 UTC (rev 14768)
@@ -0,0 +1,116 @@
+diff -aur driver.old/iw_ndis.c driver/iw_ndis.c
+--- driver.old/iw_ndis.c	2008-08-04 21:10:16.000000000 +0200
++++ driver/iw_ndis.c	2008-08-04 21:30:12.000000000 +0200
+@@ -1015,7 +1015,7 @@
+ 	return 0;
+ }
+ 
+-static char *ndis_translate_scan(struct net_device *dev, char *event,
++static char *ndis_translate_scan(struct net_device *dev, struct iw_request_info *info, char *event,
+ 				 char *end_buf, void *item)
+ {
+ 	struct iw_event iwe;
+@@ -1034,7 +1034,7 @@
+ 	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+ 	iwe.len = IW_EV_ADDR_LEN;
+ 	memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
+-	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_ADDR_LEN);
++	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_ADDR_LEN);
+ 
+ 	/* add essid */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1044,13 +1044,13 @@
+ 		iwe.u.data.length = IW_ESSID_MAX_SIZE;
+ 	iwe.u.data.flags = 1;
+ 	iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+-	event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid);
++	event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid);
+ 
+ 	/* add protocol name */
+ 	memset(&iwe, 0, sizeof(iwe));
+ 	iwe.cmd = SIOCGIWNAME;
+ 	strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ);
+-	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_CHAR_LEN);
++	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_CHAR_LEN);
+ 
+ 	/* add mode */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1061,7 +1061,7 @@
+ 		iwe.u.mode = IW_MODE_INFRA;
+ 	else // if (bssid->mode == Ndis802_11AutoUnknown)
+ 		iwe.u.mode = IW_MODE_AUTO;
+-	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_UINT_LEN);
++	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_UINT_LEN);
+ 
+ 	/* add freq */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1076,7 +1076,7 @@
+ 	/* convert from kHz to Hz */
+ 	iwe.u.freq.e += 3;
+ 	iwe.len = IW_EV_FREQ_LEN;
+-	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_FREQ_LEN);
++	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_FREQ_LEN);
+ 
+ 	/* add qual */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1090,7 +1090,7 @@
+ 	iwe.u.qual.noise = WL_NOISE;
+ 	iwe.u.qual.qual  = i;
+ 	iwe.len = IW_EV_QUAL_LEN;
+-	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_QUAL_LEN);
++	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_QUAL_LEN);
+ 
+ 	/* add key info */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1101,7 +1101,7 @@
+ 		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+ 	iwe.u.data.length = 0;
+ 	iwe.len = IW_EV_POINT_LEN;
+-	event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid);
++	event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid);
+ 
+ 	/* add rate */
+ 	memset(&iwe, 0, sizeof(iwe));
+@@ -1115,7 +1115,7 @@
+ 		if (bssid->rates[i] & 0x7f) {
+ 			iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) *
+ 					       500000);
+-			current_val = iwe_stream_add_value(event, current_val,
++			current_val = iwe_stream_add_value(info, event, current_val,
+ 							   end_buf, &iwe,
+ 							   IW_EV_PARAM_LEN);
+ 		}
+@@ -1128,13 +1128,13 @@
+ 	iwe.cmd = IWEVCUSTOM;
+ 	sprintf(buf, "bcn_int=%d", bssid->config.beacon_period);
+ 	iwe.u.data.length = strlen(buf);
+-	event = iwe_stream_add_point(event, end_buf, &iwe, buf);
++	event = iwe_stream_add_point(info, event, end_buf, &iwe, buf);
+ 
+ 	memset(&iwe, 0, sizeof(iwe));
+ 	iwe.cmd = IWEVCUSTOM;
+ 	sprintf(buf, "atim=%u", bssid->config.atim_window);
+ 	iwe.u.data.length = strlen(buf);
+-	event = iwe_stream_add_point(event, end_buf, &iwe, buf);
++	event = iwe_stream_add_point(info, event, end_buf, &iwe, buf);
+ 
+ 	TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid));
+ 	if (bssid->length > sizeof(*bssid)) {
+@@ -1155,7 +1155,7 @@
+ 				memset(&iwe, 0, sizeof(iwe));
+ 				iwe.cmd = IWEVGENIE;
+ 				iwe.u.data.length = ielen;
+-				event = iwe_stream_add_point(event, end_buf,
++				event = iwe_stream_add_point(info, event, end_buf,
+ 							     &iwe, iep);
+ 			}
+ 			iep += ielen;
+@@ -1236,7 +1236,7 @@
+ 	TRACE2("%d", bssid_list->num_items);
+ 	cur_item = &bssid_list->bssid[0];
+ 	for (i = 0; i < bssid_list->num_items; i++) {
+-		event = ndis_translate_scan(dev, event,
++		event = ndis_translate_scan(dev, info, event,
+ 					    extra + IW_SCAN_MAX_DATA, cur_item);
+ 		cur_item = (struct ndis_wlan_bssid *)((char *)cur_item +
+ 						      cur_item->length);    

Modified: ndiswrapper.install
===================================================================
--- ndiswrapper.install	2008-10-10 15:32:50 UTC (rev 14767)
+++ ndiswrapper.install	2008-10-10 15:32:55 UTC (rev 14768)
@@ -2,7 +2,7 @@
 post_install()
 {
   ndiswrapper -m
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.27-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 
 }
 
@@ -11,14 +11,14 @@
 post_upgrade()
 {
   ndiswrapper -m
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.27-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 
 }
 
 # arg 1:  the old package version
 post_remove()
 {
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.27-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
 }
 




More information about the arch-commits mailing list