Use the upstream patch for 2.6.27 support instead.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 63 insertions, 29 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 74a83bfe2f5c..9f6631a62dd9 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.104 2008/11/20 15:40:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.105 2008/11/20 15:45:32 peper Exp $
+
+  20 Nov 2008; Piotr Jaroszyński <peper@gentoo.org>
+  files/ndiswrapper-2.6.27.patch:
+  Use the upstream patch for 2.6.27 support instead.
 
   20 Nov 2008; Piotr Jaroszyński <peper@gentoo.org>
   +files/ndiswrapper-2.6.27.patch, ndiswrapper-1.53-r1.ebuild:
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 6e430e775baf..232d5fdaca98 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,7 +1,7 @@
 AUX ndiswrapper-1.46-ksrc.patch 1635 RMD160 705a2ebc0198eb9c94e041e544128adb44824733 SHA1 fc44ca239c8a8ab067d88a8371fbafb85a1421e9 SHA256 6b46e194ec4418f6497c97d88679f2ecc02451516396cffda43e3945b02dcf52
 AUX ndiswrapper-1.47-ksrc.patch 592 RMD160 ac2831b9f676ab4348875f4fae3e54b99b151790 SHA1 4ab7a69f56251f6055a1ec0e4153a6835792d2cf SHA256 38cc21054be40c047c8135d4eb009dd72573a4fa7edb8ee310769e5c54ee16c1
 AUX ndiswrapper-1.50_rc1-makefile.patch 600 RMD160 f8b4f17ba938538303e6c895711933a9464f99cb SHA1 ab868623df14704eb4e09cda7cc7b03801afe09b SHA256 8188c4eb1d6ca8353e3c3de27803563c96db5607492e23ef71bcfbdad9336648
-AUX ndiswrapper-2.6.27.patch 4310 RMD160 5c0fd2da986f75fe11e89089396387f4dbab483b SHA1 c58da1413507be750224c07e6bb17c789b9f33e8 SHA256 ce413ecb234082df45ee5cda9717db26d5c3840c14e38c9bcc31778634adca1a
+AUX ndiswrapper-2.6.27.patch 5115 RMD160 4587f44cc92ea1f5bca7703feff344a66ee4f68a SHA1 4e57a4998cd801bc3752f5bfc486bab65be9d14e SHA256 1ebf7e49f4324a20347ccd4d3f7b2bc4b449328a63bc3f08f734167620daf1ba
 AUX ndiswrapper-CVE-2008-4395.patch 3032 RMD160 ef09a1bed8d81adb62fe700c144a11e0a3ff9a90 SHA1 d333ef0fc877587a0947b3f4dba49f9586136f86 SHA256 62860197b6f9fa749a3c94c2577a8bd0fd101a518592625b3884ca30b97bf71e
 AUX ndiswrapper-new_suspend2.patch 891 RMD160 1dbb59e400ea8cac62bbc6cbb2c757b08b078c91 SHA1 6fdde32982d8c422838a3b5f9934245dd5869459 SHA256 dec61532d2c7eec07f387681616026e0472bc1d9024785a1bb5178769f6c2e5c
 DIST ndiswrapper-1.47.tar.gz 198265 RMD160 72082c5a825e77e444e2cf29f6e6e5fcc11b2e02 SHA1 2431c8f74cab37d3f4c39c6d1b625e0b8312282e SHA256 8ee24f7a4c625fa12deb69d6fa530618c6eca0909848de439f54ebda16e7d312
@@ -19,5 +19,5 @@ EBUILD ndiswrapper-1.51.ebuild 2946 RMD160 bb0235e729f18a4aa989b07844a884d7b9c52
 EBUILD ndiswrapper-1.52.ebuild 2946 RMD160 b38da9817441a0eea032ba4ac0d020bc6e5dc7c0 SHA1 890ae187b4ce48b2f4546cf2341e0027586be228 SHA256 f819c3337caa94702a22c8d6e401f990cef384494f311b58724f7add646bae1a
 EBUILD ndiswrapper-1.53-r1.ebuild 3115 RMD160 9d4b0549cefd7b99d442437c4fcab5b776e43676 SHA1 c94515526657bf4c96a5d1fa3ff7c2623e289603 SHA256 2058b393b9bbc87e9d269e95a5d70b8e499f84e5df17fb7865aa32663b841907
 EBUILD ndiswrapper-1.53.ebuild 2946 RMD160 374bbb2e51718b38ab33d9ee07184390362bed20 SHA1 bc9d6a89299c6a99a912d64f09c5e9e9cb66e794 SHA256 a5ad6aedd1effd912e3f0496c6a317bc81c9b936b8a179854d98685ff2b271ac
