From 9c34a7045a01b862e9ea6041fcd9ff2db3c0ace9 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Fri, 23 Apr 2004 15:19:05 +0000 Subject: Bump and clean out old stuff. Lots of changes to handle the WEP stuff along with hostap-driver. Thanks to all on bug #47892. --- net-wireless/ipw2100/ChangeLog | 11 ++- net-wireless/ipw2100/Manifest | 3 + net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 | 2 - net-wireless/ipw2100/files/digest-ipw2100-0.34 | 2 - net-wireless/ipw2100/files/digest-ipw2100-0.35 | 2 - net-wireless/ipw2100/files/digest-ipw2100-0.41 | 2 + net-wireless/ipw2100/files/hostap_crypt.h | 39 ++++++++++ net-wireless/ipw2100/ipw2100-0.33-r1.ebuild | 72 ------------------- net-wireless/ipw2100/ipw2100-0.34.ebuild | 67 ----------------- net-wireless/ipw2100/ipw2100-0.35.ebuild | 67 ----------------- net-wireless/ipw2100/ipw2100-0.41.ebuild | 87 +++++++++++++++++++++++ 11 files changed, 141 insertions(+), 213 deletions(-) delete mode 100644 net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 delete mode 100644 net-wireless/ipw2100/files/digest-ipw2100-0.34 delete mode 100644 net-wireless/ipw2100/files/digest-ipw2100-0.35 create mode 100644 net-wireless/ipw2100/files/digest-ipw2100-0.41 create mode 100644 net-wireless/ipw2100/files/hostap_crypt.h delete mode 100644 net-wireless/ipw2100/ipw2100-0.33-r1.ebuild delete mode 100644 net-wireless/ipw2100/ipw2100-0.34.ebuild delete mode 100644 net-wireless/ipw2100/ipw2100-0.35.ebuild create mode 100644 net-wireless/ipw2100/ipw2100-0.41.ebuild (limited to 'net-wireless') diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog index f56d7466e4e9..06ae9ee86187 100644 --- a/net-wireless/ipw2100/ChangeLog +++ b/net-wireless/ipw2100/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-wireless/ipw2100 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.11 2004/03/26 20:57:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.12 2004/04/23 15:19:05 latexer Exp $ + +*ipw2100-0.41 (23 Apr 2004) + + 23 Apr 2004; Peter Johanson ipw2100-0.33-r1.ebuild, + ipw2100-0.34.ebuild, ipw2100-0.35.ebuild, ipw2100-0.41.ebuild, + files/hostap_crypt.h: + Bump. First version with testing WEP support. Thanks to all on bug #47892. + Note added about re-emerging both ipw2100 and hostap-driver after a kernel + upgrade. Removed some old versions too. *ipw2100-0.39 (26 Mar 2004) diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest index c5f8e247137c..a92960b76c9a 100644 --- a/net-wireless/ipw2100/Manifest +++ b/net-wireless/ipw2100/Manifest @@ -1,3 +1,4 @@ +MD5 83de399845671f499c30a631eb3b801c ipw2100-0.41.ebuild 2229 MD5 1915e4f827e5a22c646630bf76505c6a ipw2100-0.37.ebuild 1600 MD5 7ef502a663c0882d7b486521075f54aa ipw2100-0.33-r1.ebuild 1753 MD5 8dac5cba8f5fac7506d7fb1bced2c4d0 ipw2100-0.39.ebuild 1600 @@ -17,4 +18,6 @@ MD5 a86cf7317e197c9132f5f43650739e4a files/digest-ipw2100-0.35 128 MD5 2121348d7f60dbcd4586e7cf9c1087d0 files/digest-ipw2100-0.37 128 MD5 2cdb3f0d9c33e503d0c304c148cb772d files/digest-ipw2100-0.38 128 MD5 b9c335a6f59cf565015715171df0d9eb files/digest-ipw2100-0.39 128 +MD5 f9a4a4e4aacd5c115776d3ccc8333cab files/digest-ipw2100-0.41 123 MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275 +MD5 99cced47568e9cb3fd2e3ceaed896c88 files/hostap_crypt.h 1344 diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 deleted file mode 100644 index 5dee2d0a9282..000000000000 --- a/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 98c8cf2aaf8fb724e490c8e3b6b9542d ipw2100-full-0.33.tgz 718118 -MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843 diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.34 b/net-wireless/ipw2100/files/digest-ipw2100-0.34 deleted file mode 100644 index 4acde1cfd467..000000000000 --- a/net-wireless/ipw2100/files/digest-ipw2100-0.34 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 aa1abb0f57db4e67eea37952695ac548 ipw2100-full-0.34.tgz 718974 -MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843 diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.35 b/net-wireless/ipw2100/files/digest-ipw2100-0.35 deleted file mode 100644 index 2907d8ff1590..000000000000 --- a/net-wireless/ipw2100/files/digest-ipw2100-0.35 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 add1a6eb677774e932d3849d428dccc6 ipw2100-full-0.35.tgz 723158 -MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843 diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.41 b/net-wireless/ipw2100/files/digest-ipw2100-0.41 new file mode 100644 index 000000000000..03f28cc2edf5 --- /dev/null +++ b/net-wireless/ipw2100/files/digest-ipw2100-0.41 @@ -0,0 +1,2 @@ +MD5 427f6cdaa68f340994db72fc8791d2df ipw2100-0.41.tgz 102029 +MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843 diff --git a/net-wireless/ipw2100/files/hostap_crypt.h b/net-wireless/ipw2100/files/hostap_crypt.h new file mode 100644 index 000000000000..eab03c7abb0a --- /dev/null +++ b/net-wireless/ipw2100/files/hostap_crypt.h @@ -0,0 +1,39 @@ +#ifndef PRISM2_CRYPT_H +#define PRISM2_CRYPT_H + +struct hostap_crypto_ops { + char *name; + + /* init new crypto context (e.g., allocate private data space, + * select IV, etc.); returns NULL on failure or pointer to allocated + * private data on success */ + void * (*init)(void); + + /* deinitialize crypto context and free allocated private data */ + void (*deinit)(void *priv); + + /* encrypt/decrypt return < 0 on error or number of bytes written + * to out_buf; len is number of bytes in in_buf */ + int (*encrypt)(u8 *buf, int len, void *priv); + int (*decrypt)(u8 *buf, int len, void *priv); + + int (*set_key)(int idx, void *key, int len, void *priv); + int (*get_key)(int idx, void *key, int len, void *priv); + + int (*set_key_idx)(int idx, void *priv); + int (*get_key_idx)(void *priv); + + /* maximum number of bytes added by encryption; encrypt buf is + * allocated with extra_prefix_len bytes, copy of in_buf, and + * extra_postfix_len; encrypt need not use all this space, but + * the result must start at the beginning of the buffer and correct + * length must be returned */ + int extra_prefix_len, extra_postfix_len; +}; + + +int hostap_register_crypto_ops(struct hostap_crypto_ops *ops); +int hostap_unregister_crypto_ops(struct hostap_crypto_ops *ops); +struct hostap_crypto_ops * hostap_get_crypto_ops(const char *name); + +#endif /* PRISM2_CRYPT_H */ diff --git a/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild deleted file mode 100644 index 2cd998ffe5a0..000000000000 --- a/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild,v 1.2 2004/03/18 02:35:31 latexer Exp $ - -inherit kernel-mod eutils - -MY_P=${P/ipw2100/ipw2100-full} -FW_VERSION="1.0" - -DESCRIPTION="Driver for the Intel Centrino wireless chipset" - -HOMEPAGE="http://ipw2100.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz - mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -IUSE="" -DEPEND="" -RDEPEND=">=sys-apps/hotplug-20030805-r2" - -src_unpack() { - if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null - then - eerror "" - eerror "New versions of ${PN} require firmware loader support from" - eerror "your kernel. This can be found in Device Drivers --> Generic" - eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels." - die "Firmware loading support not detected." - fi - - unpack ${A} - kernel-mod_getversion - - cd ${S} - epatch ${FILESDIR}/${P}-makefile-fix.diff - EPATCH_SINGLE_MSG="Patch to fix locks with C3 state" \ - epatch ${FILESDIR}/${P}-acpi-fix.diff -} - -src_compile() { - unset ARCH - emake KSRC=${ROOT}/usr/src/linux all || die -} - -src_install() { - if [ ${KV_MINOR} -gt 4 ] - then - KV_OBJ="ko" - else - KV_OBJ="o" - fi - - - dodoc ISSUES README.ipw2100 DESIGN - - insinto /lib/modules/${KV}/net - doins ipw2100.${KV_OBJ} - doins av5100.${KV_OBJ} - - insinto /usr/lib/hotplug/firmware/ - doins ${WORKDIR}/${PN}-${FW_VERSION}.fw - doins ${WORKDIR}/LICENSE -} - -pkg_postinst() { - einfo "Checking kernel module dependancies" - test -r "${ROOT}/usr/src/linux/System.map" && \ - depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV} -} diff --git a/net-wireless/ipw2100/ipw2100-0.34.ebuild b/net-wireless/ipw2100/ipw2100-0.34.ebuild deleted file mode 100644 index fa75b82c07fc..000000000000 --- a/net-wireless/ipw2100/ipw2100-0.34.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.34.ebuild,v 1.1 2004/03/18 02:35:31 latexer Exp $ - -inherit kernel-mod eutils - -MY_P=${P/ipw2100/ipw2100-full} -FW_VERSION="1.0" - -DESCRIPTION="Driver for the Intel Centrino wireless chipset" - -HOMEPAGE="http://ipw2100.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz - mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -IUSE="" -DEPEND="" -RDEPEND=">=sys-apps/hotplug-20030805-r2" - -src_unpack() { - if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null - then - eerror "" - eerror "New versions of ${PN} require firmware loader support from" - eerror "your kernel. This can be found in Device Drivers --> Generic" - eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels." - die "Firmware loading support not detected." - fi - - unpack ${A} - kernel-mod_getversion -} - -src_compile() { - unset ARCH - emake KSRC=${ROOT}/usr/src/linux all || die -} - -src_install() { - if [ ${KV_MINOR} -gt 4 ] - then - KV_OBJ="ko" - else - KV_OBJ="o" - fi - - - dodoc ISSUES README.ipw2100 DESIGN - - insinto /lib/modules/${KV}/net - doins ipw2100.${KV_OBJ} - doins av5100.${KV_OBJ} - - insinto /usr/lib/hotplug/firmware - doins ${WORKDIR}/${PN}-${FW_VERSION}.fw - doins ${WORKDIR}/LICENSE -} - -pkg_postinst() { - einfo "Checking kernel module dependancies" - test -r "${ROOT}/usr/src/linux/System.map" && \ - depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV} -} diff --git a/net-wireless/ipw2100/ipw2100-0.35.ebuild b/net-wireless/ipw2100/ipw2100-0.35.ebuild deleted file mode 100644 index cd9d0a90b5fa..000000000000 --- a/net-wireless/ipw2100/ipw2100-0.35.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.35.ebuild,v 1.1 2004/03/18 22:07:40 latexer Exp $ - -inherit kernel-mod eutils - -MY_P=${P/ipw2100/ipw2100-full} -FW_VERSION="1.0" - -DESCRIPTION="Driver for the Intel Centrino wireless chipset" - -HOMEPAGE="http://ipw2100.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz - mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -IUSE="" -DEPEND="" -RDEPEND=">=sys-apps/hotplug-20030805-r2" - -src_unpack() { - if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null - then - eerror "" - eerror "New versions of ${PN} require firmware loader support from" - eerror "your kernel. This can be found in Device Drivers --> Generic" - eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels." - die "Firmware loading support not detected." - fi - - unpack ${A} - kernel-mod_getversion -} - -src_compile() { - unset ARCH - emake KSRC=${ROOT}/usr/src/linux all || die -} - -src_install() { - if [ ${KV_MINOR} -gt 4 ] - then - KV_OBJ="ko" - else - KV_OBJ="o" - fi - - - dodoc ISSUES README.ipw2100 DESIGN - - insinto /lib/modules/${KV}/net - doins ipw2100.${KV_OBJ} - doins av5100.${KV_OBJ} - - insinto /usr/lib/hotplug/firmware - doins ${WORKDIR}/${PN}-${FW_VERSION}.fw - doins ${WORKDIR}/LICENSE -} - -pkg_postinst() { - einfo "Checking kernel module dependancies" - test -r "${ROOT}/usr/src/linux/System.map" && \ - depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV} -} diff --git a/net-wireless/ipw2100/ipw2100-0.41.ebuild b/net-wireless/ipw2100/ipw2100-0.41.ebuild new file mode 100644 index 000000000000..15d58323bc89 --- /dev/null +++ b/net-wireless/ipw2100/ipw2100-0.41.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.41.ebuild,v 1.1 2004/04/23 15:19:05 latexer Exp $ + +inherit kernel-mod eutils + +FW_VERSION="1.0" + +DESCRIPTION="Driver for the Intel Centrino wireless chipset" + +HOMEPAGE="http://ipw2100.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz + mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +IUSE="" +DEPEND="" +RDEPEND=">=sys-apps/hotplug-20030805-r2 + >=net-wireless/hostap-driver-0.1.3" + +src_unpack() { + if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null + then + eerror "" + eerror "New versions of ${PN} require firmware loader support from" + eerror "your kernel. This can be found in Device Drivers --> Generic" + eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels." + die "Firmware loading support not detected." + fi + + unpack ${A} + kernel-mod_getversion + + cd ${S} + mkdir -p hostap-driver-0.1.3/driver/modules + cp ${FILESDIR}/hostap_crypt.h hostap-driver-0.1.3/driver/modules +} + +src_compile() { + unset ARCH + emake KSRC=${ROOT}/usr/src/linux HOSTAP=hostap-driver-0.1.3 all || die +} + +src_install() { + if [ ${KV_MINOR} -gt 4 ] + then + KV_OBJ="ko" + else + KV_OBJ="o" + fi + + + dodoc ISSUES README.ipw2100 CHANGES + + insinto /lib/modules/${KV}/net + doins ipw2100.${KV_OBJ} av5100.${KV_OBJ} pbe5.${KV_OBJ} + + insinto /usr/lib/hotplug/firmware + doins ${WORKDIR}/${PN}-${FW_VERSION}.fw + doins ${WORKDIR}/LICENSE +} + +pkg_postinst() { + if [ ${KV_MINOR} -gt 4 ] + then + KV_OBJ="ko" + else + KV_OBJ="o" + fi + + einfo "Checking kernel module dependancies" + test -r "${ROOT}/usr/src/linux/System.map" && \ + depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV} + + if [ ! -f ${ROOT}/lib/modules/${KV}/net/hostap_crypt_wep.${KV_OBJ} ] + then + eerror "" + eerror "Modules for hostap-driver not found!" + eerror "For WEP to work, you need the hostap-driver modules available for your kernel" + eerror "If you upgrade kernels, you need to re-emerge BOTH ipw2100 and hostap-driver" + eerror "to ensure that all the needed kernel modules are present!" + eerror "" + fi +} -- cgit v1.2.3-65-gdbad