Version bump, fixing bug #115428 and bug #113155.

(Portage version: 2.0.53)

5 files changed, 134 insertions, 34 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index d76aa1c4bcb1..65b0a19450b4 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2005/11/24 14:30:59 brix Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.20 2006/01/06 12:27:37 brix Exp $
+
+*ieee80211-1.1.7 (06 Jan 2006)
+
+  06 Jan 2006; Henrik Brix Andersen <brix@gentoo.org> files/remove-old,
+  +ieee80211-1.1.7.ebuild:
+  Version bump, fixing bug #115428 and bug #113155.
 
   24 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
   ieee80211-1.0.1.ebuild, ieee80211-1.0.2.ebuild, ieee80211-1.0.3.ebuild,
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index 8b8ec0abff53..d430aac4e1a7 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,24 +1,26 @@
-MD5 8238246854b96312d70840d942bce144 ieee80211-1.0.3.ebuild 2774
-MD5 2258001f4252bdf42a23aa76e25752ce ieee80211-1.0.3-r1.ebuild 2836
-MD5 42dbbe85c5f5dd959a3da2fa12c4df9e ieee80211-1.1.6.ebuild 2779
-MD5 c09bd847f99062b5e22ebe9f8976a49c ieee80211-1.0.2.ebuild 2768
-MD5 49f0d303a477f0b091dd498e02576a5b ieee80211-1.1.5.ebuild 2828
-MD5 fad918874603fc69eda3f8fe4158b27c ieee80211-1.0.3-r2.ebuild 2928
-MD5 71c6e2c242e709e0649b534c96736d25 ieee80211-1.1.5-r1.ebuild 2872
-MD5 c89d82eb0d4cd480ae12df71b3fe81ff ChangeLog 3323
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 1054af781be5183132744e65a5043a8d ieee80211-1.0.1.ebuild 2768
-MD5 03afa38292ff5bbcc62500c4b6163888 files/ieee80211-1.0.3-broadcast.patch 622
-MD5 61bac627a89e0cafb9996d2887d8a3e9 files/ieee80211-1.1.5-broadcast.patch 1939
+MD5 1b84de0d36e80e875c0266b9472a5c48 ChangeLog 3507
 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 27f61bbea47540d198a62c715e33a5b4 files/digest-ieee80211-1.1.5 63
-MD5 9501aacea3c39a93671e12bdcd199254 files/digest-ieee80211-1.1.6 63
-MD5 ccf8b6ee79df516fce26c5780b058ac6 files/ieee80211-1.1.5-we18.patch 1973
-MD5 a4b70427a649d55f3b24b8ef94f80897 files/remove-old 1509
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3-r1 63
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3-r2 63
+MD5 27f61bbea47540d198a62c715e33a5b4 files/digest-ieee80211-1.1.5 63
 MD5 27f61bbea47540d198a62c715e33a5b4 files/digest-ieee80211-1.1.5-r1 63
+MD5 9501aacea3c39a93671e12bdcd199254 files/digest-ieee80211-1.1.6 63
+MD5 0df9ca80228d166621f6d0ed424cd6a8 files/digest-ieee80211-1.1.7 63
+MD5 03afa38292ff5bbcc62500c4b6163888 files/ieee80211-1.0.3-broadcast.patch 622
 MD5 f6533e7149d244dd72eb444853266a8f files/ieee80211-1.0.3-keep_restricted_bit.patch 1220
 MD5 d2bada5c8bb423cb02a88cc4f0011d39 files/ieee80211-1.0.3-open_frag.patch 2638
