New version release. Not a svn snapshot. Closes bug #134438

Package-Manager: portage-2.1.1_pre3-r3

7 files changed, 223 insertions, 2 deletions

diff --git a/net-wireless/madwifi-ng-tools/ChangeLog b/net-wireless/madwifi-ng-tools/ChangeLog
index 701cf85f2e4d..1e5d638a3701 100644
--- a/net-wireless/madwifi-ng-tools/ChangeLog
+++ b/net-wireless/madwifi-ng-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/madwifi-ng-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/ChangeLog,v 1.7 2006/07/09 18:24:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/ChangeLog,v 1.8 2006/07/23 03:49:25 steev Exp $
+
+*madwifi-ng-tools-0.9.1 (23 Jul 2006)
+
+  23 Jul 2006; Steev Klimaszewski <steev@gentoo.org>
+  +madwifi-ng-tools-0.9.1.ebuild:
+  New upstream release. Resolves bug #134438
 
 *madwifi-ng-tools-0.0.1531.20060427 (09 Jul 2006)
 *madwifi-ng-tools-0.0.1443.20060207 (09 Jul 2006)
diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.9.1 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.9.1
new file mode 100644
index 000000000000..b073299dc889
--- /dev/null
+++ b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.9.1
@@ -0,0 +1,3 @@
+MD5 3a95620582baca060372401df33a9845 madwifi-0.9.1.tar.bz2 3477471
+RMD160 63cac5d982c70ef7c3c9afc859ebc6585b26ba8b madwifi-0.9.1.tar.bz2 3477471
+SHA256 d0a7f68898dd9a211278e55009d7aeeefdda68f48e7ac8e8ccf0ceee7d26643e madwifi-0.9.1.tar.bz2 3477471
diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.1.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.1.ebuild
new file mode 100644
index 000000000000..1d24650eea83
--- /dev/null
+++ b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.1.ebuild,v 1.1 2006/07/23 03:49:25 steev Exp $
+
+inherit toolchain-funcs
+
+MY_P=${PN/-ng-tools/}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Next Generation tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="!net-wireless/madwifi-old-tools
+		${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	# format string fix from solar
+	#sed -i \
+#		-e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \
+#		${S}/tools/athstats.c || die
+
+einfo "S=$S"
+einfo "PV=$PV"
+
+	sed -i \
+		-e "s:CC =.*:CC = $(tc-getCC):" \
+		-e "s:CFLAGS=:CFLAGS+=:" \
+		-e "s:LDFLAGS=:LDFLAGS+=:" \
+		${S}/tools/Makefile || die
+}
+
+src_compile() {
+	emake tools || die "emake tools failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \
+		install-tools || die "make install-tools failed"
+
+	dodir /sbin
+	mv "${D}"/usr/bin/wlanconfig "${D}"/sbin
+}
+
+pkg_postinst() {
+	if [ -e "${ROOT}"/etc/udev/rules.d/65-madwifi.rules ]; then
+		ewarn
+		ewarn "The udev rules for creating interfaces (athX) are no longer needed."
+		ewarn
+		ewarn "You should manually remove the /etc/udev/rules.d/65-madwifi.rules file"
+		ewarn "and either run 'udevstart' or reboot for the changes to take effect."
+		ewarn
+	fi
+}
diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index f36d5100251b..fa43b2ce2400 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.6 2006/07/09 18:26:19 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.7 2006/07/23 03:51:23 steev Exp $
+
+*madwifi-ng-0.9.1 (23 Jul 2006)
+
+  23 Jul 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/madwifi-ng-uudecode-gcda-fix.patch, +madwifi-ng-0.9.1.ebuild:
+  New upstream release, committing because Brix is on vacation.  Thanks to Yang
+  Zhao for the initial report, and everyone else in bug #134438. As well as
+  Agent86 for testing before I commit.
 
 *madwifi-ng-0.0.1531.20060427 (09 Jul 2006)
 *madwifi-ng-0.0.1443.20060207 (09 Jul 2006)
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.1 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.1
new file mode 100644
index 000000000000..b073299dc889
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.1
@@ -0,0 +1,3 @@
+MD5 3a95620582baca060372401df33a9845 madwifi-0.9.1.tar.bz2 3477471
+RMD160 63cac5d982c70ef7c3c9afc859ebc6585b26ba8b madwifi-0.9.1.tar.bz2 3477471
+SHA256 d0a7f68898dd9a211278e55009d7aeeefdda68f48e7ac8e8ccf0ceee7d26643e madwifi-0.9.1.tar.bz2 3477471
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch b/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch
new file mode 100644
index 000000000000..06a3f1bbf1a8
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch
@@ -0,0 +1,12 @@
+Index: ath/Makefile
+===================================================================
+--- ath/Makefile	(revision 1648)
++++ ath/Makefile	(working copy)
+@@ -61,6 +61,7 @@
+ ath_hal-objs	:= ah_osdep.o ${TARGET}.hal.o
+ 
+ hostprogs-y	:= uudecode
++uudecode-objs	:= uudecode.o
+ 
+ # For older 2.6 kernels
+ host-progs	:= $(hostprogs-y)
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.1.ebuild
new file mode 100644
index 000000000000..058b9e5de690
--- /dev/null
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.1.ebuild,v 1.1 2006/07/23 03:51:23 steev Exp $
+
+inherit linux-mod
+
+MY_P=${PN/-ng/}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="amrr onoe"
+DEPEND="app-arch/sharutils"
+RDEPEND="!net-wireless/madwifi-old
+		=net-wireless/madwifi-ng-tools-${PV}"
+
+CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
+ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
+BUILD_TARGETS="all"
+MODULESD_ATH_PCI_DOCS="README"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="ath_hal(net:${S}/ath)
+				wlan(net:${S}/net80211)
+				wlan_acl(net:${S}/net80211)
+				wlan_ccmp(net:${S}/net80211)
+				wlan_tkip(net:${S}/net80211)
+				wlan_wep(net:${S}/net80211)
+				wlan_xauth(net:${S}/net80211)
+				wlan_scan_sta(net:${S}/net80211)
+				wlan_scan_ap(net:${S}/net80211)"
+
+	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
+
+	if use amrr && use onoe; then
+		eerror
+		eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time."
+		eerror
+		die "USE=\"amrr onoe\" is invalid"
+	fi
+
+	if use amrr; then
+		MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)"
+		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr"
+	elif use onoe; then
+		MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)"
+		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe"
+	else
+		MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)"
+		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample"
+	fi
+
+	MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
+		convert_to_m ${S}/${dir}/Makefile
+	done
+}
+
+src_compile() {
+	epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch
+
+	# assists in debugging
+	emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed"
+
+	# needed by the modules
+	emake svnversion.h
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
+
+	# install headers for use by
+	# net-wireless/wpa_supplicant and net-wireless/hostapd
+	insinto /usr/include/madwifi/include/
+	doins include/*.h
+	insinto /usr/include/madwifi/net80211
+	doins net80211/*.h
+}
+
+pkg_postinst() {
+	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
+
+	einfo "Removing old ath_rate modules"
+	if use amrr; then
+		[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
+		[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
+	elif use onoe; then
+		[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
+		[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
+	else
+		[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
+		[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
+	fi
+
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
+	einfo "module."
+	einfo
+	einfo "The type of the created interface can be controlled through the 'autocreate'"
+	einfo "module parameter."
+	einfo
+	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
+	einfo "you should remerge them now."
+	einfo
+}