Added workaround for unresolved symbols if CONFIG_MODVERSIONS is set, bug #232099.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-openvz.git-777e816 i686

5 files changed, 113 insertions, 8 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index ad905c5cf744..545047e4ae08 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.59 2008/09/13 18:57:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.60 2008/10/14 06:01:11 pva Exp $
+
+*madwifi-ng-0.9.4-r1 (14 Oct 2008)
+
+  14 Oct 2008; Peter Volkov <pva@gentoo.org> +madwifi-ng-0.9.4-r1.ebuild:
+  Added workaround for unresolved symbols if CONFIG_MODVERSIONS is set, bug
+  #232099.
 
   13 Sep 2008; Peter Volkov <pva@gentoo.org> madwifi-ng-0.9.4.ebuild:
   Removed app-arch/sharutils from DEPEND as madwifi-ng builds fine without
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 97e1ed48b72f..8fccb7f46e7d 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -6,9 +6,10 @@ DIST madwifi-0.9.3.1.tar.bz2 3488269 RMD160 5daad5c17d42ee0b5618d46213293c4d6289
 DIST madwifi-0.9.3.2.tar.bz2 3489208 RMD160 f20b7d954d7d3b4bda03ebb762868ed378514c8d SHA1 ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 SHA256 34ec9fc871edadf1742057152c0253484d95a534e51a48dbb2e11801e87a0a13
 DIST madwifi-0.9.3.3.tar.bz2 3489995 RMD160 ed4b5267171bb11801817b7ba358fe3b08377329 SHA1 13df0e407de0f5b733e5ff1b660ce2fac048b206 SHA256 7e38cb26d5b001e9fb36f48aaefdeee10d1dc57c83e675e3bbd0f1807a3305b7
 DIST madwifi-0.9.4.tar.bz2 3485142 RMD160 a493addc2f566e07f29033b671fea1b7143a90a4 SHA1 5de5842a662fbca17507003c3b09956c37fa4d79 SHA256 2356ea8a1a00454c31b8bb9a587a474744c022eca61eae01f37ab3f9ce3186a0
-EBUILD madwifi-ng-0.9.3.1.ebuild 2645 RMD160 a755041a58f5063f8df4204067db16ce93d96f12 SHA1 09b4a3f63142817436d7a724782df89757dcef3d SHA256 472ef5e891a98284bbe846c1beab1e7c27fc4a599ea93ab4641b8f851848654d
-EBUILD madwifi-ng-0.9.3.2.ebuild 2576 RMD160 d0adfa17883b566b3d867fbdac8de3767d29f2fa SHA1 c4118a7d89ce332099eca043ce39bf1749a37379 SHA256 0da9efa0f0161fa5545cd72681e4ef7b558066d3bf709eb1f61181e624ff7494
+EBUILD madwifi-ng-0.9.3.1.ebuild 2643 RMD160 aaeb81d19014e6f3892aa5b98050ffc503085753 SHA1 18a6daa670e69ae6194aa7e3937d5b5276d7a7bb SHA256 44f697bb301b50179caca6a26988e25de6c135df426db6c99abc0b6da29a6eac
+EBUILD madwifi-ng-0.9.3.2.ebuild 2574 RMD160 d003899f51725f72a4b0ae819816fd557d92b36a SHA1 a837f6594168e3d1f04df6af7a2ccf5670e0b992 SHA256 ffd7d43f928a8897315c3af3e97378c9946baf6950edb5910d09baa3131dc09f
 EBUILD madwifi-ng-0.9.3.3.ebuild 2642 RMD160 bb05de05aa5d55ff56d490ee1af21225b14318b3 SHA1 0ed783f8dd4347ce88b4949642bae0b3e5baeab0 SHA256 63df2b7e715ff7a440dc9b2f4c70cccd1856f129f8a8f86c939ab9c1ea5b9927
+EBUILD madwifi-ng-0.9.4-r1.ebuild 3376 RMD160 4219153f5898c9c5d5f6076ab11aa2178b59e632 SHA1 c8fa79315f2a3a87bac73ddcbdfb938f34103dfe SHA256 102a4ae96b6cb4bc1db86c11625d1fecb584ce71b624e4d770ca5e2531028ce7
 EBUILD madwifi-ng-0.9.4.ebuild 3157 RMD160 26e275811b8d0f5a5c4a4da8a77a26e49e28a765 SHA1 949bada8647500c27fceb2d7fb5530351a27ac49 SHA256 587563c6e6212154818c1a0576200bb22abe22453dc52c6a38d0c7a9c37eba2e
-MISC ChangeLog 20079 RMD160 672ba0943726561fbb9d31a37bc0711d6129f12d SHA1 e5a6210207507ef89bbbf57f93fbd6d1a4f3f872 SHA256 71c774cfcff9e7394a9d5e68f7fbcb672f9b9eb873588a8ae66fb07598fc0ead
+MISC ChangeLog 20277 RMD160 d925a83c0ba0fc2d2dbcaef188227b32cdc8c32c SHA1 43d24d8a925882feffba3271af2008be41841e61 SHA256 d1d717626ebdf9fed0ccdb981d88eaa712a59097ee64b34f321cbcfc20c57fed
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
index b62b85418de9..0f16bfa536e5 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3.1.ebuild,v 1.7 2008/02/14 05:25:13 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild,v 1.8 2008/10/14 06:01:11 pva Exp $
 
 inherit linux-mod
 
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild
index dfb02302652f..7bf21763ae11 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3.2.ebuild,v 1.6 2008/02/14 05:25:13 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild,v 1.7 2008/10/14 06:01:11 pva Exp $
 
 inherit linux-mod
 
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..334195e5744c
--- /dev/null
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/10/14 06:01:11 pva 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="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}"
+
+CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL 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"
+
+pkg_setup() {
+	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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.9.3-uudecode-gcda-fix.patch
+	if use injection; then epatch "${FILESDIR}"/${PN}-r1886.patch; fi
+	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
+	epatch "${FILESDIR}"/madwifi-dfs-ieee80211-skb-update.patch
+	# Workaround our build system, bug #232099 (bug #237618 describes details)
+	touch Module.symvers
+	for ms in ath net80211 ath_hal ath_rate/{amrr,minstrel,onoe,sample}; do
+		ln -s "${S}"/Module.symvers ${ms}
+	done
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
+}
+
+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. USE flags amrr and onoe"
+	einfo "no longer serve any purpose."
+
+	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."
+}