Added patch from upstream.

(Portage version: 2.0.54)

5 files changed, 136 insertions, 2 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index c64c7a6f5b55..0a03ea93da81 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.33 2006/03/31 15:10:10 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.34 2006/04/14 11:15:15 brix Exp $
+
+*ieee80211-1.1.13-r1 (14 Apr 2006)
+
+  14 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ieee80211-1.1.13-cflags.patch, +ieee80211-1.1.13-r1.ebuild:
+  Added patch from upstream.
 
 *ieee80211-1.1.13 (31 Mar 2006)
 
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index a35880fc9200..89db9c324e6b 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,19 +1,22 @@
-MD5 492b9c6b12d530d9f9d40c56b35204cb ChangeLog 6176
+MD5 61e6ce4232b371abac7c294c8be37ce3 ChangeLog 6365
 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 84a851e76dcd594fe286c11bf1359a9b files/digest-ieee80211-1.1.13-r1 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
 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 4f7fd86211611d66908e597267f2578f files/ieee80211-1.1.13-cflags.patch 1184
 MD5 4c49e8e5e739551dd8a68f88131529a4 files/ieee80211-1.1.8-nocast.patch 959
 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 bd5caefe14b1e2e725d13eaef78d30f5 ieee80211-1.1.13-r1.ebuild 2874
 MD5 b9f86d9c0fd03d6c8df8e794b648d0bd ieee80211-1.1.13.ebuild 2925
 MD5 235feb4dd8b67f34ae515471178b4b43 ieee80211-1.1.6.ebuild 2784
 MD5 36dc3b6f0347b90dd9daca08a2132dd8 ieee80211-1.1.7.ebuild 2792
diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.1.13-r1 b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13-r1
new file mode 100644
index 000000000000..db1e4bff957b
--- /dev/null
+++ b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13-r1
@@ -0,0 +1 @@
+MD5 062debe7a4042ee5969607a810fb89fa ieee80211-1.1.13.tgz 67289
diff --git a/net-wireless/ieee80211/files/ieee80211-1.1.13-cflags.patch b/net-wireless/ieee80211/files/ieee80211-1.1.13-cflags.patch
new file mode 100644
index 000000000000..53d1f01d59ad
--- /dev/null
+++ b/net-wireless/ieee80211/files/ieee80211-1.1.13-cflags.patch
@@ -0,0 +1,31 @@
+diff -urp ieee80211-1.1.13/Makefile ieee80211-1.1.13-cflags/Makefile
+--- ieee80211-1.1.13/Makefile	2006-03-31 11:12:02.000000000 +0200
++++ ieee80211-1.1.13-cflags/Makefile	2006-04-04 17:24:20.000000000 +0200
+@@ -73,17 +73,19 @@ ifneq ($(KERNELRELEASE),)
+ # 
+ 
+ ifeq ($(EXTERNAL_BUILD),y)
+-ifdef CONFIG_IEEE80211_DEBUG
+-EXTRA_CFLAGS += -DCONFIG_IEEE80211_DEBUG=$(CONFIG_IEEE80211_DEBUG)
++ifeq ($(CONFIG_IEEE80211_DEBUG),y)
++EXTRA_CFLAGS += -DCONFIG_IEEE80211_DEBUG
+ endif
+-ifdef CONFIG_IEEE80211_CRYPT_WEP
+-EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_WEP=$(CONFIG_IEEE80211_CRYPT_WEP)
++# Checking against 'y' doesn't make sense since this if for external
++# builds only
++ifeq ($(CONFIG_IEEE80211_CRYPT_WEP),m)
++EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_WEP
+ endif
+-ifdef CONFIG_IEEE80211_CRYPT_TKIP
+-EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_TKIP=$(CONFIG_IEEE80211_CRYPT_TKIP)
++ifeq ($(CONFIG_IEEE80211_CRYPT_TKIP),m)
++EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_TKIP
+ endif
+-ifdef CONFIG_IEEE80211_CRYPT_CCMP
+-EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_CCMP=$(CONFIG_IEEE80211_CRYPT_CCMP)
++ifeq ($(CONFIG_IEEE80211_CRYPT_CCMP),m)
++EXTRA_CFLAGS += -DCONFIG_IEEE80211_CRYPT_CCMP
+ endif
+ endif
+ 
diff --git a/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..94fa6a4ddbad
--- /dev/null
+++ b/net-wireless/ieee80211/ieee80211-1.1.13-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2006/04/14 11:15:15 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 ~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}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cflags.patch
+
+	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
+}