Security version bump, bug 157449 also fixes 2.6.19 building

(Portage version: 2.1.2_rc2-r5)

3 files changed, 141 insertions, 1 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 8535fa8a48d2..bc80d905445e 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2006/11/17 18:36:53 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.18 2006/12/07 19:02:32 genstef Exp $
+
+*madwifi-ng-0.9.2.1 (07 Dec 2006)
+
+  07 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
+  -madwifi-ng-0.0.1443.20060207.ebuild,
+  -madwifi-ng-0.0.1531.20060427.ebuild, +madwifi-ng-0.9.2.1.ebuild:
+  Security version bump, bug 157449 also fixes 2.6.19 building
 
   17 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/madwifi-ng-0.9.2-ath_intr.diff,
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1
new file mode 100644
index 000000000000..acf9974b479a
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1
@@ -0,0 +1,3 @@
+MD5 bf5509fccd3852e22551826063b1b61e madwifi-0.9.2.1.tar.bz2 3476892
+RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e madwifi-0.9.2.1.tar.bz2 3476892
+SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843 madwifi-0.9.2.1.tar.bz2 3476892
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
new file mode 100644
index 000000000000..ad45bfa692a1
--- /dev/null
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
@@ -0,0 +1,130 @@
+# 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.2.1.ebuild,v 1.1 2006/12/07 19:02:32 genstef 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="as-is
+	|| ( 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:0:5}"
+
+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}
+	epatch ${FILESDIR}/${PN}-0.9.2-{ath_intr,config.h,crypto_cipher_encrypt_one}.diff
+	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
+#	epatch ${FILESDIR}/madwifi-association-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
+}