Add patch to build against kernels later than 2.6.21. Fixes bug #192052.

Package-Manager: portage-2.1.4_rc11

5 files changed, 205 insertions, 5 deletions

diff --git a/net-wireless/linux-wlan-ng-modules/ChangeLog b/net-wireless/linux-wlan-ng-modules/ChangeLog
index d7b52c232de5..2d5f21671df6 100644
--- a/net-wireless/linux-wlan-ng-modules/ChangeLog
+++ b/net-wireless/linux-wlan-ng-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/linux-wlan-ng-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.14 2007/05/09 16:30:52 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.15 2007/12/29 23:38:19 betelgeuse Exp $
+
+*linux-wlan-ng-modules-0.2.8-r1 (29 Dec 2007)
+
+  29 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.2.8-sk_buff-mac.patch, +linux-wlan-ng-modules-0.2.8-r1.ebuild:
+  Add patch to build against kernels later than 2.6.21. Fixes bug #192052.
 
 *linux-wlan-ng-modules-0.2.8 (09 May 2007)
 
diff --git a/net-wireless/linux-wlan-ng-modules/Manifest b/net-wireless/linux-wlan-ng-modules/Manifest
index e8576bc3477e..9842396d78c7 100644
--- a/net-wireless/linux-wlan-ng-modules/Manifest
+++ b/net-wireless/linux-wlan-ng-modules/Manifest
@@ -1,16 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.2.8-sk_buff-mac.patch 3684 RMD160 580fa09fa7f077e0b8b73a7f62929b82bde52811 SHA1 c3c5562ad3dceec1e6f45894b93eae7f7cb50ce1 SHA256 9a1a4608a3617c22f68e5a61069d4d73448c8dd3cfece4f25aacd18f21e92103
+MD5 2c40d0eb6c45f8d4e3547019b3314bf8 files/0.2.8-sk_buff-mac.patch 3684
+RMD160 580fa09fa7f077e0b8b73a7f62929b82bde52811 files/0.2.8-sk_buff-mac.patch 3684
+SHA256 9a1a4608a3617c22f68e5a61069d4d73448c8dd3cfece4f25aacd18f21e92103 files/0.2.8-sk_buff-mac.patch 3684
 AUX linux-wlan-ng-0.2.5-sandbox.patch 603 RMD160 2499eaba829a3291ba5784776c9b43afc15e362e SHA1 0f61e41929e4730ef0454a4cdf22ac5982a422f1 SHA256 5337c3fafefd23ffaca670629ca53ec1d3bc22b6a4bf580f9c85fadd6d41721d
 MD5 b0544da489d867dea11ab5f1d51292a7 files/linux-wlan-ng-0.2.5-sandbox.patch 603
 RMD160 2499eaba829a3291ba5784776c9b43afc15e362e files/linux-wlan-ng-0.2.5-sandbox.patch 603
 SHA256 5337c3fafefd23ffaca670629ca53ec1d3bc22b6a4bf580f9c85fadd6d41721d files/linux-wlan-ng-0.2.5-sandbox.patch 603
 DIST linux-wlan-ng-0.2.8.tar.bz2 462193 RMD160 1b246f4603589641e4d637205cda39602f586cf2 SHA1 a98cd5c7327f5392730ebe1a5b7f289fc88d00de SHA256 e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
+EBUILD linux-wlan-ng-modules-0.2.8-r1.ebuild 2322 RMD160 a42a14435c078bfe8362ad9614f90df586545386 SHA1 cac3e7f0e537be83a0532ff31138ae969ccecedc SHA256 9799ac3f710dd038c97739f82f3bb08ddbe41e264be28b4eb1ac96f6ee980850
+MD5 ceeb0d4d2968785fb0c1c023e62be834 linux-wlan-ng-modules-0.2.8-r1.ebuild 2322
+RMD160 a42a14435c078bfe8362ad9614f90df586545386 linux-wlan-ng-modules-0.2.8-r1.ebuild 2322
+SHA256 9799ac3f710dd038c97739f82f3bb08ddbe41e264be28b4eb1ac96f6ee980850 linux-wlan-ng-modules-0.2.8-r1.ebuild 2322
 EBUILD linux-wlan-ng-modules-0.2.8.ebuild 2324 RMD160 381bf65579d5680d81c27924da0e164517e9396e SHA1 a84d8edd67950e57236705db8b52f3a7fc38a3ba SHA256 52cf0a250ba320a803699e26a2ed4da173f8f4670f039716b37c6a8d9ef7ee62
 MD5 24436141dc2c82bce332e73716134ebc linux-wlan-ng-modules-0.2.8.ebuild 2324
 RMD160 381bf65579d5680d81c27924da0e164517e9396e linux-wlan-ng-modules-0.2.8.ebuild 2324
 SHA256 52cf0a250ba320a803699e26a2ed4da173f8f4670f039716b37c6a8d9ef7ee62 linux-wlan-ng-modules-0.2.8.ebuild 2324
-MISC ChangeLog 3979 RMD160 79426c56bdda32369c0d949bc06d54048f7ce6e1 SHA1 1b54007ad20ce46fd87fd5f37fa72a383c310de9 SHA256 bd807b0d99d30b33c4fdde72adfedcf68d54c913a4dc614aad77ee66d6557c76
-MD5 ecf994eb61b4c6b48fffb2065e57a44e ChangeLog 3979
-RMD160 79426c56bdda32369c0d949bc06d54048f7ce6e1 ChangeLog 3979
-SHA256 bd807b0d99d30b33c4fdde72adfedcf68d54c913a4dc614aad77ee66d6557c76 ChangeLog 3979
+MISC ChangeLog 4232 RMD160 8f1e62a79065a25e0327244e870c9dc2b29dab5f SHA1 7c5cc3fa65c46ae421aaa9954845489d554ad339 SHA256 fb9865188412b320b0188d2ee92c4177c44447276428a4132def86a5fec36dd8
+MD5 4c2a836ab32ff642d7ee9464b2566bf1 ChangeLog 4232
+RMD160 8f1e62a79065a25e0327244e870c9dc2b29dab5f ChangeLog 4232
+SHA256 fb9865188412b320b0188d2ee92c4177c44447276428a4132def86a5fec36dd8 ChangeLog 4232
 MISC metadata.xml 571 RMD160 a17abb45825b57ac44fc2c76bbddc05dfc70e6b1 SHA1 bcfab6e5905e962e40e46ce903f1d87fef96c24c SHA256 7c0a45fa8b25ff12fcc72f4a57755393f3c566706ad05cd839d583a541603a2c
 MD5 bd46277fb8c768aa34612bb9cb43fe75 metadata.xml 571
 RMD160 a17abb45825b57ac44fc2c76bbddc05dfc70e6b1 metadata.xml 571
@@ -18,3 +29,13 @@ SHA256 7c0a45fa8b25ff12fcc72f4a57755393f3c566706ad05cd839d583a541603a2c metadata
 MD5 1ea543ce812f307424892d96b67bc6cf files/digest-linux-wlan-ng-modules-0.2.8 262
 RMD160 258d2ccc6e1735c01202ac590e648742d2b722e5 files/digest-linux-wlan-ng-modules-0.2.8 262
 SHA256 adbef89ec4ab79f614b35630e7fdd1f3014afbb6705cd04d889f269a186e5330 files/digest-linux-wlan-ng-modules-0.2.8 262
