commit: 5d1dc93e3ebc3232414c9601811718b12f6203de
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 12:51:02 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 12:51:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1dc93e
net-wireless/ndiswrapper: remove 1.59
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-wireless/ndiswrapper/Manifest | 1 -
.../ndiswrapper/files/ndiswrapper-1.59-3.14.patch | 48 ---------
.../ndiswrapper/files/ndiswrapper-1.59-4.0.patch | 41 --------
.../ndiswrapper/files/ndiswrapper-1.59-4.2.patch | 22 -----
net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild | 108 ---------------------
5 files changed, 220 deletions(-)
diff --git a/net-wireless/ndiswrapper/Manifest
b/net-wireless/ndiswrapper/Manifest
index 6cbfeb5beec..2c5cd23198a 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,2 +1 @@
-DIST ndiswrapper-1.59.tar.gz 201257 SHA256
66a5d3ffb3fc8a63d87e381bbc627511597dfd25c4c37dda3b953ccf98f5d4bc SHA512
dd1d486b6178185e813217e4fff38f6ea6b21f8a3544c5cc25be9edbca60f34b21656e5d46b9d02cb1e43c8cc82856283aaa428964b8f85cb07146a41e40e44d
WHIRLPOOL
ae4dca59911625146de4e2da02b72bcf1b695e63c8d0d900a91ec9b0c5b7452c9ba0de37ad95129d330d96be16d9c4b488b5d40936f51af14dca2597281b7b84
DIST ndiswrapper-1.61.tar.gz 202240 SHA256
2ac1847c24cbfa4f48a800b04c9721219614f1663a4ac94af3c7939b45c47584 SHA512
67a50071a2e04113b91259e0d5236b4bf02b46a0d60ecae779c34e047f678c70b18e3191bad1435525c8499e554bd26794a03a79a71e1e603987432f4c590b43
WHIRLPOOL
39b2cae9eab28147a5e7103f1b4b2fa44618afe4d1bbdd6f8108180b867ec319f4f2a3f4dc7b1e141f51e39765dccb9c3476537ed4158d38f7ff9eda3ffd2bea
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch
b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch
deleted file mode 100644
index 9a696f8817f..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: driver/crt.c
-===================================================================
---- driver/crt.c (revision 3197)
-+++ driver/crt.c (working copy)
-@@ -467,7 +467,7 @@
- noregparm void WIN_FUNC(_win_srand,1)
- (UINT seed)
- {
-- net_srandom(seed);
-+ prandom_seed(seed);
- }
-
- noregparm int WIN_FUNC(rand,0)
-Index: driver/ntoskernel.h
-===================================================================
---- driver/ntoskernel.h (revision 3197)
-+++ driver/ntoskernel.h (working copy)
-@@ -347,7 +347,7 @@
- #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
- #endif
-
--#ifdef INIT_COMPLETION
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
- static inline void reinit_completion(struct completion *x)
- {
- INIT_COMPLETION(*x);
-@@ -354,6 +354,10 @@
- }
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-+#define prandom_seed(seed) net_srandom(seed)
-+#endif
-+
- /* TICK is 100ns */
- #define TICKSPERSEC 10000000
- #define TICKSPERMSEC 10000
-@@ -797,9 +801,8 @@
- #define nt_spin_unlock_irqrestore(lock, flags)
\
- do { \
- nt_spin_unlock(lock); \
-- preempt_enable_no_resched(); \
-+ preempt_enable(); \
- local_irq_restore(flags); \
-- preempt_check_resched(); \
- } while (0)
-
- static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.0.patch
b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.0.patch
deleted file mode 100644
index 97ef75d3ed0..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Julian Andres Klode <[email protected]>
-Date: Tue, 12 May 2015 17:11:11 +0200
-Subject: Support kernel 4.0
-
----
- driver/ndis.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/driver/ndis.c b/driver/ndis.c
-index 9ace34b..fafd2e7 100644
---- a/driver/ndis.c
-+++ b/driver/ndis.c
-@@ -25,6 +25,10 @@
- #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE
- #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-+#define strncasecmp strnicmp
-+#endif
-+
- static struct work_struct ndis_work;
- static struct nt_list ndis_work_list;
- static spinlock_t ndis_work_list_lock;
-@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char
*keyname, int length,
- struct wrap_device_setting *setting;
- mutex_lock(&loader_mutex);
- nt_list_for_each_entry(setting, setting_list, list) {
-- if (strnicmp(keyname, setting->name, length) == 0) {
-+ if (strncasecmp(keyname, setting->name, length) == 0) {
- TRACE2("setting %s='%s'", keyname, setting->value);
- mutex_unlock(&loader_mutex);
- *param = ndis_encode_setting(setting, type);
-@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4)
-
- mutex_lock(&loader_mutex);
- nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
-- if (strnicmp(keyname, setting->name, ansi.length) == 0) {
-+ if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
- mutex_unlock(&loader_mutex);
- if (ndis_decode_setting(setting, param))
- *status = NDIS_STATUS_FAILURE;
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.2.patch
b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.2.patch
deleted file mode 100644
index f29f9deba33..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-4.2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Tim Gardner <[email protected]>
-Date: Thu, 6 Aug 2015 09:13:30 -0600
-Subject: Support kernel 4.2
-
----
- driver/ntoskernel.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/driver/ntoskernel.h b/driver/ntoskernel.h
-index 4b8166c..6b49594 100644
---- a/driver/ntoskernel.h
-+++ b/driver/ntoskernel.h
-@@ -46,6 +46,9 @@
- #include <linux/percpu.h>
- #include <linux/kthread.h>
- #include <linux/workqueue.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
-+#include <linux/vmalloc.h>
-+#endif
-
- #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
- #error "this module is for x86 or x86_64 architectures only"
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
b/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
deleted file mode 100644
index 9e2146a55f3..00000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit base linux-mod toolchain-funcs
-
-DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
-HOMEPAGE="http://ndiswrapper.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug usb"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND="${DEPEND}
- net-wireless/wireless-tools"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch
- "${FILESDIR}"/${P}-3.14.patch
- "${FILESDIR}"/${P}-4.0.patch
- "${FILESDIR}"/${P}-4.2.patch )
-MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
-BUILD_TARGETS="all"
-MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
-
-pkg_pretend() {
- CONFIG_CHECK="~WEXT_PRIV"
- use usb && CONFIG_CHECK="${CONFIG_CHECK} ~USB"
- ERROR_USB="You need to enable USB support in your kernel to use usb
support in ndiswrapper."
- ERROR_WEXT_PRIV="Your kernel does not support WEXT_PRIV. To enable it
you need to enable a wireless driver that enables it, for example PRISM54 or
IPW2200"
- linux-mod_pkg_setup
-}
-
-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 CC=$(tc-getCC)
-
- use usb || params="${params} DISABLE_USB=1"
-
- BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD='${KV_OUT_DIR}'
${params}"
- linux-mod_src_compile
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog INSTALL README
- doman ndiswrapper.8
-
- keepdir /etc/ndiswrapper
-
- linux-mod_src_install
-
- cd utils
- emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- echo
- elog "NDISwrapper requires .inf and .sys files from a Windows(tm)
driver"
- elog "to function. Download these to /root for example, then"
- elog "run 'ndiswrapper -i /root/foo.inf'. After that you can delete
them."
- elog "They will be copied to /etc/ndiswrapper/."
- elog "Once done, please run 'update-modules'."
- echo
-
- elog "Please look at ${HOMEPAGE}"
- elog "for the FAQ, HowTos, tips, configuration, and installation"
- elog "information."
- echo
-
- for i in $(lspci -n | egrep '(0280|0200):' | cut -d' ' -f1)
- do
- i_desc=$(lspci -nn | grep "$i" | awk -F': ' '{print $2}' | awk
-F'[' '{print $1}')
- if [[ -n "${i_desc}" ]] ; then
- elog "Possible hardware: ${i_desc}"
- fi
- done
-
- echo
- elog "NDISwrapper devs need support (_hardware_, cash)."
- elog "Don't hesitate if you can help."
- elog "See ${HOMEPAGE} for details."
- echo
-
- if [[ ${ROOT} == "/" ]]; then
-
- einfo "Attempting to automatically reinstall any Windows
drivers"
- einfo "you might already have."
- echo
-
- local driver
- for driver in $(ls /etc/ndiswrapper) ; do
- einfo "Driver: ${driver}"
- mv "/etc/ndiswrapper/${driver}" "${T}"
- ndiswrapper -i "${T}/${driver}/${driver}.inf"
- done
- fi
-}
