Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-wireless/orinoco
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2006-02-02 15:32:19 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2006-02-02 15:32:19 +0000
commit32121f2ef538331e5437f3a63a56fe3e59ea3b98 (patch)
treef9e68c16e7598f70cd99d72677a6a4bde4978e8d /net-wireless/orinoco
parentMark 2.12.2 stable on ia64 (diff)
downloadgentoo-2-32121f2ef538331e5437f3a63a56fe3e59ea3b98.tar.gz
gentoo-2-32121f2ef538331e5437f3a63a56fe3e59ea3b98.tar.bz2
gentoo-2-32121f2ef538331e5437f3a63a56fe3e59ea3b98.zip
Pruned old ebuilds.
(Portage version: 2.0.54)
Diffstat (limited to 'net-wireless/orinoco')
-rw-r--r--net-wireless/orinoco/ChangeLog9
-rw-r--r--net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r21
-rw-r--r--net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r11
-rw-r--r--net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch73
-rw-r--r--net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch20
-rw-r--r--net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch31
-rw-r--r--net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild105
-rw-r--r--net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild115
8 files changed, 8 insertions, 347 deletions
diff --git a/net-wireless/orinoco/ChangeLog b/net-wireless/orinoco/ChangeLog
index e918158d14b9..d8c734a3ddcd 100644
--- a/net-wireless/orinoco/ChangeLog
+++ b/net-wireless/orinoco/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-wireless/orinoco
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.16 2006/01/30 21:59:18 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.17 2006/02/02 15:32:19 brix Exp $
+
+ 02 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+ -files/orinoco-0.15rc2-2.6.10.patch,
+ -files/orinoco-0.15rc2-firmware.patch,
+ -files/orinoco-0.15rc3-memleak.patch, -orinoco-0.15_rc2-r2.ebuild,
+ -orinoco-0.15_rc3-r1.ebuild:
+ Pruned old ebuilds.
30 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
orinoco-0.15_rc4.ebuild:
diff --git a/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2 b/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2
deleted file mode 100644
index 4c08d54839d9..000000000000
--- a/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2246f0879439d74f7aabc7935cec90c0 orinoco-0.15rc2.tar.gz 98693
diff --git a/net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r1 b/net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r1
deleted file mode 100644
index f2c8e9a4dd62..000000000000
--- a/net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4e3e2b239174f04ff4c681fe64d9e69 orinoco-0.15rc3.tar.gz 88041
diff --git a/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch b/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch
deleted file mode 100644
index 783afebff283..000000000000
--- a/net-wireless/orinoco/files/orinoco-0.15rc2-2.6.10.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urp orinoco-0.15rc2/hermes.h orinoco-0.15rc2-2.6.10/hermes.h
---- orinoco-0.15rc2/hermes.h 2004-07-28 08:06:45.000000000 +0200
-+++ orinoco-0.15rc2-2.6.10/hermes.h 2005-01-07 15:02:07.000000000 +0100
-@@ -366,12 +366,12 @@ typedef struct hermes {
- /* Register access convenience macros */
- #define hermes_read_reg(hw, off) ((hw)->io_space ? \
- inw((hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
-- readw((hw)->iobase + ( (off) << (hw)->reg_spacing )))
-+ readw((void *)(hw)->iobase + ( (off) << (hw)->reg_spacing )))
- #define hermes_write_reg(hw, off, val) do { \
- if ((hw)->io_space) \
- outw_p((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \
- else \
-- writew((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \
-+ writew((val), (void *)(hw)->iobase + ((off) << (hw)->reg_spacing)); \
- } while (0)
- #define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)
- #define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
-@@ -444,7 +444,7 @@ static inline void hermes_read_words(str
- * gcc is smart enough to fold away the two swaps on
- * big-endian platforms. */
- for (i = 0, p = buf; i < count; i++) {
-- *p++ = cpu_to_le16(readw(hw->iobase + off));
-+ *p++ = cpu_to_le16(readw((void *)(hw->iobase + off)));
- }
- }
- }
-@@ -464,7 +464,7 @@ static inline void hermes_write_words(st
- * hope gcc is smart enough to fold away the two swaps
- * on big-endian platforms. */
- for (i = 0, p = buf; i < count; i++) {
-- writew(le16_to_cpu(*p++), hw->iobase + off);
-+ writew(le16_to_cpu(*p++), (void *)(hw->iobase + off));
- }
- }
- }
-@@ -480,7 +480,7 @@ static inline void hermes_clear_words(st
- outw(0, hw->iobase + off);
- } else {
- for (i = 0; i < count; i++)
-- writew(0, hw->iobase + off);
-+ writew(0, (void *)(hw->iobase + off));
- }
- }
-
-diff -urp orinoco-0.15rc2/orinoco_pci.c orinoco-0.15rc2-2.6.10/orinoco_pci.c
---- orinoco-0.15rc2/orinoco_pci.c 2004-07-28 08:06:45.000000000 +0200
-+++ orinoco-0.15rc2-2.6.10/orinoco_pci.c 2005-01-07 15:08:40.902021640 +0100
-@@ -327,7 +327,11 @@ static int orinoco_pci_suspend(struct pc
-
- orinoco_unlock(priv, &flags);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- pci_save_state(pdev, card->pci_state);
-+#else
-+ pci_save_state(pdev);
-+#endif
- pci_set_power_state(pdev, 3);
-
- return 0;
-@@ -344,8 +348,11 @@ static int orinoco_pci_resume(struct pci
- printk(KERN_DEBUG "%s: Orinoco-PCI waking up\n", dev->name);
-
- pci_set_power_state(pdev, 0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- pci_restore_state(pdev, card->pci_state);
--
-+#else
-+ pci_restore_state(pdev);
-+#endif
- err = orinoco_reinit_firmware(dev);
- if (err) {
- printk(KERN_ERR "%s: Error %d re-initializing firmware on orinoco_pci_resume()\n",
diff --git a/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch b/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch
deleted file mode 100644
index 5760e54c57e4..000000000000
--- a/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urp orinoco-0.15rc2/Makefile orinoco-0.15rc2-firmware/Makefile
---- orinoco-0.15rc2/Makefile 2004-07-28 08:06:45.000000000 +0200
-+++ orinoco-0.15rc2-firmware/Makefile 2005-04-28 11:20:54.000000000 +0200
-@@ -69,16 +69,6 @@ ifdef CONFIG_PCI
- MODULES += orinoco_nortel.o orinoco_pci.o orinoco_plx.o orinoco_tmd.o
- endif
-
--# Replacement for firmware loader for 2.4 kernels that don't have it
--ifneq (,$(OLDMAKE))
--ifdef CONFIG_HOTPLUG
--ifndef CONFIG_FW_LOADER
--MODULES += firmware_class.o
--CONFIG_FW_LOADER = m
--endif
--endif
--endif
--
- ifdef CONFIG_PCMCIA
- MODULES += orinoco_cs.o
- ifdef CONFIG_FW_LOADER
diff --git a/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch b/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch
deleted file mode 100644
index 93c0f1f3a2e7..000000000000
--- a/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urp orinoco-0.15rc3/orinoco.c orinoco-0.15rc3-memleak/orinoco.c
---- orinoco-0.15rc3/orinoco.c 2005-09-22 00:16:05.000000000 +0200
-+++ orinoco-0.15rc3-memleak/orinoco.c 2005-11-27 23:30:28.000000000 +0100
-@@ -489,9 +489,14 @@ static int orinoco_xmit(struct sk_buff *
- return 0;
- }
-
-- /* Length of the packet body */
-- /* FIXME: what if the skb is smaller than this? */
-- len = max_t(int,skb->len - ETH_HLEN, ETH_ZLEN - ETH_HLEN);
-+ /* Check packet length, pad short packets, round up odd length */
-+ len = max_t(int, ALIGN(skb->len, 2), ETH_ZLEN);
-+ if (skb->len < len) {
-+ skb = skb_padto(skb, len);
-+ if (skb == NULL)
-+ goto fail;
-+ }
-+ len -= ETH_HLEN;
-
- eh = (struct ethhdr *)skb->data;
-
-@@ -543,8 +548,7 @@ static int orinoco_xmit(struct sk_buff *
- p = skb->data;
- }
-
-- /* Round up for odd length packets */
-- err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2),
-+ err = hermes_bap_pwrite(hw, USER_BAP, p, data_len,
- txfid, data_off);
- if (err) {
- printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
diff --git a/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild b/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild
deleted file mode 100644
index 8c6071f2ff30..000000000000
--- a/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild,v 1.3 2005/11/15 14:07:59 brix Exp $
-
-inherit eutils linux-mod
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="ORiNOCO wireless driver"
-HOMEPAGE="http://www.nongnu.org/orinoco/"
-SRC_URI="${SRC_URI} http://www.ozlabs.org/people/dgibson/dldwd/${MY_P}.tar.gz"
-LICENSE="GPL-2 MPL-1.1"
-
-KEYWORDS="x86 ~ppc"
-IUSE="pcmcia"
-SLOT="0"
-
-RDEPEND="net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULESD_ORINOCO_DOCS="README.orinoco"
-
-CONFIG_CHECK="NET_RADIO !HERMES"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_HERMES="${P} requires Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) (CONFIG_HERMES) to be DISABLED."
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- if kernel_is ge 2 6 15; then
- ewarn
- ewarn "Linux kernel 2.6.15 and above contains a more recent version of this"
- ewarn "driver. Please consider using the in-kernel driver when using"
- ewarn "linux-2.6.14 or above."
- ewarn
- fi
-
- MODULE_NAMES="hermes(net:)
- orinoco(net:)"
-
- if linux_chkconfig_present PCI; then
- einfo "PCI support detected"
- MODULE_NAMES="${MODULE_NAMES} orinoco_nortel(net:) orinoco_pci(net:) orinoco_plx(net:) orinoco_tmd(net:)"
- fi
-
- if linux_chkconfig_present PPC_PMAC; then
- einfo "PPC PowerMac support detected"
- MODULE_NAMES="${MODULE_NAMES} airport(net:)"
- fi
-
- if use pcmcia; then
- einfo "PCMCIA support detected"
-
- MODULE_NAMES="${MODULE_NAMES} orinoco_cs(net:)"
-
- if kernel_is gt 2 4 && linux_chkconfig_present FW_LOADER; then
- einfo "Firmware loader support detected"
- MODULE_NAMES="${MODULE_NAMES} spectrum_cs(net:)"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- pcmcia_src_unpack
-
- cd ${S}
- epatch ${FILESDIR}/${MY_P}-2.6.10.patch
- epatch ${FILESDIR}/${MY_P}-firmware.patch
-
- if [[ -n "${PCMCIA_VERSION}" ]]; then
- sed -i -e "s:^\(PCMCIA_CS\) =.*:\1 = ${PCMCIA_SOURCE_DIR}:" \
- ${S}/Makefile
- fi
-
- sed -i "s:^\(KERNEL_SRC\) =.*:\1 = ${KV_DIR}:" \
- ${S}/Makefile
-
- convert_to_m ${S}/Makefile
-}
-
-src_install() {
- if use pcmcia; then
- insinto /etc/pcmcia
- doins hermes.conf
- fi
-
- linux-mod_src_install
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- if [[ -e ${ROOT}/lib/modules/${KV_FULL}/pcmcia/orinoco.${KV_OBJ} ]]; then
- ewarn
- ewarn "The modules from this package conflicts with the modules installed"
- ewarn "by the pcmcia-cs package. You will have to manually delete the"
- ewarn "duplicate modules from the"
- ewarn " ${ROOT}lib/modules/${KV_FULL}/pcmcia/"
- ewarn "directory and manually run '/sbin/depmod -ae'"
- ewarn
- fi
-}
diff --git a/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild b/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild
deleted file mode 100644
index 0df13b80424e..000000000000
--- a/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild,v 1.1 2005/11/27 22:36:37 brix Exp $
-
-inherit eutils linux-mod
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="ORiNOCO IEEE 802.11 wireless LAN driver"
-HOMEPAGE="http://www.nongnu.org/orinoco/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="pcmcia"
-RDEPEND="net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULESD_ORINOCO_DOCS="README.orinoco"
-
-CONFIG_CHECK="~FW_LOADER !HERMES NET_RADIO ~PCI ~PCMCIA"
-ERROR_HERMES="${P} requires Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) (CONFIG_HERMES) to be DISABLED."
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-MODULESD_ORINOCO_NORTEL_ENABLED="no"
-MODULESD_ORINOCO_PCI_ENABLED="no"
-MODULESD_ORINOCO_PLX_ENABLED="no"
-MODULESD_ORINOCO_TMD_ENABLED="no"
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- if kernel_is lt 2 6 11; then
- eerror
- eerror "${P} requires kernel 2.6.11 or above."
- eerror
- die "Kernel version too old."
- fi
-
- if kernel_is ge 2 6 15; then
- ewarn
- ewarn "Linux kernel 2.6.15 and above contains a more recent version of this"
- ewarn "driver. Please consider using the in-kernel driver when using"
- ewarn "linux-2.6.15 or above."
- ewarn
- fi
-
- MODULE_NAMES="hermes(net/wireless:)
- orinoco(net/wireless:)"
-
- if linux_chkconfig_present PCI; then
- MODULE_NAMES="${MODULE_NAMES}
- orinoco_nortel(net/wireless:)
- orinoco_pci(net/wireless:)
- orinoco_plx(net/wireless:)
- orinoco_tmd(net/wireless:)"
- fi
-
- if linux_chkconfig_present PPC_PMAC; then
- MODULE_NAMES="${MODULE_NAMES} airport(net/wireless:)"
- fi
-
- if use pcmcia && linux_chkconfig_present PCMCIA; then
- MODULE_NAMES="${MODULE_NAMES} orinoco_cs(net/wireless:)"
-
- if linux_chkconfig_present FW_LOADER; then
- MODULE_NAMES="${MODULE_NAMES} spectrum_cs(net/wireless:)"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
- epatch ${FILESDIR}/${MY_P}-memleak.patch
-
- sed -i "s:^\(KERNEL_PATH\) =.*:\1 = ${KV_OUT_DIR}:" \
- ${S}/Makefile
-}
-
-src_compile() {
- linux-mod_src_compile
-
- if use pcmcia; then
- emake hermes.conf
- fi
-}
-
-src_install() {
- linux-mod_src_install
-
- dodoc NEWS
-
- if use pcmcia; then
- insinto /etc/pcmcia
- doins hermes.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- if [[ -e ${ROOT}/lib/modules/${KV_FULL}/pcmcia/orinoco.${KV_OBJ} ]]; then
- ewarn
- ewarn "The modules from this package conflicts with the modules installed"
- ewarn "by the pcmcia-cs package. You will have to manually delete the"
- ewarn "duplicate modules from the"
- ewarn " ${ROOT}lib/modules/${KV_FULL}/pcmcia/"
- ewarn "directory and manually run '/sbin/depmod -ae'"
- ewarn
- fi
-}