Added patch to make it buildable with 2.6.27 kernel.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-777e816 i686

4 files changed, 175 insertions, 8 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 545047e4ae08..a3fdca43518a 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.60 2008/10/14 06:01:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.61 2008/10/20 03:11:19 pva Exp $
+
+  20 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/madwifi-ng-0.9.4-2.6.27-r3811.patch, madwifi-ng-0.9.4-r1.ebuild:
+  Added patch to make it buildable with 2.6.27 kernel.
 
 *madwifi-ng-0.9.4-r1 (14 Oct 2008)
 
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 8fccb7f46e7d..447f18420ea1 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -1,6 +1,7 @@
 AUX madwifi-2.6.22.patch 3591 RMD160 f895c5766eb51369e376cf22674b08f8a6125972 SHA1 41c740a96e46d3c3c0934c1d6b668df4bca0a14f SHA256 a2755a11c630b53d6bb4f3eaf6a641e8edfa6585d86f3fd3c918e26397c20386
 AUX madwifi-dfs-ieee80211-skb-update.patch 453 RMD160 856e6931da9bf96bc993a6f568933d6742f81719 SHA1 41928bbfdbb4e1c1fa5c1ed93fb673542c18bbc3 SHA256 25c4d782cdaac53ae4bf36253b93e27c475fec785043e4d080c83e61eb9c809f
 AUX madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea SHA1 3c84bf4e203ab3c810c734816dd1291ba19b0005 SHA256 be6e7a66acad56044c25ab56d9cbd7d5326c4ba21f5d9ed25caef56a9577bdc8
+AUX madwifi-ng-0.9.4-2.6.27-r3811.patch 5887 RMD160 b463c0fc76daa70cc0d8a906422f07d5e11b4830 SHA1 4052a6e2e93a13f12dd2e4faec531919eb2587ce SHA256 549bba3ff42bf38c19498eef0a0c222b508a203563fe147d45e40777693bae21
 AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe
 DIST madwifi-0.9.3.1.tar.bz2 3488269 RMD160 5daad5c17d42ee0b5618d46213293c4d6289130b SHA1 96647476b70ec80c83a13e3d381776416f6ccbff SHA256 623aa90dd9da9c0140ae71d205c6e8cb32f8a555f0f12d873494df05a07945ec
 DIST madwifi-0.9.3.2.tar.bz2 3489208 RMD160 f20b7d954d7d3b4bda03ebb762868ed378514c8d SHA1 ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 SHA256 34ec9fc871edadf1742057152c0253484d95a534e51a48dbb2e11801e87a0a13
@@ -9,7 +10,7 @@ DIST madwifi-0.9.4.tar.bz2 3485142 RMD160 a493addc2f566e07f29033b671fea1b7143a90
 EBUILD madwifi-ng-0.9.3.1.ebuild 2643 RMD160 aaeb81d19014e6f3892aa5b98050ffc503085753 SHA1 18a6daa670e69ae6194aa7e3937d5b5276d7a7bb SHA256 44f697bb301b50179caca6a26988e25de6c135df426db6c99abc0b6da29a6eac
 EBUILD madwifi-ng-0.9.3.2.ebuild 2574 RMD160 d003899f51725f72a4b0ae819816fd557d92b36a SHA1 a837f6594168e3d1f04df6af7a2ccf5670e0b992 SHA256 ffd7d43f928a8897315c3af3e97378c9946baf6950edb5910d09baa3131dc09f
 EBUILD madwifi-ng-0.9.3.3.ebuild 2642 RMD160 bb05de05aa5d55ff56d490ee1af21225b14318b3 SHA1 0ed783f8dd4347ce88b4949642bae0b3e5baeab0 SHA256 63df2b7e715ff7a440dc9b2f4c70cccd1856f129f8a8f86c939ab9c1ea5b9927
-EBUILD madwifi-ng-0.9.4-r1.ebuild 3376 RMD160 4219153f5898c9c5d5f6076ab11aa2178b59e632 SHA1 c8fa79315f2a3a87bac73ddcbdfb938f34103dfe SHA256 102a4ae96b6cb4bc1db86c11625d1fecb584ce71b624e4d770ca5e2531028ce7
+EBUILD madwifi-ng-0.9.4-r1.ebuild 3447 RMD160 12126ad322dc7379835f2b6b29d58e9d997d9ab2 SHA1 5d2e2e90a11032ed580cc8d7a81898ee6f9297eb SHA256 10825a4f262ffeb06459f2ac000241755a9a7ab0b3776be0ebe787b24a4acb19
 EBUILD madwifi-ng-0.9.4.ebuild 3157 RMD160 26e275811b8d0f5a5c4a4da8a77a26e49e28a765 SHA1 949bada8647500c27fceb2d7fb5530351a27ac49 SHA256 587563c6e6212154818c1a0576200bb22abe22453dc52c6a38d0c7a9c37eba2e
