diff options
| -rw-r--r-- | net-wireless/ipw2200/ChangeLog | 9 | ||||
| -rw-r--r-- | net-wireless/ipw2200/Manifest | 6 | ||||
| -rw-r--r-- | net-wireless/ipw2200/files/digest-ipw2200-1.1.2-r1 | 1 | ||||
| -rw-r--r-- | net-wireless/ipw2200/files/ipw2200-1.1.2-cflags.patch | 35 | ||||
| -rw-r--r-- | net-wireless/ipw2200/files/ipw2200-1.1.2-scan_fix.patch | 48 | ||||
| -rw-r--r-- | net-wireless/ipw2200/ipw2200-1.1.2-r1.ebuild | 86 |
6 files changed, 183 insertions, 2 deletions
diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog index 5ae81cef1964..1e500e58c7fd 100644 --- a/net-wireless/ipw2200/ChangeLog +++ b/net-wireless/ipw2200/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/ipw2200 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.65 2006/04/02 16:27:29 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.66 2006/04/11 16:31:09 brix Exp $ + +*ipw2200-1.1.2-r1 (11 Apr 2006) + + 11 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> + +files/ipw2200-1.1.2-cflags.patch, +files/ipw2200-1.1.2-scan_fix.patch, + +ipw2200-1.1.2-r1.ebuild: + Add a couple of patches from upstream. 02 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> files/digest-ipw2200-1.1.2, Manifest: diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest index 6781d052d3f2..2f17fd397d00 100644 --- a/net-wireless/ipw2200/Manifest +++ b/net-wireless/ipw2200/Manifest @@ -1,4 +1,4 @@ -MD5 269dbef24bd877bf9221bcc35419c1d4 ChangeLog 12366 +MD5 fea4b3ba3b9872fc416437f641f0d68c ChangeLog 12597 MD5 0366dc766d77664dcfbe0f210a501c6a files/digest-ipw2200-1.0.10 63 MD5 da6616526b85364cf6ef78ee68e00556 files/digest-ipw2200-1.0.11 63 MD5 da6616526b85364cf6ef78ee68e00556 files/digest-ipw2200-1.0.11-r1 63 @@ -10,6 +10,7 @@ MD5 25bb7a22f5d3b003a58fc7a82d6b85d2 files/digest-ipw2200-1.1.0 62 MD5 d65480e8077954294f049d6c4d023b3c files/digest-ipw2200-1.1.1 62 MD5 80ae465d8bee456dcdd765d089b758eb files/digest-ipw2200-1.1.1-r1 138 MD5 c1130cde8cc7d3b62da0d2aa52412745 files/digest-ipw2200-1.1.2 62 +MD5 c1130cde8cc7d3b62da0d2aa52412745 files/digest-ipw2200-1.1.2-r1 62 MD5 91e9ccbbcf86cc2b81eff3fc853cb760 files/ipw2200-1.0.11-debug.patch 3496 MD5 a3a2dd68cce2a4d05217369daab108f1 files/ipw2200-1.0.8-broadcast.patch 594 MD5 a2de4d35e783a2aae5708846d8a7637c files/ipw2200-1.0.8-slabcorrupt.patch 522 @@ -17,7 +18,9 @@ MD5 dd96f1bc93f2c8f03a81b87f641a5329 files/ipw2200-1.0.8-txbusy.patch 811 MD5 e994df0999ba085974a28e98e317f702 files/ipw2200-1.0.9-qos.patch 918 MD5 89bdf40b614036a932f84192e4092e9c files/ipw2200-1.1.1-diversity.patch 1165 MD5 646b7e5aba19613998313aeb286f3e40 files/ipw2200-1.1.1-fw_endian.patch 2543 +MD5 a88ccefd21c85b7809a590ea049af117 files/ipw2200-1.1.2-cflags.patch 1271 MD5 55f822701e815b9b5fa308e59b2f4730 files/ipw2200-1.1.2-modverdir.patch 980 +MD5 74327a47badc95a5437356fa32f21ab4 files/ipw2200-1.1.2-scan_fix.patch 1626 MD5 fa29197797ebbf5db95a303892a231f1 ipw2200-1.0.10.ebuild 2883 MD5 ed815b8c793ab509c84913c0c16e06e4 ipw2200-1.0.11-r1.ebuild 2946 MD5 b9e8e1f57e42dc0faca0530fb8d34c37 ipw2200-1.0.11.ebuild 2885 @@ -28,5 +31,6 @@ MD5 d1428344ca6c3b3ece77f85fde18d2f0 ipw2200-1.0.9.ebuild 2935 MD5 aa565eefee8fc1398afd4037497b7eac ipw2200-1.1.0.ebuild 2887 MD5 2fad5a5720e57d795a3d12a641289a34 ipw2200-1.1.1-r1.ebuild 3145 MD5 a51b1ea769eb184cdae3610ef0be015b ipw2200-1.1.1.ebuild 2890 +MD5 bf0bfb4f0288e4c1033c23926f51deb2 ipw2200-1.1.2-r1.ebuild 2394 MD5 4d51111a1fdfd85a1fd1702dc13a9977 ipw2200-1.1.2.ebuild 2403 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.1.2-r1 b/net-wireless/ipw2200/files/digest-ipw2200-1.1.2-r1 new file mode 100644 index 000000000000..d787cee9b001 --- /dev/null +++ b/net-wireless/ipw2200/files/digest-ipw2200-1.1.2-r1 @@ -0,0 +1 @@ +MD5 f235318ea2fb711c3f1cb066080b2fd6 ipw2200-1.1.2.tgz 136074 diff --git a/net-wireless/ipw2200/files/ipw2200-1.1.2-cflags.patch b/net-wireless/ipw2200/files/ipw2200-1.1.2-cflags.patch new file mode 100644 index 000000000000..25ae42d9633a --- /dev/null +++ b/net-wireless/ipw2200/files/ipw2200-1.1.2-cflags.patch @@ -0,0 +1,35 @@ +Common subdirectories: ipw2200-1.1.2/in-tree and ipw2200-1.1.2-cflags/in-tree +diff -u ipw2200-1.1.2/Makefile ipw2200-1.1.2-cflags/Makefile +--- ipw2200-1.1.2/Makefile 2006-04-01 03:47:23.000000000 +0200 ++++ ipw2200-1.1.2-cflags/Makefile 2006-04-04 17:28:26.000000000 +0200 +@@ -84,20 +84,20 @@ + EXTRA_CFLAGS += -DCONFIG_PM + + ifeq ($(EXTERNAL_BUILD),y) +-ifdef CONFIG_IPW2200_DEBUG +-EXTRA_CFLAGS += -DCONFIG_IPW2200_DEBUG=$(CONFIG_IPW2200_DEBUG) ++ifeq ($(CONFIG_IPW2200_DEBUG),y) ++EXTRA_CFLAGS += -DCONFIG_IPW2200_DEBUG + endif +-ifdef CONFIG_IPW2200_MONITOR +-EXTRA_CFLAGS += -DCONFIG_IPW2200_MONITOR=$(CONFIG_IPW2200_MONITOR) +-ifdef CONFIG_IPW2200_RADIOTAP +-EXTRA_CFLAGS += -DCONFIG_IPW2200_RADIOTAP=$(CONFIG_IPW2200_RADIOTAP) ++ifeq ($(CONFIG_IPW2200_MONITOR),y) ++EXTRA_CFLAGS += -DCONFIG_IPW2200_MONITOR ++ifeq ($(CONFIG_IPW2200_RADIOTAP),y) ++EXTRA_CFLAGS += -DCONFIG_IPW2200_RADIOTAP + endif +-ifdef CONFIG_IPW2200_PROMISCUOUS +-EXTRA_CFLAGS += -DCONFIG_IPW2200_PROMISCUOUS=$(CONFIG_IPW2200_PROMISCUOUS) ++ifeq ($(CONFIG_IPW2200_PROMISCUOUS),y) ++EXTRA_CFLAGS += -DCONFIG_IPW2200_PROMISCUOUS + endif + endif +-ifdef CONFIG_IPW2200_QOS +-EXTRA_CFLAGS += -DCONFIG_IPW2200_QOS=$(CONFIG_IPW2200_QOS) ++ifeq ($(CONFIG_IPW2200_QOS),y) ++EXTRA_CFLAGS += -DCONFIG_IPW2200_QOS + endif + endif + diff --git a/net-wireless/ipw2200/files/ipw2200-1.1.2-scan_fix.patch b/net-wireless/ipw2200/files/ipw2200-1.1.2-scan_fix.patch new file mode 100644 index 000000000000..bd403142bbcf --- /dev/null +++ b/net-wireless/ipw2200/files/ipw2200-1.1.2-scan_fix.patch @@ -0,0 +1,48 @@ +diff -urp ipw2200-1.1.2/ipw2200.c ipw2200-1.1.2-new/ipw2200.c +--- ipw2200-1.1.2/ipw2200.c 2006-04-01 09:47:24.000000000 +0800 ++++ ipw2200-1.1.2-new/ipw2200.c 2006-04-05 17:36:32.000000000 +0800 +@@ -4745,7 +4745,8 @@ static void ipw_rx_notification(struct i + * on how the scan was initiated. User space can just + * sync on periodic scan to get fresh data... + * Jean II */ +- if (x->status == SCAN_COMPLETED_STATUS_COMPLETE) { ++ //if (x->status == SCAN_COMPLETED_STATUS_COMPLETE) { ++ { + union iwreq_data wrqu; + + wrqu.data.length = 0; +@@ -6514,8 +6515,6 @@ static void ipw_wpa_assoc_frame(struct i + { + /* make sure WPA is enabled */ + ipw_wpa_enable(priv, 1); +- +- ipw_disassociate(priv); + } + + static int ipw_set_rsn_capa(struct ipw_priv *priv, +@@ -7119,6 +7118,7 @@ static int ipw_wx_set_auth(struct net_de + + case IW_AUTH_WPA_ENABLED: + ret = ipw_wpa_enable(priv, param->value); ++ ipw_disassociate(priv); + break; + + case IW_AUTH_RX_UNENCRYPTED_EAPOL: +@@ -8050,7 +8050,7 @@ static int ipw_associate(void *data) + if (!network) { + ipw_debug_config(priv); + +- if (!(priv->status & STATUS_SCANNING)) { ++ if (!(priv->status & STATUS_SCANNING) && !priv->ieee->wpa_enabled) { + if (!(priv->config & CFG_SPEED_SCAN)) + queue_delayed_work(priv->workqueue, + &priv->request_scan, +@@ -11187,7 +11187,7 @@ static void ipw_link_down(struct ipw_pri + + ipw_reset_stats(priv); + +- if (!(priv->status & STATUS_EXIT_PENDING)) { ++ if (!(priv->status & STATUS_EXIT_PENDING) && !priv->ieee->wpa_enabled) { + /* Queue up another scan... */ + queue_work(priv->workqueue, &priv->request_scan); + } diff --git a/net-wireless/ipw2200/ipw2200-1.1.2-r1.ebuild b/net-wireless/ipw2200/ipw2200-1.1.2-r1.ebuild new file mode 100644 index 000000000000..b506b39f2294 --- /dev/null +++ b/net-wireless/ipw2200/ipw2200-1.1.2-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.1.2-r1.ebuild,v 1.1 2006/04/11 16:31:09 brix Exp $ + +inherit eutils linux-mod + +# The following works with both pre-releases and releases +MY_P=${P/_/-} +S=${WORKDIR}/${MY_P} + +IEEE80211_VERSION="1.1.13" +FW_VERSION="3.0" + +DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters" +HOMEPAGE="http://ipw2200.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug" +DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION} + sys-apps/sed" +RDEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION} + >=net-wireless/ipw2200-firmware-${FW_VERSION} + net-wireless/wireless-tools" + +BUILD_TARGETS="all" +MODULE_NAMES="ipw2200(net/wireless:)" +MODULESD_IPW2200_DOCS="README.ipw2200" + +CONFIG_CHECK="NET_RADIO FW_LOADER !IPW2200" +ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." +ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)." +ERROR_IPW2200="${P} requires the in-kernel version of the IPW2200 driver to be disabled (CONFIG_IPW2200)" + +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 ${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then + eerror + eerror "Looks like you forgot to remerge net-wireless/ieee80211 after" + eerror "upgrading your kernel." + eerror + eerror "Hint: use sys-kernel/module-rebuild for keeping track of which" + eerror "modules needs to be remerged after a kernel upgrade." + eerror + die "${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found" + fi + + BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include" +} + +src_unpack() { + local debug="n" radiotap="n" + + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-modverdir.patch + epatch ${FILESDIR}/${P}-cflags.patch + epatch ${FILESDIR}/${P}-scan_fix.patch + + use debug && debug="y" + sed -i -e "s:^\(CONFIG_IPW2200_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile +} + +src_compile() { + linux-mod_src_compile + + einfo + einfo "You may safely ignore any warnings from above compilation about" + einfo "undefined references to the ieee80211 subsystem." + einfo +} + +src_install() { + linux-mod_src_install + + dodoc CHANGES ISSUES +} |