+MD5 61bac627a89e0cafb9996d2887d8a3e9 files/ieee80211-1.1.5-broadcast.patch 1939
+MD5 ccf8b6ee79df516fce26c5780b058ac6 files/ieee80211-1.1.5-we18.patch 1973
+MD5 0f05f4c35985b633ec476e01c1f4b4d1 files/remove-old 1362
+MD5 1054af781be5183132744e65a5043a8d ieee80211-1.0.1.ebuild 2768
+MD5 c09bd847f99062b5e22ebe9f8976a49c ieee80211-1.0.2.ebuild 2768
+MD5 2258001f4252bdf42a23aa76e25752ce ieee80211-1.0.3-r1.ebuild 2836
+MD5 fad918874603fc69eda3f8fe4158b27c ieee80211-1.0.3-r2.ebuild 2928
+MD5 8238246854b96312d70840d942bce144 ieee80211-1.0.3.ebuild 2774
+MD5 71c6e2c242e709e0649b534c96736d25 ieee80211-1.1.5-r1.ebuild 2872
+MD5 49f0d303a477f0b091dd498e02576a5b ieee80211-1.1.5.ebuild 2828
+MD5 42dbbe85c5f5dd959a3da2fa12c4df9e ieee80211-1.1.6.ebuild 2779
+MD5 53f24436d9cd3c70f83b2226f872d6d4 ieee80211-1.1.7.ebuild 2677
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.1.7 b/net-wireless/ieee80211/files/digest-ieee80211-1.1.7
new file mode 100644
index 000000000000..44c5c5325d6e
--- /dev/null
+++ b/net-wireless/ieee80211/files/digest-ieee80211-1.1.7
@@ -0,0 +1 @@
+MD5 939ae45ab61cd8ff23922ead19ed65d4 ieee80211-1.1.7.tgz 64895
diff --git a/net-wireless/ieee80211/files/remove-old b/net-wireless/ieee80211/files/remove-old
index 73a2575f1c0e..2441480d7a49 100644
--- a/net-wireless/ieee80211/files/remove-old
+++ b/net-wireless/ieee80211/files/remove-old
@@ -1,6 +1,6 @@
-#!/bin/bash -x
+#!/bin/sh -x
 
-if [ "$1" == "" ]; then
+if [ -z "$1" ]; then
 	KERN=/lib/modules/`uname -r`/build
 else
 	KERN="$1"
@@ -8,14 +8,15 @@ fi
 
 echo ${KERN} | grep "/\$" || KERN="${KERN}/"
 
-function ask_comment()
+ask_comment()
 {
         while true; do
-		read -p "Above definitions found.  Comment out? [y], n "
+		echo -n "Above definitions found.  Comment out? [y], n "
+		read REPLY
                 case ${REPLY} in
-                
+
 		n) return 1;;
-                        
+
 		""|y) 	sed -i \
 				-e "s:^\(CONFIG_IEEE80211.*\):#\1:" \
 				${KERN}/.config || return 1
@@ -23,39 +24,43 @@ function ask_comment()
 				-e "s:^(#(un)?def.*CONFIG_IEEE80211.*):/*\1*/:" \
 				${KERN}/include/linux/autoconf.h || return 1
 			return 0;;
-                                
+
 		*) continue;;
                 esac
 	done || return 1
 }
 
-function ask_remove()
+ask_remove()
 {
         while true; do
-		read -p "Above files found.  Remove? [y],n "
+		echo -n "Above files found.  Remove? [y],n "
+		read REPLY
+
                 case ${REPLY} in
-                
+
 		n) return 1;;
-                        
+
 		""|y)	find ${KERN} -type f -name 'ieee80211*' | \
-			while read fn; do 
+			while read fn; do
 				[ ! -d $fn ] && (rm -f ${fn} || return 1)
 			done || return 1
 			return 0;;
-                                
+
 		*) continue;;
                 esac
 	done || return 1
 }
 
-function do_check()
+do_check()
 {
-	echo -e "Checking in ${1} for ieee80211 components...\n"
+	echo "Checking in ${1} for ieee80211 components..."
 
 	FILES=`find ${1} -type f -name 'ieee80211*'`
 
 	if [ -n "${FILES}" ]; then
-		echo -e "${FILES}\n" | sed -e "s# #\n#"
+		for file in $FILES; do
+			echo "${file}"
+		done
 		ask_remove || return 1
 	fi
 
diff --git a/net-wireless/ieee80211/ieee80211-1.1.7.ebuild b/net-wireless/ieee80211/ieee80211-1.1.7.ebuild
new file mode 100644
index 000000000000..057ffcf28dc6
--- /dev/null
+++ b/net-wireless/ieee80211/ieee80211-1.1.7.ebuild
@@ -0,0 +1,86 @@
+# 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.7.ebuild,v 1.1 2006/01/06 12:27:37 brix Exp $
+
+inherit 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 !IEEE80211"
+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)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
+	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
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/net
+	doins net/*.h
+
+	dodoc CHANGES
+}