-MISC ChangeLog 18971 RMD160 eced70458141ed3550d014b20ba88724ee022e5e SHA1 fdc8bf27aff21595b8404b7a2d1f17d77591fad6 SHA256 1d68d5adc89cadd086c9b1d66299d8806dd6f228e6d95170c680dde6f046436b
+MISC ChangeLog 19112 RMD160 67ab05f287a73d41ad52918a0fbe7fb4a4144078 SHA1 a76e6d7ec8433da11e80281c36150771c0b8c6d1 SHA256 5e502d8dcaec2a1c9eeb8477fe8d8e6fec8a84d4b90d45df197d2a24e108ccfe
 MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch b/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch
index 522dfe9afba5..30470f44e1e0 100644
--- a/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch
@@ -1,86 +1,113 @@
-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 @@
+--- trunk/ndiswrapper/driver/iw_ndis.c	2008/05/18 04:27:22	2663
++++ trunk/ndiswrapper/driver/iw_ndis.c	2008/07/10 15:17:50	2668
+@@ -1015,7 +1015,16 @@
  	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,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)
++#define	iwe_stream_add_event(a, b, c, d, e)	iwe_stream_add_event(b, c, d, e)
++#define	iwe_stream_add_point(a, b, c, d, e)	iwe_stream_add_point(b, c, d, e)
++#define	iwe_stream_add_value(a, b, c, d, e, f)	\
++	iwe_stream_add_value(b, c, d, e, f)
++#define	iwe_stream_lcp_len(a)			IW_EV_LCP_LEN
++#endif
++
++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 @@
+@@ -1034,7 +1043,8 @@
  	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);
++	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 @@
+@@ -1044,13 +1054,15 @@
  		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);
++	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);
++	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 @@
+@@ -1061,7 +1073,8 @@
  		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);
++	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 @@
+@@ -1076,7 +1089,8 @@
  	/* 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);
++	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 @@
+@@ -1090,7 +1104,8 @@
  	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);
++	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 @@
+@@ -1101,11 +1116,12 @@
  		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);
++	event = iwe_stream_add_point(info, event, end_buf, &iwe,
++				     bssid->ssid.essid);
  
  	/* add rate */
  	memset(&iwe, 0, sizeof(iwe));
-@@ -1115,7 +1115,7 @@
+-	current_val = event + IW_EV_LCP_LEN;
++	current_val = event + iwe_stream_lcp_len(info);
+ 	iwe.cmd = SIOCGIWRATE;
+ 	if (bssid->length > sizeof(*bssid))
+ 		nrates = NDIS_MAX_RATES_EX;
+@@ -1115,26 +1131,27 @@
  		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,
++			current_val = iwe_stream_add_value(info, event,
++							   current_val,
  							   end_buf, &iwe,
  							   IW_EV_PARAM_LEN);
  		}
-@@ -1128,13 +1128,13 @@
+ 	}
+ 
+-	if ((current_val - event) > IW_EV_LCP_LEN)
++	if ((current_val - event) > iwe_stream_lcp_len(info))
+ 		event = current_val;
+ 
+ 	memset(&iwe, 0, sizeof(iwe));
  	iwe.cmd = IWEVCUSTOM;
  	sprintf(buf, "bcn_int=%d", bssid->config.beacon_period);
  	iwe.u.data.length = strlen(buf);
@@ -96,16 +123,19 @@ diff -aur driver.old/iw_ndis.c driver/iw_ndis.c
  
  	TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid));
  	if (bssid->length > sizeof(*bssid)) {
-@@ -1155,7 +1155,7 @@
+@@ -1155,8 +1172,9 @@
  				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);
+-							     &iwe, iep);
++				event = iwe_stream_add_point(info, event,
++							     end_buf, &iwe,
++							     iep);
  			}
  			iep += ielen;
-@@ -1236,7 +1236,7 @@
+ 		}
+@@ -1236,7 +1254,7 @@
  	TRACE2("%d", bssid_list->num_items);
  	cur_item = &bssid_list->bssid[0];
  	for (i = 0; i < bssid_list->num_items; i++) {
@@ -113,4 +143,4 @@ diff -aur driver.old/iw_ndis.c driver/iw_ndis.c
 +		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);    
+ 						      cur_item->length);