-MISC ChangeLog 20277 RMD160 d925a83c0ba0fc2d2dbcaef188227b32cdc8c32c SHA1 43d24d8a925882feffba3271af2008be41841e61 SHA256 d1d717626ebdf9fed0ccdb981d88eaa712a59097ee64b34f321cbcfc20c57fed
+MISC ChangeLog 20452 RMD160 c5d6baf3d975ed4a20eb48bae9cf4e4fe2bf02e7 SHA1 4842b931f72e46fec00fc8c025d0ce3d577bf703 SHA256 07ab6648b7ea50b1aee2e9117226100f27f428b05cd19fc3c2d63b19bc0c82eb
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch
new file mode 100644
index 000000000000..96ae590be7df
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch
@@ -0,0 +1,161 @@
+Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c

+===================================================================

+--- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3080)

++++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3811)

+@@ -1552,4 +1552,5 @@

+ struct iwscanreq {		/* XXX: right place for this declaration? */

+ 	struct ieee80211vap *vap;

++	struct iw_request_info *info;

+ 	char *current_ev;

+ 	char *end_buf;

+@@ -1557,4 +1558,11 @@

+ };

+ 

++#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 int

+ giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)

+@@ -1591,5 +1599,6 @@

+ 	else

+ 		IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);

+-	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);

++	current_ev = iwe_stream_add_event(req->info, current_ev, end_buf,

++					&iwe, IW_EV_ADDR_LEN);

+ 

+ 	/* We ran out of space in the buffer. */

+@@ -1604,9 +1613,9 @@

+ 		iwe.u.data.length = vap->iv_des_nssid > 0 ?

+ 			vap->iv_des_ssid[0].len : 0;

+-		current_ev = iwe_stream_add_point(current_ev,

++		current_ev = iwe_stream_add_point(req->info, current_ev,

+ 			end_buf, &iwe, vap->iv_des_ssid[0].ssid);

+ 	} else {

+ 		iwe.u.data.length = se->se_ssid[1];

+-		current_ev = iwe_stream_add_point(current_ev,

++		current_ev = iwe_stream_add_point(req->info, current_ev,

+ 			end_buf, &iwe, (char *) se->se_ssid+2);

+ 	}

+@@ -1622,6 +1631,6 @@

+ 		iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?

+ 			IW_MODE_MASTER : IW_MODE_ADHOC;

+-		current_ev = iwe_stream_add_event(current_ev,

+-			end_buf, &iwe, IW_EV_UINT_LEN);

++		current_ev = iwe_stream_add_event(req->info, current_ev,

++				end_buf, &iwe, IW_EV_UINT_LEN);

+ 

+ 		/* We ran out of space in the buffer. */

+@@ -1635,6 +1644,6 @@

+ 	iwe.u.freq.m = se->se_chan->ic_freq * 100000;

+ 	iwe.u.freq.e = 1;

+-	current_ev = iwe_stream_add_event(current_ev,

+-		end_buf, &iwe, IW_EV_FREQ_LEN);

++	current_ev = iwe_stream_add_event(req->info, current_ev,

++			end_buf, &iwe, IW_EV_FREQ_LEN);

+ 

+ 	/* We ran out of space in the buffer. */

+@@ -1646,6 +1655,6 @@

+ 	iwe.cmd = IWEVQUAL;

+ 	set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE);

+-	current_ev = iwe_stream_add_event(current_ev,

+-		end_buf, &iwe, IW_EV_QUAL_LEN);

++	current_ev = iwe_stream_add_event(req->info, current_ev,

++			end_buf, &iwe, IW_EV_QUAL_LEN);

+ 

+ 	/* We ran out of space in the buffer */

+@@ -1661,5 +1670,6 @@

+ 		iwe.u.data.flags = IW_ENCODE_DISABLED;

+ 	iwe.u.data.length = 0;

+-	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");

++	current_ev = iwe_stream_add_point(req->info, current_ev,

++					end_buf, &iwe, "");

+ 

+ 	/* We ran out of space in the buffer. */

+@@ -1670,5 +1680,5 @@

+ 	last_ev = current_ev;

+ 	iwe.cmd = SIOCGIWRATE;

+-	current_val = current_ev + IW_EV_LCP_LEN;

++	current_val = current_ev + iwe_stream_lcp_len(req->info);

+ 	/* NB: not sorted, does it matter? */

