diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2006-03-31 15:10:10 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-03-31 15:10:10 +0000 |
commit | 105694499affc71d0acd498aa8b927ea8c0fc5ff (patch) | |
tree | 359b6171af9fa20b37a2c18c8bb871dfd176fabb /net-wireless/ieee80211 | |
parent | Update to Linux 2.6.15.7 (diff) | |
download | historical-105694499affc71d0acd498aa8b927ea8c0fc5ff.tar.gz historical-105694499affc71d0acd498aa8b927ea8c0fc5ff.tar.bz2 historical-105694499affc71d0acd498aa8b927ea8c0fc5ff.zip |
Version bump. Fixes building with KBUILD_OUTPUT or O= set, thanks to Miika Linnapuomi in bug #126306. Backported remove-old bug fix from upstream.
Package-Manager: portage-2.0.54
Diffstat (limited to 'net-wireless/ieee80211')
-rw-r--r-- | net-wireless/ieee80211/ChangeLog | 9 | ||||
-rw-r--r-- | net-wireless/ieee80211/Manifest | 6 | ||||
-rw-r--r-- | net-wireless/ieee80211/files/digest-ieee80211-1.1.13 | 1 | ||||
-rw-r--r-- | net-wireless/ieee80211/files/remove-old | 4 | ||||
-rw-r--r-- | net-wireless/ieee80211/ieee80211-1.1.13.ebuild | 90 |
5 files changed, 105 insertions, 5 deletions
diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog index cc7afc4c0fe1..c64c7a6f5b55 100644 --- a/net-wireless/ieee80211/ChangeLog +++ b/net-wireless/ieee80211/ChangeLog @@ -1,6 +1,13 @@ # 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.32 2006/03/26 16:45:30 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.33 2006/03/31 15:10:10 brix Exp $ + +*ieee80211-1.1.13 (31 Mar 2006) + + 31 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> files/remove-old, + +ieee80211-1.1.13.ebuild: + Version bump. Fixes building with KBUILD_OUTPUT or O= set, thanks to Miika + Linnapuomi in bug #126306. Backported remove-old bug fix from upstream. 26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> ieee80211-1.1.12-r1.ebuild: diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest index 335195f30de8..a35880fc9200 100644 --- a/net-wireless/ieee80211/Manifest +++ b/net-wireless/ieee80211/Manifest @@ -1,7 +1,8 @@ -MD5 82e16e2fa7a8e1052650d58f6a49c5f9 ChangeLog 5891 +MD5 492b9c6b12d530d9f9d40c56b35204cb ChangeLog 6176 MD5 dde1f1dcca13affd78fa2e897e2f4d8f files/digest-ieee80211-1.1.11 64 MD5 b01b59d2e10994fca69752000797a94d files/digest-ieee80211-1.1.12 64 MD5 b01b59d2e10994fca69752000797a94d files/digest-ieee80211-1.1.12-r1 64 +MD5 84a851e76dcd594fe286c11bf1359a9b files/digest-ieee80211-1.1.13 64 MD5 9501aacea3c39a93671e12bdcd199254 files/digest-ieee80211-1.1.6 63 MD5 0df9ca80228d166621f6d0ed424cd6a8 files/digest-ieee80211-1.1.7 63 MD5 5cf798889745b65cb107070ad36c513c files/digest-ieee80211-1.1.8 63 @@ -9,10 +10,11 @@ MD5 f78d58df9a988441f01c24ff0c272712 files/digest-ieee80211-1.1.9 63 MD5 e6b0f71cb5de5a5970e4af4669bf1af5 files/ieee80211-1.1.12-qos.patch 675 MD5 25712fc02023480caeaea4de0395802c files/ieee80211-1.1.12-tkip-qos-new.patch 1536 MD5 4c49e8e5e739551dd8a68f88131529a4 files/ieee80211-1.1.8-nocast.patch 959 -MD5 1c7250a90205590d6a477efdc0efe963 files/remove-old 1444 +MD5 1f23d886a8ac044db818e796a765ef34 files/remove-old 1460 MD5 7f872d1dde3f0ad85fd5c0568e6adf07 ieee80211-1.1.11.ebuild 2797 MD5 cfcd4b85f6de7fabf932e0555ed48242 ieee80211-1.1.12-r1.ebuild 2903 MD5 dff443405f26c0509471c52fde07653a ieee80211-1.1.12.ebuild 2805 +MD5 b9f86d9c0fd03d6c8df8e794b648d0bd ieee80211-1.1.13.ebuild 2925 MD5 235feb4dd8b67f34ae515471178b4b43 ieee80211-1.1.6.ebuild 2784 MD5 36dc3b6f0347b90dd9daca08a2132dd8 ieee80211-1.1.7.ebuild 2792 MD5 f7bec8760a5c0feb2b4038f4d82f19db ieee80211-1.1.8.ebuild 2849 diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.1.13 b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13 new file mode 100644 index 000000000000..db1e4bff957b --- /dev/null +++ b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13 @@ -0,0 +1 @@ +MD5 062debe7a4042ee5969607a810fb89fa ieee80211-1.1.13.tgz 67289 diff --git a/net-wireless/ieee80211/files/remove-old b/net-wireless/ieee80211/files/remove-old index cf354e684003..d039afa41ec3 100644 --- a/net-wireless/ieee80211/files/remove-old +++ b/net-wireless/ieee80211/files/remove-old @@ -45,7 +45,7 @@ ask_remove() n) return 1;; - ""|y) find ${KSRC} -type f -name 'ieee80211*' | \ + ""|y) find ${KSRC} -follow -type f -name 'ieee80211*' | \ while read fn; do [ ! -d $fn ] && (rm -f ${fn} || return 1) done || return 1 @@ -60,7 +60,7 @@ do_check() { echo "Checking in ${KSRC} for ieee80211 components..." - FILES=`find ${KSRC} -type f -name 'ieee80211*'` + FILES=`find ${KSRC} -follow -type f -name 'ieee80211*'` if [ -n "${FILES}" ]; then for file in $FILES; do diff --git a/net-wireless/ieee80211/ieee80211-1.1.13.ebuild b/net-wireless/ieee80211/ieee80211-1.1.13.ebuild new file mode 100644 index 000000000000..8fdc65670b95 --- /dev/null +++ b/net-wireless/ieee80211/ieee80211-1.1.13.ebuild @@ -0,0 +1,90 @@ +# 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.ebuild,v 1.1 2006/03/31 15:10:10 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 ~ppc ~x86" + +DEPEND="" + +IUSE="debug" +BUILD_TARGETS="modules" +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_OUT_DIR}/include/config/ieee80211.h ]] || \ + egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_OUT_DIR}/include/linux/autoconf.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}" + if [ "${KV_DIR}" != "${KV_OUT_DIR}" ]; then + eerror " # /bin/sh ${FILESDIR}/remove-old ${KV_OUT_DIR}" + fi + 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 +} |