Adding a patch for ieee80211-1.1.13 compilation against linux-2.6.19 (thanks to Scott Van Der Wall <svdw@udel.edu> for the patch and Stefan for bugging me about it).

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 129 insertions, 15 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 42fe34d28b33..1a6bd3d4a5da 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.41 2006/10/13 12:28:07 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.42 2006/12/07 19:40:29 phreak Exp $
+
+  07 Dec 2006; Christian Heim <phreak@gentoo.org>
+  +files/ieee80211-1.1.13-linux-2.6.19.patch, ieee80211-1.1.13-r1.ebuild:
+  Adding a patch for ieee80211-1.1.13 compilation against linux-2.6.19 (thanks to
+  Scott Van Der Wall <svdw@udel.edu> for the patch and Stefan for bugging me
+  about it).
 
   13 Oct 2006; Christian Heim <phreak@gentoo.org>
   -files/ieee80211-1.1.14-smp-disconnect.patch, -ieee80211-1.1.14.ebuild,
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index 6728cdb1386e..f53a4fc47406 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -5,6 +5,10 @@ AUX ieee80211-1.1.13-cflags.patch 1184 RMD160 ee477fc15c98048fd17ecc6982175e7e03
 MD5 4f7fd86211611d66908e597267f2578f files/ieee80211-1.1.13-cflags.patch 1184
 RMD160 ee477fc15c98048fd17ecc6982175e7e03edaa37 files/ieee80211-1.1.13-cflags.patch 1184
 SHA256 45ac2892b2c17b68bfaa03dfda77954a260a18a05d9dc64a1e2ab57811e0d276 files/ieee80211-1.1.13-cflags.patch 1184
+AUX ieee80211-1.1.13-linux-2.6.19.patch 3135 RMD160 6205b1531e25d32dc121ab230548195821c398e2 SHA1 697d29dd744999defd8de5c90b7d7fc4a862ef19 SHA256 f7c7f7aa909f480acdefdc190251659757baf62cfcdaaa0cdd46dc6b1da3ad8d
+MD5 5361147f2217e82391278f8aefa66dcb files/ieee80211-1.1.13-linux-2.6.19.patch 3135
+RMD160 6205b1531e25d32dc121ab230548195821c398e2 files/ieee80211-1.1.13-linux-2.6.19.patch 3135
+SHA256 f7c7f7aa909f480acdefdc190251659757baf62cfcdaaa0cdd46dc6b1da3ad8d files/ieee80211-1.1.13-linux-2.6.19.patch 3135
 AUX ieee80211-1.1.13-tkip.patch 6154 RMD160 9f368a19ab179e574729d381129800beade0b3f6 SHA1 b325d3fca854923c99bfa8a8dd4714879a634603 SHA256 a182e1beb805c506868002c9efd6d0a5a44779c7542d7d19d9b21503b13f5e16
 MD5 733be1adf0bd4b65e27769af5b40e79e files/ieee80211-1.1.13-tkip.patch 6154
 RMD160 9f368a19ab179e574729d381129800beade0b3f6 files/ieee80211-1.1.13-tkip.patch 6154
@@ -15,18 +19,18 @@ RMD160 b7ae7fd18233a6c10cbaf877811598248b524e77 files/remove-old 1460
 SHA256 2ff1047385787a6b4c7ceff3d4ca9ad13fbcaca1280f7f60e4414928a86e0c76 files/remove-old 1460
 DIST ieee80211-1.1.13.tgz 67289 RMD160 adf594006278adc51de6e61124a99b05cfec4d08 SHA1 76c9e0c7233aacdacfc0b663dbe8d2d665b14310 SHA256 b22ce1bd9f4e3638e6b516e55e35f29103eb4ada814a6d401555957beced8afa
 DIST ieee80211-1.2.15.tgz 68832 RMD160 514e54eb8477a2187deb05ef212c23c5ce7094ad SHA1 a54e66ae96f66bd0d58e29431a60f5f63a6453db SHA256 89fa1c610ac7b6db3c4b6b79c220334a65f85b4011429ce3631094d268ae5668
-EBUILD ieee80211-1.1.13-r1.ebuild 2985 RMD160 e03e34949981345d62eb654d3ea07b2f44d15f50 SHA1 85e2938a9da80f85a709961131f16919314423bb SHA256 52246bbb05e0c702ec545a69bd05f83b276b03991c29350171f6342240ff52f7
-MD5 735a17ed82994f5d3b42334b6509606e ieee80211-1.1.13-r1.ebuild 2985
-RMD160 e03e34949981345d62eb654d3ea07b2f44d15f50 ieee80211-1.1.13-r1.ebuild 2985
-SHA256 52246bbb05e0c702ec545a69bd05f83b276b03991c29350171f6342240ff52f7 ieee80211-1.1.13-r1.ebuild 2985
+EBUILD ieee80211-1.1.13-r1.ebuild 3167 RMD160 e47d681e4a938fa8486c037fd4adb0beb3cabd89 SHA1 530ccbc58399cb851f50b00fa032e70189b507ed SHA256 7052af847153543782b109aa14b3447423835ac35e4ad82874c587188930fff2
+MD5 a7f9ac025e1de429c1a964b43592f9c9 ieee80211-1.1.13-r1.ebuild 3167
+RMD160 e47d681e4a938fa8486c037fd4adb0beb3cabd89 ieee80211-1.1.13-r1.ebuild 3167
+SHA256 7052af847153543782b109aa14b3447423835ac35e4ad82874c587188930fff2 ieee80211-1.1.13-r1.ebuild 3167
 EBUILD ieee80211-1.2.15.ebuild 2948 RMD160 c5cbb47b9cfbf6927ef96feef92f2ec094465774 SHA1 31801e181cc917b8521d4432b670ae2a8124b693 SHA256 d500bd34f968ae9caff92bd730785b73721914afbf229fef1c52a8982d916c47
 MD5 f43bb92136b5ed7a8e27682cf9feb14c ieee80211-1.2.15.ebuild 2948
 RMD160 c5cbb47b9cfbf6927ef96feef92f2ec094465774 ieee80211-1.2.15.ebuild 2948
 SHA256 d500bd34f968ae9caff92bd730785b73721914afbf229fef1c52a8982d916c47 ieee80211-1.2.15.ebuild 2948
