From 3c57895d4d47cb2c1b540050147b5167c8821538 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Thu, 5 Jan 2006 23:39:50 +0000 Subject: Made 1.2 die when 2.6.14 or newer is used, added a new revision of 1.2 with a patch from bug #117706 and added myself as a maintainer. Package-Manager: portage-2.1_pre3-r1 --- net-wireless/ndiswrapper/ChangeLog | 12 ++- net-wireless/ndiswrapper/Manifest | 15 ++-- .../ndiswrapper/files/digest-ndiswrapper-1.2-r1 | 1 + .../files/ndiswrapper-1.2-kernel-2.6.14.patch | 29 +++++++ net-wireless/ndiswrapper/metadata.xml | 5 +- net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild | 93 ++++++++++++++++++++++ net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild | 16 +++- 7 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2-r1 create mode 100644 net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.14.patch create mode 100644 net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild (limited to 'net-wireless/ndiswrapper') diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index 014c64bdda75..7875ae1b2111 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/ndiswrapper -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.34 2005/12/28 14:30:24 betelgeuse Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.35 2006/01/05 23:39:50 betelgeuse Exp $ + +*ndiswrapper-1.2-r1 (05 Jan 2006) + + 05 Jan 2006; Petteri Räty + +files/ndiswrapper-1.2-kernel-2.6.14.patch, metadata.xml, + ndiswrapper-1.2.ebuild, +ndiswrapper-1.2-r1.ebuild: + Made 1.2 die when 2.6.14 or newer is used, added a new revision of 1.2 with + a patch from bug #117706 and added myself as a maintainer. *ndiswrapper-1.7 (28 Dec 2005) diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest index 9a8800c5e83f..887eab4dfe38 100644 --- a/net-wireless/ndiswrapper/Manifest +++ b/net-wireless/ndiswrapper/Manifest @@ -1,19 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 470880bb2323cecbc68aede74373a898 ChangeLog 7072 +MD5 5ba529a14b3b213245c291115b30774c ChangeLog 7414 MD5 fd2f66ff609bafcd303be1db969e9185 files/digest-ndiswrapper-1.2 67 +MD5 fd2f66ff609bafcd303be1db969e9185 files/digest-ndiswrapper-1.2-r1 67 MD5 99150810adb8171b788cfed921ab62bd files/digest-ndiswrapper-1.5 67 MD5 7c67b35a030ab2acbc09e54ee77a6205 files/digest-ndiswrapper-1.7 67 +MD5 69ca885f3c7039ffb61da23aa194653c files/ndiswrapper-1.2-kernel-2.6.14.patch 1162 MD5 9cf5a13dc78b9840d419f0656d1dd920 files/ndiswrapper-1.2-suspend2.patch 553 -MD5 2f7c7c41947c7558b2ffd955781cf676 metadata.xml 475 -MD5 cac3ca22dc7de36f7b39637624d8a8c8 ndiswrapper-1.2.ebuild 2532 +MD5 8d922dcf7a83d54f22e5831433f2ba65 metadata.xml 542 +MD5 46f76e50f834338793de3f27c3b29de8 ndiswrapper-1.2-r1.ebuild 2583 +MD5 e0270deffdd57fbe8d7d745964b17f00 ndiswrapper-1.2.ebuild 2871 MD5 f4dd818bb7fa4b774cd0716c15f8149b ndiswrapper-1.5.ebuild 2536 MD5 d7d611d0df86023d8db9a9c610a047b9 ndiswrapper-1.7.ebuild 2497 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDsqGOQiJ/wx066S4RAqbJAJ9rXaFAD1cYK7MgMdo/tSz2M7PQZwCfTn/O -NIxPEhRdrTUuDnB7quJzO1U= -=nGCh +iD8DBQFDva5UQiJ/wx066S4RAnUpAJ9kYVxGT6btieSVeJo/YaGiEkzZIQCeMJe1 +gdlwMqEwQVVjxg5nCN4G2UE= +=N00f -----END PGP SIGNATURE----- diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2-r1 new file mode 100644 index 000000000000..93befd80e381 --- /dev/null +++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2-r1 @@ -0,0 +1 @@ +MD5 5be0bbe524b68de03c1fc1b0b85b3b60 ndiswrapper-1.2.tar.gz 150068 diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.14.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.14.patch new file mode 100644 index 000000000000..8b7c01e00415 --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.14.patch @@ -0,0 +1,29 @@ +diff -uNr ndiswrapper-1.2/driver/ndis.h ndiswrapper-1.2.mod/driver/ndis.h +--- ndiswrapper-1.2/driver/ndis.h 2005-06-10 20:24:31.000000000 +0100 ++++ ndiswrapper-1.2.mod/driver/ndis.h 2005-10-01 16:20:12.000000000 +0100 +@@ -238,7 +238,7 @@ + void (*enable_interrupts)(void *ctx) STDCALL; + + /* Stop miniport */ +- void (*halt)(void *ctx) STDCALL; ++ void (*miniport_halt)(void *ctx) STDCALL; + + /* Interrupt BH */ + ndis_interrupt_handler handle_interrupt; +diff -uNr ndiswrapper-1.2/driver/wrapper.c ndiswrapper-1.2.mod/driver/wrapper.c +--- ndiswrapper-1.2/driver/wrapper.c 2005-06-10 20:24:31.000000000 +0100 ++++ ndiswrapper-1.2.mod/driver/wrapper.c 2005-10-01 16:19:43.000000000 +0100 +@@ -280,11 +280,11 @@ + void miniport_halt(struct wrapper_dev *wd) + { + struct miniport_char *miniport = &wd->driver->miniport; +- TRACEENTER1("driver halt is at %p", miniport->halt); ++ TRACEENTER1("driver halt is at %p", miniport->miniport_halt); + + miniport_set_int(wd, OID_PNP_SET_POWER, NdisDeviceStateD3); + +- LIN2WIN1(miniport->halt, wd->nmb->adapter_ctx); ++ LIN2WIN1(miniport->miniport_halt, wd->nmb->adapter_ctx); + + ndis_exit_device(wd); + misc_funcs_exit_device(wd); diff --git a/net-wireless/ndiswrapper/metadata.xml b/net-wireless/ndiswrapper/metadata.xml index 951bf0cb2145..eac4e21de814 100644 --- a/net-wireless/ndiswrapper/metadata.xml +++ b/net-wireless/ndiswrapper/metadata.xml @@ -2,9 +2,12 @@ mobile + + betelgeuse@gentoo.org + Until brad gets back + brad@gentoo.org - Actively maintained ndiswrapper provides a kernel module and utility for implementing the Windows(tm) NDIS API. This serves to provide drivers diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild new file mode 100644 index 000000000000..1b72a0f7101a --- /dev/null +++ b/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild,v 1.1 2006/01/05 23:39:50 betelgeuse Exp $ + +inherit eutils linux-mod + +DESCRIPTION="Wrapper for using Windows drivers for some wireless cards" +HOMEPAGE="http://ndiswrapper.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~x86 ~amd64" + +IUSE="debug" +DEPEND="sys-apps/pciutils" +RDEPEND="${DEPEND} + net-wireless/wireless-tools" + +CONFIG_CHECK="NET_RADIO" + +MODULE_NAMES="ndiswrapper(misc:${S}/driver)" +BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_MAJOR}${KV_MINOR}" +BUILD_TARGETS="all" +MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper") + +pkg_setup() { + einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml for a list of supported kernels." + echo "" + linux-mod_pkg_setup +} + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}"/${PN}-1.2-suspend2.patch || die "suspend2 patch failed" + epatch "${FILESDIR}"/${PN}-1.2-kernel-2.6.14.patch || die "2.6.14 patch failed" + + convert_to_m ${S}/driver/Makefile +} + +src_compile() { + # Enable verbose debugging information + use debug && export DEBUG=3 + + cd utils + emake || die "Compile of utils failed!" + + linux-mod_src_compile +} + +src_install() { + dosbin utils/ndiswrapper + dosbin utils/ndiswrapper-buginfo + + into / + dosbin utils/loadndisdriver + + dodoc README INSTALL AUTHORS ChangeLog + doman ndiswrapper.8 + + keepdir /etc/ndiswrapper + + linux-mod_src_install +} + +pkg_postinst() { + linux-mod_pkg_postinst + echo + einfo "ndiswrapper requires .inf and .sys files from a Windows(tm) driver" + einfo "to function. Download these to /root for example, then" + einfo "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them." + einfo "They will be copied to the proper location." + einfo "Once done, please run 'update-modules'." + echo + einfo "check http://ndiswrapper.sf.net/mediawiki/index.php/List for drivers" + I=$(lspci -n | egrep 'Class (0280|0200):' | cut -d' ' -f4) + einfo "Look for the following on that page for your driver:" + einfo "Possible Hardware: ${I}" + echo + einfo "Please have a look at http://ndiswrapper.sourceforge.net/wiki/" + einfo "for the FAQ, HowTos, Tips, Configuration, and installation" + einfo "information." + echo + ewarn "Attempting to automatically reinstall any Windows drivers" + ewarn "you might already have." + for driver in $(ls /etc/ndiswrapper) + do + einfo "Driver: ${driver}" + mv /etc/ndiswrapper/${driver} /tmp + ndiswrapper -i /tmp/${driver}/${driver}.inf + done +} diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild index 90153971a336..5c09b40032d7 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild,v 1.7 2005/08/26 06:10:53 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild,v 1.8 2006/01/05 23:39:50 betelgeuse Exp $ inherit linux-mod eutils @@ -23,6 +23,18 @@ BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_MAJOR}${KV_MINOR}" BUILD_TARGETS="all" MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper") +pkg_setup() { + linux-mod_pkg_setup + + if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -gt 13 ]]; then + eerror "" + eerror "This version does not work with kernel later than 2.6.13." + eerror "See http://bugs.gentoo.org/show_bug.cgi?id=111029 for more" + eerror "information." + die "This version does not work with the selected kernel." + fi +} + src_unpack() { unpack ${A} -- cgit v1.2.3-65-gdbad