[gentoo-commits] repo/gentoo:master commit in: profiles/, net-wireless/ndiswrapper/, net-wireless/ndiswrapper/files/

[Aaron Bauman]

commit:     9a53249a6325dc6e479f6d512d1a3cc96bdfab57
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 03:59:40 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 03:59:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a53249a

net-wireless/ndiswrapper: drop last-rited pkg

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-wireless/ndiswrapper/Manifest                  |   1 -
 .../files/ndiswrapper-1.59-cflags.patch            |  13 --
 .../files/ndiswrapper-1.61-kernel-4.11.patch       |  55 ------
 .../files/ndiswrapper-1.61-kernel-4.13.patch       |  27 ---
 .../files/ndiswrapper-1.61-kernel-4.15.patch       | 199 ---------------------
 net-wireless/ndiswrapper/metadata.xml              |  12 --
 net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild   | 105 -----------
 profiles/package.mask                              |   6 -
 8 files changed, 418 deletions(-)

diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
deleted file mode 100644
index f0cba5f9146..00000000000
--- a/net-wireless/ndiswrapper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ndiswrapper-1.61.tar.gz 202240 BLAKE2B 1b9b60bdd389bb04e56b4b2986503063c4193d78fb06e34f6c91f67d214b112f498cc8d0fdd08c372da73bde8cb9d10c893b05020d81bf35e144e64c81a24797 SHA512 67a50071a2e04113b91259e0d5236b4bf02b46a0d60ecae779c34e047f678c70b18e3191bad1435525c8499e554bd26794a03a79a71e1e603987432f4c590b43

diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch
deleted file mode 100644
index 25359c7c30c..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index 0e763c6..d555dda 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -6,7 +6,7 @@ HEADERS = $(DRIVER_DIR)/loader.h $(DRIVER_DIR)/ndiswrapper.h
- 
- CC = gcc
- HOSTCC = $(CC)
--CFLAGS = -g -Wall -I$(DRIVER_DIR)
-+CFLAGS += -I$(DRIVER_DIR)
- 
- DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo
- 

diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.11.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.11.patch
deleted file mode 100644
index f39c7bde4d2..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.11.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
-Author: Felix Yan <felixonmars@×××××××××.org>
-Date:   Tue May 16 01:32:56 2017 +0800
-
-    Add support for Linux 4.11+
-
-diff --git a/ndiswrapper/driver/ndis.c b/ndiswrapper/driver/ndis.c
-index c1913a05..2ab4dd21 100644
---- a/driver/ndis.c
-+++ b/driver/ndis.c
-@@ -2258,7 +2258,9 @@ wstdcall void NdisMIndicateReceivePacket(struct ndis_mp_block *nmb,
- 			WARNING("empty packet ignored");
- 			continue;
- 		}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- 		wnd->net_dev->last_rx = jiffies;
-+#endif
- 		/* get total number of bytes in packet */
- 		NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
- 						 &length, &total_length,
-@@ -2346,7 +2348,9 @@ wstdcall void EthRxIndicateHandler(struct ndis_mp_block *nmb, void *rx_ctx,
- 		ERROR("nmb is NULL");
- 		EXIT3(return);
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- 	wnd->net_dev->last_rx = jiffies;
-+#endif
- 
- 	if (look_ahead_size < packet_size) {
- 		struct ndis_packet *packet;
-@@ -2461,7 +2465,9 @@ wstdcall void NdisMTransferDataComplete(struct ndis_mp_block *nmb,
- 		WARNING("illegal packet");
- 		EXIT3(return);
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- 	wnd->net_dev->last_rx = jiffies;
-+#endif
- 	oob_data = NDIS_PACKET_OOB_DATA(packet);
- 	skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
- 		bytes_txed;
-diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
-index 3c4c6ff0..f1c52e51 100644
---- a/driver/ntoskernel.h
-+++ b/driver/ntoskernel.h
-@@ -296,6 +296,10 @@ static inline void (INIT_WORK)(struct work_struct *work, work_func_t func)
- #define add_taint(flag, lockdep_ok) add_taint(flag)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+#include <linux/sched/signal.h>
-+#endif
-+
- #include "winnt_types.h"
- #include "ndiswrapper.h"
- #include "pe_linker.h"

diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.13.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.13.patch
deleted file mode 100644
index 052c4d9b9bf..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit eeac7ab831b3097005dadc64dd323f54ade30323
-Author: Felix Yan <felixonmars@×××××××××.org>
-Date:   Mon Sep 11 12:52:36 2017 +0800
-
-    Add support for linux 4.13+
-
-diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
-index f1c52e51..1422bd4d 100644
---- a/driver/ntoskernel.h
-+++ b/driver/ntoskernel.h
-@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS];
-  */
- #include <asm/dma-mapping.h>
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
- #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)			\
- 	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,		\
- 			   GFP_KERNEL | __GFP_REPEAT)
-+#else
-+#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)			\
-+	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,		\
-+			   GFP_KERNEL | __GFP_RETRY_MAYFAIL)
-+#endif
-+
- #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle)		\
- 	dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
- #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction)		\

diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch
deleted file mode 100644
index 8e87ece0364..00000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From: Seth Forshee <seth.forshee@×××××××××.com>
-Date: Wed, 13 Dec 2017 15:53:31 -0600
-Subject: [PATCH] Build fixes for Linux 4.15
-
-Fixes two build issues for 4.15:
-
- - init_timer() was eliminated in 4.15, and all callers were
-   converted to using timer_setup(). The callback prototype has
-   also changed to pass a timer_list argument instead of callback
-   data, and from_timer() must be used to get to the object in
-   which the timer is embedded.
-
- - usb_get_status() was changed to take an additional argument,
-   and usb_get_std_status() was added as a wrapper for callers to
-   use as a replacment. Call the wrapper in 4.15 and later.
-
-LP: #1737749
----
- driver/ntoskernel.c | 19 ++++++++++++++++++-
- driver/usb.c        | 10 ++++++++--
- driver/wrapndis.c   | 28 ++++++++++++++++++++++++++++
- 3 files changed, 54 insertions(+), 3 deletions(-)
-
-diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c
-index 4fe0dc1..156c688 100644
---- a/driver/ntoskernel.c
-+++ b/driver/ntoskernel.c
-@@ -77,7 +77,6 @@ u64 wrap_ticks_to_boot;
- #if defined(CONFIG_X86_64)
- static struct timer_list shared_data_timer;
- struct kuser_shared_data kuser_shared_data;
--static void update_user_shared_data_proc(unsigned long data);
- #endif
- 
- WIN_SYMBOL_MAP("KeTickCount", &jiffies)
-@@ -91,7 +90,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info);
- #endif
- 
- #if defined(CONFIG_X86_64)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void update_user_shared_data_proc(unsigned long data)
-+#else
-+static void update_user_shared_data_proc(struct timer_list *t)
-+#endif
- {
- 	/* timer is supposed to be scheduled every 10ms, but bigger
- 	 * intervals seem to work (tried up to 50ms) */
-@@ -407,9 +410,15 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type,
- 	InitializeListHead(&dh->wait_blocks);
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void timer_proc(unsigned long data)
- {
- 	struct wrap_timer *wrap_timer = (struct wrap_timer *)data;
-+#else
-+static void timer_proc(struct timer_list *t)
-+{
-+	struct wrap_timer *wrap_timer = from_timer(wrap_timer, t, timer);
-+#endif
- 	struct nt_timer *nt_timer;
- 	struct kdpc *kdpc;
- 
-@@ -452,9 +461,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type,
- 		return;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	init_timer(&wrap_timer->timer);
- 	wrap_timer->timer.data = (unsigned long)wrap_timer;
- 	wrap_timer->timer.function = timer_proc;
-+#else
-+	timer_setup(&wrap_timer->timer, timer_proc, 0);
-+#endif
- 	wrap_timer->nt_timer = nt_timer;
- #ifdef TIMER_DEBUG
- 	wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC;
-@@ -2559,9 +2572,13 @@ int ntoskernel_init(void)
- #if defined(CONFIG_X86_64)
- 	memset(&kuser_shared_data, 0, sizeof(kuser_shared_data));
- 	*((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	init_timer(&shared_data_timer);
- 	shared_data_timer.function = update_user_shared_data_proc;
- 	shared_data_timer.data = 0;
-+#else
-+	timer_setup(&shared_data_timer, update_user_shared_data_proc, 0);
-+#endif
- #endif
- 	return 0;
- }
-diff --git a/driver/usb.c b/driver/usb.c
-index 3e7021a..e55c2c6 100644
---- a/driver/usb.c
-+++ b/driver/usb.c
-@@ -750,6 +750,12 @@ static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev,
- 	USBEXIT(return NT_URB_STATUS(nt_urb));
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
-+#define wrap_usb_get_status usb_get_status
-+#else
-+#define wrap_usb_get_status usb_get_std_status
-+#endif
-+
- static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
- 					   struct irp *irp)
- {
-@@ -776,8 +782,8 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
- 		return NT_URB_STATUS(nt_urb);
- 	}
- 	assert(status_req->transfer_buffer_length == sizeof(u16));
--	ret = usb_get_status(udev, type, status_req->index,
--			     status_req->transfer_buffer);
-+	ret = wrap_usb_get_status(udev, type, status_req->index,
-+				  status_req->transfer_buffer);
- 	if (ret >= 0) {
- 		assert(ret <= status_req->transfer_buffer_length);
- 		status_req->transfer_buffer_length = ret;
-diff --git a/driver/wrapndis.c b/driver/wrapndis.c
-index 870e4c2..f653440 100644
---- a/driver/wrapndis.c
-+++ b/driver/wrapndis.c
-@@ -1093,9 +1093,15 @@ send_assoc_event:
- 	EXIT2(return);
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void iw_stats_timer_proc(unsigned long data)
- {
- 	struct ndis_device *wnd = (struct ndis_device *)data;
-+#else
-+static void iw_stats_timer_proc(struct timer_list *t)
-+{
-+	struct ndis_device *wnd = from_timer(wnd, t, iw_stats_timer);
-+#endif
- 
- 	ENTER2("%d", wnd->iw_stats_interval);
- 	if (wnd->iw_stats_interval > 0) {
-@@ -1111,8 +1117,12 @@ static void add_iw_stats_timer(struct ndis_device *wnd)
- 		return;
- 	if (wnd->iw_stats_interval < 0)
- 		wnd->iw_stats_interval *= -1;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	wnd->iw_stats_timer.data = (unsigned long)wnd;
- 	wnd->iw_stats_timer.function = iw_stats_timer_proc;
-+#else
-+	timer_setup(&wnd->iw_stats_timer, iw_stats_timer_proc, 0);
-+#endif
- 	mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval);
- }
- 
-@@ -1124,9 +1134,15 @@ static void del_iw_stats_timer(struct ndis_device *wnd)
- 	EXIT2(return);
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void hangcheck_proc(unsigned long data)
- {
- 	struct ndis_device *wnd = (struct ndis_device *)data;
-+#else
-+static void hangcheck_proc(struct timer_list *t)
-+{
-+	struct ndis_device *wnd = from_timer(wnd, t, hangcheck_timer);
-+#endif
- 
- 	ENTER3("%d", wnd->hangcheck_interval);
- 	if (wnd->hangcheck_interval > 0) {
-@@ -1147,8 +1163,12 @@ void hangcheck_add(struct ndis_device *wnd)
- 		wnd->hangcheck_interval = hangcheck_interval * HZ;
- 	if (wnd->hangcheck_interval < 0)
- 		wnd->hangcheck_interval *= -1;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	wnd->hangcheck_timer.data = (unsigned long)wnd;
- 	wnd->hangcheck_timer.function = hangcheck_proc;
-+#else
-+	timer_setup(&wnd->hangcheck_timer, hangcheck_proc, 0);
-+#endif
- 	mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval);
- 	EXIT2(return);
- }
-@@ -2138,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj,
- 	wnd->dma_map_count = 0;
- 	wnd->dma_map_addr = NULL;
- 	wnd->nick[0] = 0;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	init_timer(&wnd->hangcheck_timer);
-+#else
-+	timer_setup(&wnd->hangcheck_timer, NULL, 0);
-+#endif
- 	wnd->scan_timestamp = 0;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	init_timer(&wnd->iw_stats_timer);
-+#else
-+	timer_setup(&wnd->iw_stats_timer, NULL, 0);
-+#endif
- 	wnd->iw_stats_interval = 10 * HZ;
- 	wnd->ndis_pending_work = 0;
- 	memset(&wnd->essid, 0, sizeof(wnd->essid));

diff --git a/net-wireless/ndiswrapper/metadata.xml b/net-wireless/ndiswrapper/metadata.xml
deleted file mode 100644
index 446cae60518..00000000000
--- a/net-wireless/ndiswrapper/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">ndiswrapper provides a kernel module and utility for
-		implementing the Windows(tm) NDIS API. This serves to provide drivers
-		for wireless cards that have no native support.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ndiswrapper</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild
deleted file mode 100644
index b815a61fcb1..00000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-mod readme.gentoo-r1 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
-"
-
-DOC_CONTENTS="
-	NDISwrapper requires .inf and .sys files from a Windows(tm) driver
-	to function. Download these to /root for example, then
-	run 'ndiswrapper -i /root/foo.inf'. After that you can delete them.
-	They will be copied to /etc/ndiswrapper/. Once done, please run 'update-modules'.
-	Please look at http://ndiswrapper.sourceforge.net/for the FAQ, HowTos, tips,
-	configuration, and installation information.
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.59-cflags.patch
-	"${FILESDIR}"/${PN}-1.61-kernel-4.11.patch
-	"${FILESDIR}"/${PN}-1.61-kernel-4.13.patch
-	"${FILESDIR}"/${PN}-1.61-kernel-4.15.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() {
-	einstalldocs
-	doman ndiswrapper.8
-
-	keepdir /etc/ndiswrapper
-
-	linux-mod_src_install
-
-	cd utils
-	emake DESTDIR="${D}" install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	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
-
-	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
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 0c4b9b07341..a1baa7bbc6e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -706,12 +706,6 @@ sci-astronomy/casacore
 # Removal in 30 days.  Bug #602024.
 app-laptop/nvidiabl
 
-# Michał Górny <mgorny@g.o> (2019-12-05)
-# Unmaintained since 2016.  Last touched in 2018.  Pending bump since
-# Feb 2019.  Does not build anymore.
-# Removal in 30 days.  Bug #695580.
-net-wireless/ndiswrapper
-
 # Michał Górny <mgorny@g.o> (2019-12-01)
 # Added in 2013 and not updated since.  Unmaintained upstream since
 # inception.  Never had any keywords.