Fixed build problem with gcc-4.3, bug #256669, thank cilly for report and fix.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 49 insertions, 9 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 53e4bf6b584b..35ccae1cf058 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,12 @@
 # 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.64 2008/11/15 16:28:31 pva Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.65 2009/01/31 16:15:06 pva Exp $
+
+  31 Jan 2009; Peter Volkov <pva@gentoo.org>
+  +files/madwifi-ng-0.9.4-request_module-build.patch,
+  madwifi-ng-0.9.4.ebuild, madwifi-ng-0.9.4-r1.ebuild:
+  Fixed build problem with gcc-4.3, bug #256669, thank cilly for report and
+  fix.
 
   15 Nov 2008; Peter Volkov <pva@gentoo.org> madwifi-ng-0.9.4.ebuild,
   madwifi-ng-0.9.4-r1.ebuild:
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 1090ad53eee0..5b3a345d002d 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -2,6 +2,7 @@ AUX madwifi-2.6.22.patch 3591 RMD160 f895c5766eb51369e376cf22674b08f8a6125972 SH
 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 6515 RMD160 6d52c90f5afad8c225a2d23d90af593e4f00b666 SHA1 0f49938eb9a9b523ebb8925a446018010454184b SHA256 d98fc130d1588b599119eda5d3d723f6e7b83201a89ca9c1bac8760042308e41
+AUX madwifi-ng-0.9.4-request_module-build.patch 860 RMD160 d34c08fe10e21226e1593098cf23edc98275d907 SHA1 4a3c9894a8272aefe5be4c718753ead8c4277858 SHA256 5a9ade8f6d5c86ef7e80085c55983a6cf7269d367d383f175f3b88974ddd47aa
 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
@@ -10,7 +11,7 @@ DIST madwifi-0.9.4.tar.bz2 3485142 RMD160 a493addc2f566e07f29033b671fea1b7143a90
 EBUILD madwifi-ng-0.9.3.1.ebuild 2651 RMD160 5174766ea6574266b78ac8ac6b0bb9117975e4a1 SHA1 81ed42fb9feac3c17d60b01361335748bada47cc SHA256 aa9543b2dd5c15de944547550d3c0439f7c8b6bc8d7e3f5b24e73368906e7d99
 EBUILD madwifi-ng-0.9.3.2.ebuild 2582 RMD160 dd346833d3f9e9632c34914f4188f1c4154ca40c SHA1 c3d41e3344e414d9f67517a489288f7fac1c5d5d SHA256 9d3bbcd485a4f83ecb5fd3ac0952154acb8f2a11c31c574b469753794bad29c5
 EBUILD madwifi-ng-0.9.3.3.ebuild 2648 RMD160 532e75561cd39cc9a9ae7a8e1f4227576e2a2006 SHA1 67d3a07ff48ce784411a61043bff1d0c490d1c70 SHA256 b3e2bc6ae66249b260550765deed32d90b6fcabc2f105721012fe90b28d97111
-EBUILD madwifi-ng-0.9.4-r1.ebuild 3240 RMD160 38f81c61cbcecdcb8281cc3d338c033c00496eeb SHA1 53655158ef250defc2e7a9b1ecc50280d20f12ea SHA256 0f0da82c11b0d8d3160e7db0935b023a647d6e159fc38076e35c5bda0cdb0656
-EBUILD madwifi-ng-0.9.4.ebuild 3234 RMD160 0e47ca5833d2613bb1f4c9f849841ef8654e2e39 SHA1 63788113220811029d146037a89e61a8e32d15e1 SHA256 0b6d38f091f654005de238820ab30574898551e6948d43173c2b97935fa17c5b
-MISC ChangeLog 21366 RMD160 a9a41d9a1385fe64f6c34435ffea6369d349281c SHA1 ca4ce11f5987f33b8dd40f4b267eaa7d7a9f62b9 SHA256 f0a51e08cec65950ace58ec0ab43202bb953dfbaeb2989c4feb2c5ecc92c55f1
+EBUILD madwifi-ng-0.9.4-r1.ebuild 3294 RMD160 0b69dcc263804bb1653b2e75ea21c598763197f9 SHA1 d7078b04880005c9b86557fe42e80d9be7aded91 SHA256 652ebafeec6f90e7a9c58f6587487bb063c6eccf72af2a0aaeab00154c5033ee
+EBUILD madwifi-ng-0.9.4.ebuild 3289 RMD160 70eca4576408be39af87c7fcc11ab8e720127eec SHA1 272d04e2c2970c8708743d3f4396b5c3d22bdc44 SHA256 2a48e40103e97b355271ef25a0f5ac34b14718f4c8f149f178feeaee833a52f7
+MISC ChangeLog 21604 RMD160 0addfc5ad77674cdc551860d3b943987007bbd19 SHA1 ac6dfd97b0ff90544760a1c1151fb0deb17ad373 SHA256 87b983501179f3f5d9e82bb086878b7421c5fcaeffe3af39a99f8acfb76e5e24
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch
new file mode 100644
index 000000000000..ad338a3b70e0
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/show_bug.cgi?id=232099
+http://madwifi-project.org/changeset/3880
+
+=== modified file 'include/compat.h'
+--- include/compat.h	2009-01-31 16:01:16 +0000
++++ include/compat.h	2009-01-31 16:03:33 +0000
+@@ -175,6 +175,10 @@
+ #define DEV_ATH CTL_UNNUMBERED
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++#define request_module(_fmt, _modname) request_module(_modname)
++#endif
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ATH_COMPAT_H_ */
+
+=== modified file 'net80211/ieee80211_linux.c'
+--- net80211/ieee80211_linux.c	2009-01-31 16:01:16 +0000
++++ net80211/ieee80211_linux.c	2009-01-31 16:03:09 +0000
+@@ -335,7 +335,7 @@
+ {
+ #ifdef CONFIG_KMOD
+ 	int rv;
+-	rv = request_module(modname);
++	rv = request_module("%s", modname);
+ 	if (rv < 0)
+ 		printk(KERN_ERR "failed to automatically load module: %s; " \
+ 			"errno: %d\n", modname, rv);
+
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 6fc7566bec45..2dd24c1192b5 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
+# Copyright 1999-2009 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.4 2008/11/15 16:28:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.5 2009/01/31 16:15:06 pva Exp $
 
 inherit linux-mod
 
@@ -61,6 +61,7 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}/madwifi-dfs-ieee80211-skb-update.patch"
 	kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch"
+	epatch "${FILESDIR}/${P}-request_module-build.patch"
 }
 
 src_install() {
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
index a03266f2c9b0..07f6dc96077a 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.9 2008/11/15 16:28:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild,v 1.10 2009/01/31 16:15:06 pva Exp $
 
 inherit linux-mod
 
@@ -61,6 +61,7 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}"/madwifi-dfs-ieee80211-skb-update.patch
 	kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch"
+	epatch "${FILESDIR}/${P}-request_module-build.patch"
 }
 
 src_install() {