Fix DHCP issues with some Access Points, check for CONFIG_CRYPTO_AES_X86_64 (bug #104100).

Package-Manager: portage-2.0.51.22-r2

6 files changed, 105 insertions, 3 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 5fac287320c7..949c4f8a0c12 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.5 2005/08/16 12:30:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.6 2005/09/02 17:32:44 brix Exp $
+
+*ieee80211-1.0.3-r1 (02 Sep 2005)
+
+  02 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ieee80211-1.0.3-broadcast.patch, +ieee80211-1.0.3-r1.ebuild:
+  Fix DHCP issues with some Access Points, check for CONFIG_CRYPTO_AES_X86_64
+  (bug #104100).
 
   16 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   ieee80211-1.0.3.ebuild:
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index f0cc8c1b8a33..a43eea49f65a 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,8 +1,11 @@
 MD5 205ad9adc36c1538667c08b26290874b ieee80211-1.0.3.ebuild 2073
+MD5 0b37106be6c69fa6ce87d5925f2a31dc ieee80211-1.0.3-r1.ebuild 2093
 MD5 d94f6f0e594496b23768753d8f2fbccc ieee80211-1.0.2.ebuild 2067
-MD5 c8c05d91122c69b35035feac404eaba7 ChangeLog 768
+MD5 4245cb963260a9530fb2edc2b28806d4 ChangeLog 1023
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 54836c698b04ed62f6d7a3f6f8fa6232 ieee80211-1.0.1.ebuild 2067
+MD5 0a4d9c3a51b99df76f687a3ba0b23f60 files/ieee80211-1.0.3-broadcast.patch 616
 MD5 cc0dea5fff30f8ea5fe5e62a749115d3 files/digest-ieee80211-1.0.1 63
 MD5 affd67ec6900c1e7f9c123969f709181 files/digest-ieee80211-1.0.2 63
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3 63
+MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3-r1 63
diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.0.3-r1 b/net-wireless/ieee80211/files/digest-ieee80211-1.0.3-r1
new file mode 100644
index 000000000000..bb51c85dc9c8
--- /dev/null
+++ b/net-wireless/ieee80211/files/digest-ieee80211-1.0.3-r1
@@ -0,0 +1 @@
+MD5 49870c030278e3716194ff5b64f9cbaa ieee80211-1.0.3.tgz 63355
diff --git a/net-wireless/ieee80211/files/ieee80211-1.0.3-broadcast.patch b/net-wireless/ieee80211/files/ieee80211-1.0.3-broadcast.patch
new file mode 100644
index 000000000000..ff9b6745f2fd
--- /dev/null
+++ b/net-wireless/ieee80211/files/ieee80211-1.0.3-broadcast.patch
@@ -0,0 +1,15 @@
+diff -urp ieee80211-1.0.3/net/ieee80211.h ieee80211-1.0.3-broadcast/net/ieee80211.h
+--- ieee80211-1.0.3/net/ieee80211.h	2005-07-15 01:53:35.000000000 +0200
++++ ieee80211-1.0.3-broadcast/net/ieee80211.h	2005-09-02 19:15:03.000000000 +0200
+@@ -720,6 +720,11 @@ static inline int is_multicast_ether_add
+ 	return addr[0] & 0x01;
+ }
+ #endif
++static inline int is_broadcast_ether_addr(const u8 *addr)
++{
++    return (addr[0] & 0xff && addr[1] & 0xff && addr[2] & 0xff &&
++        addr[3] & 0xff && addr[4] & 0xff && addr[5] & 0xff);
++}
+ 
+ #define CFG_IEEE80211_RESERVE_FCS (1<<0)
+ #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..7db0f08279ab
--- /dev/null
+++ b/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild,v 1.1 2005/09/02 17:32:44 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Generic IEEE 802.11 network subsystem for Linux"
+HOMEPAGE="http://ieee80211.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!<=net-wireless/ipw2100-1.1.0
+		!<=net-wireless/ipw2200-1.0.4"
+RDEPEND="${DEPEND}"
+
+IUSE="debug"
+BUILD_TARGETS="all"
+MODULE_NAMES="ieee80211(net/ieee80211:)
+			ieee80211_crypt(net/ieee80211:)
+			ieee80211_crypt_wep(net/ieee80211:)
+			ieee80211_crypt_ccmp(net/ieee80211:)
+			ieee80211_crypt_tkip(net/ieee80211:)"
+
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+
+pkg_setup() {
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
+		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
+		  linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms."
+		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-broadcast.patch
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/net
+	doins net/*
+
+	dodoc CHANGES
+}
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 7057b65c1547..77c17b3c1058 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,10 +1,11 @@
 MD5 03551f14b4409796623fb865ed2abf97 ipw2200-1.0.4.ebuild 2449
 MD5 7afca8db2613b9fc32d5f7005b4db15d ipw2200-1.0.6.ebuild 2158
 MD5 a1d82c4728a3f608b762fe63c4910f42 ipw2200-1.0.1.ebuild 2488
+MD5 4ce2b88ec5f872d1621a5af9cf1d0da1 ipw2200-1.0.6-r2.ebuild 2304
 MD5 b2138b76ba85eeea301d8fa9f72470df ipw2200-1.0.3.ebuild 2488
 MD5 8a1b21691e17dc6de38c7238cd4e4522 ipw2200-1.0.5.ebuild 2145
 MD5 7453a3247e41a7bf8c6e939cf55c45f0 ipw2200-1.0.6-r1.ebuild 2260
-MD5 c9ecaa12f13b8d289f63ed4fb95744f8 ChangeLog 7186
+MD5 37214287af0ae90261ab9bc20ef8d2ca ChangeLog 7383
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2dc4d1d726fc4dce22dee416d6028353 files/ipw2200-1.0.4-is_multicast_ether_addr.patch 647
 MD5 abdb4f9be556bd09fe711f6a7cd42ee2 files/ipw2200-1.0.6-suspend2.patch 520
@@ -12,8 +13,10 @@ MD5 2ba8f54679172b49a799779c1a02127a files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch
 MD5 9e25eeda7c745bca8c5cf72537dd31f5 files/ipw2200-1.0.1-suspend2.patch 448
 MD5 af6756863c64cdfc93cd53556f8b397b files/ipw2200-1.0.1-is_multicast_ether_addr.patch 631
 MD5 7a64b674dbd99046028827c6417409e1 files/ipw2200-1.0.3-is_multicast_ether_addr.patch 715
+MD5 2833c1b240e20a5b7ecb45f5435cf24f files/ipw2200-1.0.6-broadcast.patch 992
 MD5 ba6c39e9a44ef971292c5f8e6a7c6897 files/ipw2200-1.0.3-suspend2.patch 522
 MD5 aab93fcc37b1a1282d7a02e9b64430a3 files/digest-ipw2200-1.0.6-r1 62
+MD5 aab93fcc37b1a1282d7a02e9b64430a3 files/digest-ipw2200-1.0.6-r2 62
 MD5 d2a1aca212498ad4de9f4a79ac12026b files/digest-ipw2200-1.0.1 62
 MD5 1953868cbb8ae6ee8eee55c5848417ab files/digest-ipw2200-1.0.3 62
 MD5 bcf142294729f1a55d7b3fd29c1a8239 files/digest-ipw2200-1.0.4 62