Version bump to fix build issue with 2.6.31, bug #287656 thank xo0ox for report and tests.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 179 insertions, 2 deletions

diff --git a/net-wireless/madwifi-ng-tools/ChangeLog b/net-wireless/madwifi-ng-tools/ChangeLog
index 0fb0b660f4b7..d637d1d02275 100644
--- a/net-wireless/madwifi-ng-tools/ChangeLog
+++ b/net-wireless/madwifi-ng-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-ng-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/ChangeLog,v 1.38 2009/09/23 19:52:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/ChangeLog,v 1.39 2009/10/10 10:31:43 pva Exp $
+
+*madwifi-ng-tools-0.9.4.4100.20090929 (10 Oct 2009)
+
+  10 Oct 2009; Peter Volkov <pva@gentoo.org>
+  +madwifi-ng-tools-0.9.4.4100.20090929.ebuild:
+  Version bump to fix build issue with 2.6.31, bug #287656 thank xo0ox for
+  report and tests.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   madwifi-ng-tools-0.9.3.3.ebuild, madwifi-ng-tools-0.9.4.ebuild:
diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4100.20090929.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4100.20090929.ebuild
new file mode 100644
index 000000000000..78c9a8d1147a
--- /dev/null
+++ b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4100.20090929.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 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.4.4100.20090929.ebuild,v 1.1 2009/10/10 10:31:43 pva Exp $
+
+EAPI="2"
+
+inherit versionator toolchain-funcs
+
+MY_PN=${PN/-ng-tools/}
+MY_PV=$(get_version_component_range 1-3)
+MY_REV=$(get_version_component_range 4)
+MY_DATE=$(get_version_component_range 5)
+MY_P=${MY_PN}-${MY_PV}-r${MY_REV}-${MY_DATE}
+S=${WORKDIR}/${MY_P}/tools
+
+DESCRIPTION="Next Generation tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi-project.org/"
+SRC_URI="http://snapshots.madwifi-project.org/${MY_PN}-${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!net-wireless/madwifi-old-tools"
+
+src_prepare() {
+	# 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
+
+	sed -i \
+		-e "s:CC =.*:CC = $(tc-getCC):" \
+		-e "s:CFLAGS=:CFLAGS+=:" \
+		-e "s:LDFLAGS=:LDFLAGS+=:" \
+		"${S}"/Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \
+		install || die "emake install failed"
+
+	dodir /sbin
+	mv "${D}"/usr/bin/wlanconfig "${D}"/sbin
+
+	# install headers for use by
+	# net-wireless/wpa_supplicant and net-wireless/hostapd
+	cd "${S}"/..
+	insinto /usr/include/madwifi/include/
+	doins include/*.h
+	insinto /usr/include/madwifi/net80211
+	doins net80211/*.h
+}
+
+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
+	einfo
+	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
+	einfo "you should remerge them now."
+	einfo
+}
diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index cddcd594fe19..df006049def3 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.69 2009/06/04 10:44:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.70 2009/10/10 10:36:07 pva Exp $
+
+*madwifi-ng-0.9.4.4100.20090929 (10 Oct 2009)
+
+  10 Oct 2009; Peter Volkov <pva@gentoo.org>
+  +madwifi-ng-0.9.4.4100.20090929.ebuild:
+  Version bump to fix build issue with 2.6.31, bug #287656 thank xo0ox for
+  report and tests.
 
   04 Jun 2009; Peter Volkov <pva@gentoo.org>
   madwifi-ng-0.9.4.4030.20090529.ebuild:
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4100.20090929.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4100.20090929.ebuild
new file mode 100644
index 000000000000..42cb5fe92d53
--- /dev/null
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4100.20090929.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 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.4.4100.20090929.ebuild,v 1.1 2009/10/10 10:36:07 pva Exp $
+
+EAPI="2"
+
+inherit linux-mod versionator
+
+MY_PN=${PN/-ng/}
+MY_PV=$(get_version_component_range 1-3)
+MY_REV=$(get_version_component_range 4)
+MY_DATE=$(get_version_component_range 5)
+MY_P=${MY_PN}-${MY_PV}-r${MY_REV}-${MY_DATE}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi-project.org/"
+SRC_URI="http://snapshots.madwifi-project.org/${MY_PN}-${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="atheros-hal
+	|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="injection"
+
+RDEPEND="!net-wireless/madwifi-old
+		net-wireless/wireless-tools
+		~net-wireless/madwifi-ng-tools-${PV}"
+
+pkg_setup() {
+	CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
+	kernel_is lt 2 6 29 && CONFIG_CHECK="${CONFIG_CHECK} KMOD"
+	ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
+	ERROR_WIRELESS_EXT="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+	ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
+	ERROR_KMOD="${F} requires CONFIG_KMOD to be set to y or m"
+	BUILD_TARGETS="all"
+	MODULESD_ATH_PCI_DOCS="README"
+	linux-mod_pkg_setup
+
+	MODULE_NAMES='ath_hal(net:"${S}"/ath_hal)
+				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)
+				ath_rate_amrr(net:"${S}"/ath_rate/amrr)
+				ath_rate_onoe(net:"${S}"/ath_rate/onoe)
+				ath_rate_sample(net:"${S}"/ath_rate/sample)
+				ath_rate_minstrel(net:"${S}"/ath_rate/minstrel)
+				ath_pci(net:"${S}"/ath)'
+
+	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	use injection && epatch "${FILESDIR}"/${PN}-injection-r3925.patch
+	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/minstrel ath_rate/onoe ath_rate/sample; do
+		convert_to_m "${S}/${dir}/Makefile"
+	done
+	sed -e 's:-Werror ::' -i Makefile.inc || die "sed -Werror failed"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README THANKS SNAPSHOT || die
+}
+
+pkg_postinst() {
+	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
+
+	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 "As of net-wireless/madwifi-ng-0.9.3 rate control module selection is done at"
+	einfo "module load time via the 'ratectl' module parameter."
+
+	elog "Please note: This release is based off of 0.9.3.3 and NOT trunk."
+	elog "# No AR5007 support in this release;"
+	elog "experimental support is available for i386 (32bit) in #1679"
+	elog "# No AR5008 support in this release; support is available in trunk "
+	elog "No, we will not apply the patch from 1679, if you must, please do so
+	in an overlay on your system. That is upstreams ticket 1679, not Gentoo's."
+}