+MD5 1ea543ce812f307424892d96b67bc6cf files/digest-linux-wlan-ng-modules-0.2.8-r1 262
+RMD160 258d2ccc6e1735c01202ac590e648742d2b722e5 files/digest-linux-wlan-ng-modules-0.2.8-r1 262
+SHA256 adbef89ec4ab79f614b35630e7fdd1f3014afbb6705cd04d889f269a186e5330 files/digest-linux-wlan-ng-modules-0.2.8-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHdtpxcxLzpIGCsLQRAtz8AJ9uZMhlfHNCpUipIvEbGJRcuLtmtgCfRNwW
+JZApStj1wLGHW6nD2TPO7Wg=
+=pyAa
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch b/net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch
new file mode 100644
index 000000000000..b522073be384
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch
@@ -0,0 +1,76 @@
+diff -ru linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-0.2.8.devel/src/p80211/p80211conv.c
+--- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/p80211/p80211conv.c	2007-06-05 18:57:49.234754000 +0200
+@@ -498,7 +498,9 @@
+ 	}
+ 
+ 	skb->protocol = eth_type_trans(skb, netdev);
+-	skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */
++	/* XXX: I *think* this is right. -jeffm */
++	skb_reset_mac_header(skb);
++//	skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */
+ 
+         /* jkriegl: process signal and noise as set in hfa384x_int_rx() */
+ 	/* jkriegl: only process signal/noise if requested by iwspy */
+diff -ru linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8.devel/src/p80211/p80211netdev.c
+--- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/p80211/p80211netdev.c	2007-06-05 19:03:35.952167000 +0200
+@@ -389,7 +389,7 @@
+ 
+ 				/* set up various data fields */
+ 				skb->dev = dev;
+-				skb->mac.raw = skb->data ;
++				skb_reset_mac_header(skb);
+ 				skb->ip_summed = CHECKSUM_NONE;
+ 				skb->pkt_type = PACKET_OTHERHOST;
+ 				skb->protocol = htons(ETH_P_80211_RAW); 
+diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x.c
+--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x.c	2007-06-05 19:04:30.845216000 +0200
+@@ -3645,7 +3645,7 @@
+ 		/* the prism2 cards don't return the FCS */
+ 		datap = skb_put(skb, WLAN_CRC_LEN);
+ 		memset (datap, 0xff, WLAN_CRC_LEN);
+-		skb->mac.raw = skb->data;
++		skb_reset_mac_header(skb);
+ 
+ 		/* Attach the rxmeta, set some stuff */
+ 		p80211skb_rxmeta_attach(wlandev, skb);
+diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x_usb.c
+--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x_usb.c	2007-06-05 19:04:46.641407000 +0200
+@@ -4255,7 +4255,7 @@
+ 		/* The prism2 series does not return the CRC */
+ 		memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN);
+ 
+-		skb->mac.raw = skb->data;
++		skb_reset_mac_header(skb);
+ 
+ 		/* Attach the rxmeta, set some stuff */
+ 		p80211skb_rxmeta_attach(wlandev, skb);
+diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_pci.c
+--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_pci.c	2007-06-05 19:33:15.406928000 +0200
+@@ -275,7 +275,7 @@
+ static int __init prism2pci_init(void)
+ {
+         WLAN_LOG_NOTICE("%s Loaded\n", version);
+-	return pci_module_init(&prism2_pci_drv_id);
++	return pci_register_driver(&prism2_pci_drv_id);
+ };
+ 
+ static void __exit prism2pci_cleanup(void)
+Only in linux-wlan-ng-0.2.8.devel/src/prism2/driver: prism2_pci.c~
+diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_plx.c
+--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c	2007-03-19 16:37:00.000000000 +0100
++++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_plx.c	2007-06-05 19:33:12.758581000 +0200
+@@ -420,7 +420,7 @@
+ static int __init prism2plx_init(void)
+ {
+         WLAN_LOG_NOTICE("%s Loaded\n", version);
+-	return pci_module_init(&prism2_plx_drv_id);
++	return pci_register_driver(&prism2_plx_drv_id);
+ };
+ 
+ static void __exit prism2plx_cleanup(void)
+Only in linux-wlan-ng-0.2.8.devel/src/prism2/driver: prism2_plx.c~
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1
new file mode 100644
index 000000000000..99c1aa9bee3b
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1
@@ -0,0 +1,3 @@
+MD5 5d86ca7bb4ed458743acd922ff09dae6 linux-wlan-ng-0.2.8.tar.bz2 462193
+RMD160 1b246f4603589641e4d637205cda39602f586cf2 linux-wlan-ng-0.2.8.tar.bz2 462193
+SHA256 e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade linux-wlan-ng-0.2.8.tar.bz2 462193
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8-r1.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..aaf525a2e2b1
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8-r1.ebuild,v 1.1 2007/12/29 23:38:19 betelgeuse Exp $
+
+inherit eutils linux-mod
+
+MY_PN=${PN/-modules/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b USB wireless LAN products"
+HOMEPAGE="http://linux-wlan.org"
+SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug"
+
+BUILD_TARGETS="default"
+BUILD_PARAMS="WLAN_SRC=${S}/src"
+
+DEPEND="!<net-wireless/linux-wlan-ng-0.2.2"
+
+CONFIG_CHECK="WIRELESS_EXT"
+
+pkg_setup() {
+	# We have to put this to the global scope inside the function or it will be
+	# reset between functions because the ebuild is sourced many times.
+
+	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
+	MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
+
+	linux-mod_pkg_setup
+}
+
+config_by_usevar() {
+	local config=${3}
+	[[ -z ${config} ]] && config=${S}/default.config
+
+	if use ${2}; then
+		echo "${1}=y" >> ${config}
+	else
+		echo "${1}=n" >> ${config}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${MY_PN}-0.2.5-sandbox.patch"
+	epatch "${FILESDIR}/0.2.8-sk_buff-mac.patch"
+
+	local config=${S}/default.config
+	cp "${S}/config.in" "${config}" || die
+
+	cat > "${config}" <<-EOF
+		TARGET_ROOT_ON_HOST="${D}"
+		LINUX_SRC="${KERNEL_DIR}"
+		FIRMWARE_DIR=/lib/firmware/
+		PRISM2_PCI=n
+		PRISM2_PLX=n
+		PRISM2_PCMCIA=n
+		PRISM2_USB=y
+	EOF
+
+	config_by_usevar WLAN_DEBUG debug
+
+	sed -i -e "s:dep modules:modules:" "${S}/src/p80211/Makefile"
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake default_config || die "emake default_config failed"
+	set_arch_to_portage
+
+	cd "${S}/src/mkmeta"
+	emake || die "emake mkmeta failed"
+
+	linux-mod_src_compile
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "Support for pci, plx and pcmcia drivers has been removed in"
+	einfo "revision. For pci, plx and pcmcia drivers try for example"
+	einfo "the hostap-driver or orinoco drivers. They both work with the"
+	einfo "standard wireless tools."
+	einfo ""
+	einfo "If they do not work, please report this to betelgeuse@gentoo.org."
+}