network/ndiswrapper: Updated for version 1.56

4 files changed, 15 insertions, 25 deletions

diff --git a/network/ndiswrapper/README b/network/ndiswrapper/README
index 2fa630466142..5173f7adcbab 100644
--- a/network/ndiswrapper/README
+++ b/network/ndiswrapper/README
@@ -11,4 +11,4 @@ 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.29.3 ./ndiswrapper.SlackBuild
+	KERNEL=2.6.32.8 ./ndiswrapper.SlackBuild
diff --git a/network/ndiswrapper/ndiswrapper.SlackBuild b/network/ndiswrapper/ndiswrapper.SlackBuild
index 8b4e1ca4b82e..97e0cade7936 100644
--- a/network/ndiswrapper/ndiswrapper.SlackBuild
+++ b/network/ndiswrapper/ndiswrapper.SlackBuild
@@ -25,9 +25,9 @@
 # Maintained by Robby Workman <rworkman@slackbuilds.org> now
 
 PRGNAM=ndiswrapper
-VERSION=${VERSION:-1.54}
+VERSION=${VERSION:-1.56}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -39,10 +39,13 @@ 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"
 fi
 
 set -e
@@ -60,9 +63,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch to build on 2.6.29.x
-patch -p1 < $CWD/ndiswrapper_kernel_2.6.29.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 make KVERS=$KERNEL
@@ -80,7 +80,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 rm $PKG/lib/modules/*/modules.*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog INSTALL README $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
@@ -89,4 +91,4 @@ 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.tgz
+  $OUTPUT/$PRGNAM-${VERSION}_$(echo $KERNEL | tr - _)-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ndiswrapper/ndiswrapper.info b/network/ndiswrapper/ndiswrapper.info
index 59bee3088704..4969e0b101c6 100644
--- a/network/ndiswrapper/ndiswrapper.info
+++ b/network/ndiswrapper/ndiswrapper.info
@@ -1,8 +1,10 @@
 PRGNAM="ndiswrapper"
-VERSION="1.54"
+VERSION="1.56"
 HOMEPAGE="http://sourceforge.net/projects/ndiswrapper/"
-DOWNLOAD="http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.54.tar.gz"
-MD5SUM="fc9ebd3985967727da494ec298ad4487"
+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/ndiswrapper_kernel_2.6.29.patch b/network/ndiswrapper/ndiswrapper_kernel_2.6.29.patch
deleted file mode 100644
index 67c28d8566dc..000000000000
--- a/network/ndiswrapper/ndiswrapper_kernel_2.6.29.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# fix C syntax error and field name in conditional netdev ops struct, 
-# triggering on kernel >= 2.6.29 and CONFIG_NET_POLL_CONTROLLER=y.
-
---- a/driver/wrapndis.c
-+++ b/driver/wrapndis.c
-@@ -1744,7 +1744,7 @@ static const struct net_device_ops ndis_
- 	.ndo_set_mac_address = ndis_set_mac_address,
- 	.ndo_get_stats = ndis_get_stats,
- #ifdef CONFIG_NET_POLL_CONTROLLER
--	.poll_controller = ndis_poll_controller;
-+	.ndo_poll_controller = ndis_poll_controller,
- #endif
- };
- #endif