summaryrefslogtreecommitdiff
path: root/network/ndiswrapper
diff options
context:
space:
mode:
Diffstat (limited to 'network/ndiswrapper')
-rw-r--r--network/ndiswrapper/README2
-rw-r--r--network/ndiswrapper/doinst.sh4
-rw-r--r--network/ndiswrapper/ndiswrapper.SlackBuild13
-rw-r--r--network/ndiswrapper/ndiswrapper.info8
-rw-r--r--network/ndiswrapper/ndiswrapper_kernel_2.6.29.patch14
-rw-r--r--network/ndiswrapper/slack-desc14
6 files changed, 33 insertions, 22 deletions
diff --git a/network/ndiswrapper/README b/network/ndiswrapper/README
index bd1f1a6e26..2fa6304661 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.25 ./ndiswrapper.SlackBuild
+ KERNEL=2.6.29.3 ./ndiswrapper.SlackBuild
diff --git a/network/ndiswrapper/doinst.sh b/network/ndiswrapper/doinst.sh
index 123772d054..2d24f838c4 100644
--- a/network/ndiswrapper/doinst.sh
+++ b/network/ndiswrapper/doinst.sh
@@ -1,4 +1,2 @@
-#!/bin/sh
-
-chroot . /sbin/depmod -a
+chroot . /sbin/depmod -a @VERSION@
diff --git a/network/ndiswrapper/ndiswrapper.SlackBuild b/network/ndiswrapper/ndiswrapper.SlackBuild
index 2141fc53fd..8b4e1ca4b8 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.53}
+VERSION=${VERSION:-1.54}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -35,10 +35,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# This *should* work, but if it doesn't, let me know. I've walked through
-# the relevant Makefiles and if everything does what I think it does, you
-# should be able to build for something other than the running kernel.
-# Again, let me know if I'm wrong. --rworkman
KERNEL=${KERNEL:-$(uname -r)}
if [ "$ARCH" = "i486" ]; then
@@ -64,6 +60,9 @@ 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
@@ -86,7 +85,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed "s%@VERSION@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n \
diff --git a/network/ndiswrapper/ndiswrapper.info b/network/ndiswrapper/ndiswrapper.info
index 53e400a033..59bee30887 100644
--- a/network/ndiswrapper/ndiswrapper.info
+++ b/network/ndiswrapper/ndiswrapper.info
@@ -1,8 +1,8 @@
PRGNAM="ndiswrapper"
-VERSION="1.53"
-HOMEPAGE="http://ndiswrapper.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.53.tar.gz"
-MD5SUM="393c6e6ab0803963148e18538601cdec"
+VERSION="1.54"
+HOMEPAGE="http://sourceforge.net/projects/ndiswrapper/"
+DOWNLOAD="http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.54.tar.gz"
+MD5SUM="fc9ebd3985967727da494ec298ad4487"
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
new file mode 100644
index 0000000000..67c28d8566
--- /dev/null
+++ b/network/ndiswrapper/ndiswrapper_kernel_2.6.29.patch
@@ -0,0 +1,14 @@
+# 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
diff --git a/network/ndiswrapper/slack-desc b/network/ndiswrapper/slack-desc
index 831e784696..23f72916fd 100644
--- a/network/ndiswrapper/slack-desc
+++ b/network/ndiswrapper/slack-desc
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler--------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
ndiswrapper: ndiswrapper (wrapper for NDIS drivers)
-ndiswrapper:
+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:
+ndiswrapper:
+ndiswrapper:
+ndiswrapper:
+ndiswrapper:
+ndiswrapper: