Version bump. Upstream notes: Removed debug flag in ndiswrapper script. When HIGHMEM is enabled, allocate and copy URB buffers only if necessary. This prevents memory allocation failures.

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 129 insertions, 8 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index dfc50f64f1c5..b4ef4d1e663b 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.56 2006/10/14 11:22:37 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.57 2006/10/20 19:22:17 betelgeuse Exp $
+
+*ndiswrapper-1.26 (20 Oct 2006)
+
+  20 Oct 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +ndiswrapper-1.26.ebuild:
+  Version bump. Upstream notes: Removed debug flag in ndiswrapper script. When
+  HIGHMEM is enabled, allocate and copy URB buffers only if necessary. This
+  prevents memory allocation failures.
 
 *ndiswrapper-1.25 (14 Oct 2006)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index a7e05730f14b..463049b5a939 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -24,6 +24,7 @@ DIST ndiswrapper-1.2.tar.gz 150068 RMD160 6033e2fd920fb321d8656aaa9e2f81d4eb355d
 DIST ndiswrapper-1.21.tar.gz 186284 RMD160 54f955cb512220ebc70c7014cac9e7a4cf7d97e2 SHA1 d6696da51307a51ce5eea5bc481182f4b013357e SHA256 5bc1eafc91b831ed478ec5415069cdbb710b36bb36be61fba969b937dc72724b
 DIST ndiswrapper-1.23.tar.gz 187328 RMD160 6a464ba54a54704c67776e6ab1ed17212f37633c SHA1 b9768b78cfc4b44fdc2ab912bffecdebb6f03d7e SHA256 58f462f0b922877fbe1287f8e2de12c8fb59b5264e9bf07a11121a712ec02100
 DIST ndiswrapper-1.25.tar.gz 186162 RMD160 1c76d9121b53c899b6b0567528aa7cd04565840a SHA1 9e5bde5ea27b1a605661bf6a9f4a09ad975c0045 SHA256 97c9306beeadca0f836f470a27f7b4241304e4db7bf370e550112645fd73ca6a
+DIST ndiswrapper-1.26.tar.gz 186384 RMD160 dfa48ab65cfb5f86be0565997dc0982c65bab1eb SHA1 b07cd84f2f9fc0d9dada4eac14d1f1565a5dfaf1 SHA256 73a052d6edb38343b39628dae8ac6e77e61f0bf0ce82da1dee4f8b8ebd6f2ec4
 EBUILD ndiswrapper-1.15.ebuild 2719 RMD160 38cf63d9c077e162e4c407c1ea26d7fd4d96f76a SHA1 6c37078171e6ef4791ee12aa7e963130e38ae139 SHA256 473c60389714181fa80f14c501eae9f93486a29415e73b0107ec8999eb527afb
 MD5 709f755145d7a5b91f7bbf7a0c3fca35 ndiswrapper-1.15.ebuild 2719
 RMD160 38cf63d9c077e162e4c407c1ea26d7fd4d96f76a ndiswrapper-1.15.ebuild 2719
@@ -52,10 +53,14 @@ EBUILD ndiswrapper-1.25.ebuild 2842 RMD160 017b3d35b98ec17032a62db80c49f6b576606
 MD5 76375692d3ae51efe5934ee7f23f8860 ndiswrapper-1.25.ebuild 2842
 RMD160 017b3d35b98ec17032a62db80c49f6b5766068cd ndiswrapper-1.25.ebuild 2842
 SHA256 b362d73f04103dbc1004328ba946113a17967e38d3c8b1b10eb7f2536e4b9341 ndiswrapper-1.25.ebuild 2842
-MISC ChangeLog 10312 RMD160 68c55db6334192eb2e2770d52b0c1fd8755fab06 SHA1 3eb07131b48066407f699815e671f537c5c3e080 SHA256 3770949bd4ce83bf95ca148294ab13ef7315fac3c5acddaf5ab46affde1d8212
-MD5 ae26cf8e52e9e7dfce3e0e78b5a5fdf3 ChangeLog 10312
-RMD160 68c55db6334192eb2e2770d52b0c1fd8755fab06 ChangeLog 10312
-SHA256 3770949bd4ce83bf95ca148294ab13ef7315fac3c5acddaf5ab46affde1d8212 ChangeLog 10312
+EBUILD ndiswrapper-1.26.ebuild 2842 RMD160 905965c965e498ca21a8b4f2e09cf4e348cbbaed SHA1 32d4491a590cbe2eb569cc6b7f6329c4e87857ae SHA256 002df0d4beb49f5e4bd4978acc9877215febb513c03749a9e2fd1870448b5e88
+MD5 0912c44885cadc9512a526c7d4b297d0 ndiswrapper-1.26.ebuild 2842
+RMD160 905965c965e498ca21a8b4f2e09cf4e348cbbaed ndiswrapper-1.26.ebuild 2842
+SHA256 002df0d4beb49f5e4bd4978acc9877215febb513c03749a9e2fd1870448b5e88 ndiswrapper-1.26.ebuild 2842
+MISC ChangeLog 10621 RMD160 836b6350a8711b156bcd0ace17854b9da4d41339 SHA1 71746d8c1bb3742e0f5864047f731e06019ab297 SHA256 ed25e57bac9ee1043275b309a080ecec5fc4d14045ad4adfc59f6a9836f8217d
+MD5 2c3a385ac3016056243979c3cc263786 ChangeLog 10621
+RMD160 836b6350a8711b156bcd0ace17854b9da4d41339 ChangeLog 10621
+SHA256 ed25e57bac9ee1043275b309a080ecec5fc4d14045ad4adfc59f6a9836f8217d ChangeLog 10621
 MISC metadata.xml 482 RMD160 b64882f39a4d4c1b18b9b3bd2904481b0bc6bdb7 SHA1 260dcc38719e0d1b4ebac24239fbf87783ade890 SHA256 332e0194949866b5f48faa89b6977281a072172929267096bfb041a3ee9319d2
 MD5 46eeebae86797a07152cdc6044ed2cfe metadata.xml 482
 RMD160 b64882f39a4d4c1b18b9b3bd2904481b0bc6bdb7 metadata.xml 482
@@ -81,10 +86,13 @@ SHA256 74970cbdb8c3cb86a241abdcccbf7d4a6bc2df997bc6035d07000c6d08e6dcbd files/di
 MD5 e652b0df938492e51cf167003ba8f54b files/digest-ndiswrapper-1.25 250
 RMD160 3f4914cf7777545410c7a0bad8f18a10b9214cc5 files/digest-ndiswrapper-1.25 250
 SHA256 8c11100749010b08384b2d08477bd91c5702726a24e40c5ee5a997d8d3f654ca files/digest-ndiswrapper-1.25 250
+MD5 ad9884a4f5d815219f6989c16c945c55 files/digest-ndiswrapper-1.26 250
+RMD160 1bc0630164921a915e36e1b86042503ec8afcfce files/digest-ndiswrapper-1.26 250
+SHA256 52709f0ab36bfb179b77ddaa389b91633a8788bdc017519d06c567b6549f2075 files/digest-ndiswrapper-1.26 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMMiGcxLzpIGCsLQRAuvrAJ4obse7n5HZ9txa3ch89SRNC2iE4gCglz6D
-lEq0BEGZl12caxbWVMw5+cw=
-=BXED
+iD8DBQFFOSH0cxLzpIGCsLQRAnqDAJ9QHEN+Ug7bgLklJYOkPRU7OfhSiwCfVApd
+OS5XKj+ADN5Avs08YDZ67cg=
+=vbzw
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.26 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.26
new file mode 100644
index 000000000000..0bb03ea73cfb
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.26
@@ -0,0 +1,3 @@
+MD5 f3d11981dd8509870790a08d643613bf ndiswrapper-1.26.tar.gz 186384
+RMD160 dfa48ab65cfb5f86be0565997dc0982c65bab1eb ndiswrapper-1.26.tar.gz 186384
+SHA256 73a052d6edb38343b39628dae8ac6e77e61f0bf0ce82da1dee4f8b8ebd6f2ec4 ndiswrapper-1.26.tar.gz 186384
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.26.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.26.ebuild
new file mode 100644
index 000000000000..ac9c3700f376
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.26.ebuild
@@ -0,0 +1,102 @@
+# 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.26.ebuild,v 1.1 2006/10/20 19:22:17 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 usb"
+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_FULL}"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+ERROR_USB="You need to enable USB support in your kernel
+to use usb support in ndiswrapper."
+
+pkg_setup() {
+	einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml for a list of supported kernels."
+	echo  ""
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2-suspend2.patch
+
+	convert_to_m ${S}/driver/Makefile
+}
+
+src_compile() {
+	local params
+
+	# Enable verbose debugging information
+	if use debug; then
+		params="DEBUG=3"
+		use usb && params="${params} USB_DEBUG=1"
+	fi
+
+	cd utils
+	emake || die "Compile of utils failed!"
+
+	use usb || params="DISABLE_USB=1"
+
+	BUILD_PARAMS="${BUILD_PARAMS} ${params}" linux-mod_src_compile
+}
+
+src_install() {
+	dodoc README INSTALL AUTHORS ChangeLog
+	doman ndiswrapper.8
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+
+	cd utils
+	make DESTDIR="${D}" 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 'modules-update'."
+	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 "Windows driver configuration file format has changed since 1.5."
+#	ewarn "You must re-install Windows drivers if they were installed before."
+
+	einfo "Attempting to automatically reinstall any Windows drivers"
+	einfo "you might already have."
+	for driver in $(ls /etc/ndiswrapper)
+	do
+		einfo "Driver: ${driver}"
+		mv /etc/ndiswrapper/${driver} ${T}
+		ndiswrapper -i ${T}/${driver}/${driver}.inf
+	done
+}