From e47760ec013a9e1eca59c0c3a1e9388d6f938bca Mon Sep 17 00:00:00 2001 From: Niels Horn Date: Mon, 20 Feb 2012 09:57:52 -0200 Subject: network/ndiswrapper: Removed (split in ndiswrapper-kernel & -utils) Signed-off-by: Niels Horn --- network/ndiswrapper/README | 14 --- network/ndiswrapper/doinst.sh | 2 - network/ndiswrapper/ndiswrapper.SlackBuild | 106 --------------------- network/ndiswrapper/ndiswrapper.info | 10 -- .../patches/ndiswrapper-1.56-2.6.35.patch | 90 ----------------- .../patches/ndiswrapper-1.56-2.6.36.patch | 29 ------ .../patches/ndiswrapper-1.56-2.6.38.patch | 24 ----- network/ndiswrapper/slack-desc | 19 ---- 8 files changed, 294 deletions(-) delete mode 100644 network/ndiswrapper/README delete mode 100644 network/ndiswrapper/doinst.sh delete mode 100644 network/ndiswrapper/ndiswrapper.SlackBuild delete mode 100644 network/ndiswrapper/ndiswrapper.info delete mode 100644 network/ndiswrapper/patches/ndiswrapper-1.56-2.6.35.patch delete mode 100644 network/ndiswrapper/patches/ndiswrapper-1.56-2.6.36.patch delete mode 100644 network/ndiswrapper/patches/ndiswrapper-1.56-2.6.38.patch delete mode 100644 network/ndiswrapper/slack-desc (limited to 'network') diff --git a/network/ndiswrapper/README b/network/ndiswrapper/README deleted file mode 100644 index 5bfa035d43..0000000000 --- a/network/ndiswrapper/README +++ /dev/null @@ -1,14 +0,0 @@ -ndiswrapper - wrapper for NDIS drivers - -Some vendors do not release specifications of the hardware or -providea linux driver for their wireless network cards. This -project provides a linux kernel module that loads and runs NDIS -(Windows network driver API) drivers supplied by the vendors. - -Be sure to read the INSTALL file in the package's documentation -directory for instructions on configuring your wireless card. - -If you'd like to build the module for a kernel that isn't currently -running on the system, you should be able to pass that kernel's -"uname -r" output on the command line as the value of KERNEL, as in: - KERNEL=2.6.33.5 ./ndiswrapper.SlackBuild diff --git a/network/ndiswrapper/doinst.sh b/network/ndiswrapper/doinst.sh deleted file mode 100644 index 2d24f838c4..0000000000 --- a/network/ndiswrapper/doinst.sh +++ /dev/null @@ -1,2 +0,0 @@ -chroot . /sbin/depmod -a @VERSION@ - diff --git a/network/ndiswrapper/ndiswrapper.SlackBuild b/network/ndiswrapper/ndiswrapper.SlackBuild deleted file mode 100644 index 006ce7c8e6..0000000000 --- a/network/ndiswrapper/ndiswrapper.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for ndiswrapper - -# Copyright 2007 Martin Lefebvre -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Maintained by Robby Workman now - -PRGNAM=ndiswrapper -VERSION=${VERSION:-1.56} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -KERNEL=${KERNEL:-$(uname -r)} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Thanks to Gentoo for the patchset -for i in $CWD/patches/*.patch; do patch -p1 < $i ; done - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -make KVERS=$KERNEL -make install KVERS=$KERNEL DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -# Clean up a few things -rm $PKG/lib/modules/*/modules.* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS ChangeLog INSTALL README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -sed "s%@VERSION@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n \ - $OUTPUT/$PRGNAM-${VERSION}_$(echo $KERNEL | tr - _)-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/ndiswrapper/ndiswrapper.info b/network/ndiswrapper/ndiswrapper.info deleted file mode 100644 index 4969e0b101..0000000000 --- a/network/ndiswrapper/ndiswrapper.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ndiswrapper" -VERSION="1.56" -HOMEPAGE="http://sourceforge.net/projects/ndiswrapper/" -DOWNLOAD="http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.56.tar.gz" -MD5SUM="1431f7ed5f8e92e752d330bbb3aed333" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -MAINTAINER="Robby Workman" -EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" diff --git a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.35.patch b/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.35.patch deleted file mode 100644 index dc99ce2a2b..0000000000 --- a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.35.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: a/driver/wrapndis.c -=================================================================== ---- a/driver/wrapndis.c (revision 2723) -+++ a/driver/wrapndis.c (working copy) -@@ -950,20 +950,34 @@ static void set_multicast_list(struct nd - packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS | - NDIS_PACKET_TYPE_ALL_LOCAL; - } else if (net_dev->flags & IFF_ALLMULTI || -- net_dev->mc_count > wnd->multicast_size) { -+ netdev_mc_count(net_dev) > wnd->multicast_size) { - packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST; - TRACE2("0x%08x", packet_filter); -- } else if (net_dev->mc_count > 0) { -+ } else if (netdev_mc_count(net_dev) > 0) { - int i, size; - char *buf; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) -+ struct netdev_hw_addr *ha; -+#else - struct dev_mc_list *mclist; -- size = min(wnd->multicast_size, net_dev->mc_count); -- TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count); -+#endif -+ size = min(wnd->multicast_size, netdev_mc_count(net_dev)); -+ TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev)); - buf = kmalloc(size * ETH_ALEN, GFP_KERNEL); - if (!buf) { - WARNING("couldn't allocate memory"); - EXIT2(return); - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) -+ i = 0; -+ netdev_for_each_mc_addr(ha, net_dev) { -+ if (i >= size) -+ break; -+ memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN); -+ TRACE2(MACSTRSEP, MAC2STR(ha->addr)); -+ i++; -+ } -+#else - mclist = net_dev->mc_list; - for (i = 0; i < size && mclist; mclist = mclist->next) { - if (mclist->dmi_addrlen != ETH_ALEN) -@@ -972,6 +986,7 @@ static void set_multicast_list(struct nd - TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr)); - i++; - } -+#endif - res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN); - if (res == NDIS_STATUS_SUCCESS && i > 0) - packet_filter |= NDIS_PACKET_TYPE_MULTICAST; -Index: a/driver/usb.c -=================================================================== ---- a/driver/usb.c (revision 2723) -+++ a/driver/usb.c (working copy) -@@ -191,7 +191,7 @@ static void wrap_free_urb(struct urb *ur - if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) { - USBTRACE("freeing DMA buffer for URB: %p %p", - urb, urb->transfer_buffer); -- usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev, -+ usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev, - urb->transfer_buffer_length, - urb->transfer_buffer, urb->transfer_dma); - } -@@ -304,7 +304,7 @@ static struct urb *wrap_alloc_urb(struct - #endif - )) { - urb->transfer_buffer = -- usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags, -+ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags, - &urb->transfer_dma); - if (!urb->transfer_buffer) { - WARNING("couldn't allocate dma buf"); -Index: a/driver/ntoskernel.h -=================================================================== ---- a/driver/ntoskernel.h (revision 2723) -+++ a/driver/ntoskernel.h (working copy) -@@ -324,6 +324,12 @@ typedef u32 pm_message_t; - kmem_cache_create(name, size, align, flags, NULL) - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) -+#define netdev_mc_count(dev) ((dev)->mc_count) -+#define usb_alloc_coherent(dev, size, mem_flags, dma) (usb_buffer_alloc((dev), (size), (mem_flags), (dma))) -+#define usb_free_coherent(dev, size, addr, dma) (usb_buffer_free((dev), (size), (addr), (dma))) -+#endif -+ - #include "winnt_types.h" - #include "ndiswrapper.h" - #include "pe_linker.h" diff --git a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.36.patch b/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.36.patch deleted file mode 100644 index f3ca705d4a..0000000000 --- a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.36.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ndiswrapper/driver/loader.c 2010/09/13 08:35:26 2725 -+++ ndiswrapper/driver/loader.c 2010/09/13 08:43:15 2726 -@@ -750,8 +750,13 @@ - } - - /* called with loader_mutex is down */ -+#ifdef HAVE_UNLOCKED_IOCTL -+static long wrapper_ioctl(struct file *file, -+ unsigned int cmd, unsigned long arg) -+#else - static int wrapper_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) -+#endif - { - struct load_driver *load_driver; - struct load_device load_device; -@@ -831,7 +836,12 @@ - - static struct file_operations wrapper_fops = { - .owner = THIS_MODULE, -+ -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = wrapper_ioctl, -+#else - .ioctl = wrapper_ioctl, -+#endif - .release = wrapper_ioctl_release, - }; - diff --git a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.38.patch b/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.38.patch deleted file mode 100644 index 68af95e50d..0000000000 --- a/network/ndiswrapper/patches/ndiswrapper-1.56-2.6.38.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ndiswrapper/driver/wrapndis.c 2010/09/13 09:36:56 2728 -+++ ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729 -@@ -13,16 +13,16 @@ - * - */ - --#include "ndis.h" --#include "iw_ndis.h" --#include "pnp.h" --#include "loader.h" --#include "wrapndis.h" - #include - #include - #include - #include - #include -+#include "ndis.h" -+#include "iw_ndis.h" -+#include "pnp.h" -+#include "loader.h" -+#include "wrapndis.h" - #include "wrapper.h" - - /* Functions callable from the NDIS driver */ diff --git a/network/ndiswrapper/slack-desc b/network/ndiswrapper/slack-desc deleted file mode 100644 index 23f72916fd..0000000000 --- a/network/ndiswrapper/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -ndiswrapper: ndiswrapper (wrapper for NDIS drivers) -ndiswrapper: -ndiswrapper: Some vendors do not release specifications of the hardware or -ndiswrapper: providea linux driver for their wireless network cards. This -ndiswrapper: project provides a linux kernel module that loads and runs NDIS -ndiswrapper: (Windows network driver API) drivers supplied by the vendors. -ndiswrapper: -ndiswrapper: -ndiswrapper: -ndiswrapper: -ndiswrapper: -- cgit v1.2.3