-MISC ChangeLog 8068 RMD160 fe893141cb05d65a48446c7fe5fbc792d0630169 SHA1 313004dfced958056df5169e4419d9de9d4c4e35 SHA256 cbd612f3b339fbddb270bd35b4a7f8bc0be7bb19e9360d95fdf837c8b41900d9
-MD5 ff4534870e70223cdb23dc18e09f51de ChangeLog 8068
-RMD160 fe893141cb05d65a48446c7fe5fbc792d0630169 ChangeLog 8068
-SHA256 cbd612f3b339fbddb270bd35b4a7f8bc0be7bb19e9360d95fdf837c8b41900d9 ChangeLog 8068
+MISC ChangeLog 8365 RMD160 51c2ee0301952ef3c23e69455724ad9e3322aa3b SHA1 4d1110cf8ec422e82a2805bb851e63dc297f93e0 SHA256 a878a79debbb9a09ff4aa57a3b293a64620bf56830623e6cdb5ad161c558acac
+MD5 c7188b73f37ea9dee8cf4aced9de1ca3 ChangeLog 8365
+RMD160 51c2ee0301952ef3c23e69455724ad9e3322aa3b ChangeLog 8365
+SHA256 a878a79debbb9a09ff4aa57a3b293a64620bf56830623e6cdb5ad161c558acac ChangeLog 8365
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -40,7 +44,7 @@ SHA256 4670076b2a3644bd9721e173a2caf2c78a6e7415634c1999de958582457c26f1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFL4ZeyuNVb5qfaOYRAqprAJ9x5zTEnzGmzI+Eqzyv4m7oXg5LzACdGqqL
-5M1L44BekgnyVrK/j4MaGSo=
-=wk1d
+iD8DBQFFeG42yuNVb5qfaOYRAnKcAJ9bx72eA8EjOejt95wkSECe+WmBeQCgpOfM
+bMhVH3kysXmy0hZ9IuXje/c=
+=WiKm
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ieee80211/files/ieee80211-1.1.13-linux-2.6.19.patch b/net-wireless/ieee80211/files/ieee80211-1.1.13-linux-2.6.19.patch
new file mode 100644
index 000000000000..e9e95601b7dd
--- /dev/null
+++ b/net-wireless/ieee80211/files/ieee80211-1.1.13-linux-2.6.19.patch
@@ -0,0 +1,101 @@
+Index: ieee80211-1.1.13/ieee80211_crypt_ccmp.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_crypt_ccmp.c
++++ ieee80211-1.1.13/ieee80211_crypt_ccmp.c
+@@ -8,8 +8,9 @@
+  * published by the Free Software Foundation. See README and COPYING for
+  * more details.
+  */
+-
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+Index: ieee80211-1.1.13/ieee80211_crypt_tkip.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_crypt_tkip.c
++++ ieee80211-1.1.13/ieee80211_crypt_tkip.c
+@@ -8,8 +8,9 @@
+  * published by the Free Software Foundation. See README and COPYING for
+  * more details.
+  */
+-
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+Index: ieee80211-1.1.13/ieee80211_crypt_wep.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_crypt_wep.c
++++ ieee80211-1.1.13/ieee80211_crypt_wep.c
+@@ -8,8 +8,9 @@
+  * published by the Free Software Foundation. See README and COPYING for
+  * more details.
+  */
+-
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+Index: ieee80211-1.1.13/ieee80211_geo.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_geo.c
++++ ieee80211-1.1.13/ieee80211_geo.c
+@@ -24,7 +24,9 @@
+ 
+ ******************************************************************************/
+ #include <linux/compiler.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+Index: ieee80211-1.1.13/ieee80211_module.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_module.c
++++ ieee80211-1.1.13/ieee80211_module.c
+@@ -31,7 +31,9 @@
+ *******************************************************************************/
+ 
+ #include <linux/compiler.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+Index: ieee80211-1.1.13/ieee80211_rx.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_rx.c
++++ ieee80211-1.1.13/ieee80211_rx.c
+@@ -14,7 +14,9 @@
+  */
+ 
+ #include <linux/compiler.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+Index: ieee80211-1.1.13/ieee80211_tx.c
+===================================================================
+--- ieee80211-1.1.13.orig/ieee80211_tx.c
++++ ieee80211-1.1.13/ieee80211_tx.c
+@@ -24,7 +24,9 @@
+ 
+ ******************************************************************************/
+ #include <linux/compiler.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
diff --git a/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild
index da4dce9e4fac..ff65993df252 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild,v 1.3 2006/10/13 12:22:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild,v 1.4 2006/12/07 19:40:29 phreak Exp $
 
 inherit eutils linux-mod
 
@@ -73,9 +73,12 @@ src_unpack() {
 	local debug="n"
 
 	unpack ${A}
-
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-*.patch
+
+	epatch "${FILESDIR}/ieee80211-1.1.13-cflags.patch"
+	epatch "${FILESDIR}/ieee80211-1.1.13-tkip.patch"
+	# bug 157076 (ieee80211 doesn't compile against 2.6.19)
+	epatch "${FILESDIR}/ieee80211-1.1.13-linux-2.6.19.patch"
 
 	use debug && debug="y"
 	sed -i \