+ 	for (j = 0; j < se->se_rates[1]; j++) {

+@@ -1676,7 +1686,7 @@

+ 		if (r != 0) {

+ 			iwe.u.bitrate.value = r * (1000000 / 2);

+-			current_val = iwe_stream_add_value(current_ev,

+-				current_val, end_buf, &iwe,

+-				IW_EV_PARAM_LEN);

++			current_val = iwe_stream_add_value(req->info,

++					current_ev, current_val, end_buf,

++					&iwe, IW_EV_PARAM_LEN);

+ 		}

+ 	}

+@@ -1685,11 +1695,11 @@

+ 		if (r != 0) {

+ 			iwe.u.bitrate.value = r * (1000000 / 2);

+-			current_val = iwe_stream_add_value(current_ev,

+-				current_val, end_buf, &iwe,

+-				IW_EV_PARAM_LEN);

++			current_val = iwe_stream_add_value(req->info,

++					current_ev, current_val, end_buf,

++					&iwe, IW_EV_PARAM_LEN);

+ 		}

+ 	}

+ 	/* remove fixed header if no rates were added */

+-	if ((current_val - current_ev) > IW_EV_LCP_LEN) {

++	if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) {

+ 		current_ev = current_val;

+ 	} else {

+@@ -1705,5 +1715,6 @@

+ 	snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);

+ 	iwe.u.data.length = strlen(buf);

+-	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);

++	current_ev = iwe_stream_add_point(req->info, current_ev,

++					end_buf, &iwe, buf);

+ 

+ 	/* We ran out of space in the buffer. */

+@@ -1729,6 +1740,6 @@

+ #endif

+ 		if (iwe.u.data.length != 0) {

+-			current_ev = iwe_stream_add_point(current_ev, end_buf,

+-				&iwe, buf);

++			current_ev = iwe_stream_add_point(req->info,

++					current_ev, end_buf, &iwe, buf);

+ 			

+ 			/* We ran out of space in the buffer */

+@@ -1755,6 +1766,6 @@

+ #endif

+ 		if (iwe.u.data.length != 0) {

+-			current_ev = iwe_stream_add_point(current_ev, end_buf,

+-				&iwe, buf);

++			current_ev = iwe_stream_add_point(req->info,

++					current_ev, end_buf, &iwe, buf);

+ 			

+ 			/* We ran out of space in the buffer. */

+@@ -1774,6 +1785,6 @@

+ 			wme_leader, sizeof(wme_leader) - 1);

+ 		if (iwe.u.data.length != 0) {

+-			current_ev = iwe_stream_add_point(current_ev, end_buf,

+-				&iwe, buf);

++			current_ev = iwe_stream_add_point(req->info,

++					current_ev, end_buf, &iwe, buf);

+ 

+ 			/* We ran out of space in the buffer. */

+@@ -1792,6 +1803,6 @@

+ 			ath_leader, sizeof(ath_leader) - 1);

+ 		if (iwe.u.data.length != 0) {

+-			current_ev = iwe_stream_add_point(current_ev, end_buf,

+-				&iwe, buf);

++			current_ev = iwe_stream_add_point(req->info,

++					current_ev, end_buf, &iwe, buf);

+ 

+ 			/* We ran out of space in the buffer. */

+@@ -1816,4 +1827,5 @@

+ 

+ 	req.vap = vap;

++	req.info = info;

+ 	req.current_ev = extra;

+ 	if (data->length == 0) {

diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
index 334195e5744c..fd96235e6c17 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.1 2008/10/14 06:01:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.2 2008/10/20 03:11:19 pva Exp $
 
 inherit linux-mod
 
@@ -54,16 +54,17 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.9.3-uudecode-gcda-fix.patch
+	epatch "${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch"
 	if use injection; then epatch "${FILESDIR}"/${PN}-r1886.patch; fi
 	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/minstrel ath_rate/onoe ath_rate/sample; do
-		convert_to_m "${S}"/${dir}/Makefile
+		convert_to_m "${S}/${dir}/Makefile"
 	done
-	epatch "${FILESDIR}"/madwifi-dfs-ieee80211-skb-update.patch
+	epatch "${FILESDIR}/madwifi-dfs-ieee80211-skb-update.patch"
+	kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch"
 	# Workaround our build system, bug #232099 (bug #237618 describes details)
 	touch Module.symvers
 	for ms in ath net80211 ath_hal ath_rate/{amrr,minstrel,onoe,sample}; do
-		ln -s "${S}"/Module.symvers ${ms}
+		ln -s "${S}/Module.symvers" "${ms}"
 	done
 }