1 files changed, 15 insertions, 18 deletions
diff --git a/network/rtl-wifi/rtl-wifi.SlackBuild b/network/rtl-wifi/rtl-wifi.SlackBuild
index b2a569eb97..67cbdf47c4 100644
--- a/network/rtl-wifi/rtl-wifi.SlackBuild
+++ b/network/rtl-wifi/rtl-wifi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rtl-wifi
 
-# Copyright 2007 Christophe Nguyen <cnguyenminhtan@free.fr>
+# Copyright 2008 Christophe Nguyen <cnguyenminhtan@free.fr>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,10 +26,11 @@
 # building modules for something other than the running kernel.
 
 PRGNAM=rtl-wifi
-VERSION=20070729
+VERSION=20080622
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -45,38 +46,34 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
+# Apply patch to make it compile with kernel 2.6.24
+patch -p1 < $CWD/patch_2_6_24.diff || exit 1
+
 make KVER=$KERNEL
 
-install -D -m 0644 $TMP/$PRGNAM/ieee80211/ieee80211_crypt-rtl.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/ieee80211/ieee80211_crypt-rtl.ko \
   $PKG/lib/modules/$KERNEL/kernel/net/ieee80211/ieee80211_crypt-rtl.ko
-install -D -m 0644 $TMP/$PRGNAM/ieee80211/ieee80211_crypt_wep-rtl.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/ieee80211/ieee80211_crypt_wep-rtl.ko \
   $PKG/lib/modules/$KERNEL/kernel/net/ieee80211/ieee80211_crypt_wep-rtl.ko
-install -D -m 0644 $TMP/$PRGNAM/ieee80211/ieee80211_crypt_tkip-rtl.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/ieee80211/ieee80211_crypt_tkip-rtl.ko \
   $PKG/lib/modules/$KERNEL/kernel/net/ieee80211/ieee80211_crypt_tkip-rtl.ko
-install -D -m 0644 $TMP/$PRGNAM/ieee80211/ieee80211_crypt_ccmp-rtl.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/ieee80211/ieee80211_crypt_ccmp-rtl.ko \
   $PKG/lib/modules/$KERNEL/kernel/net/ieee80211/ieee80211_crypt_ccmp-rtl.ko
-install -D -m 0644 $TMP/$PRGNAM/ieee80211/ieee80211-rtl.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/ieee80211/ieee80211-rtl.ko \
   $PKG/lib/modules/$KERNEL/kernel/net/ieee80211/ieee80211-rtl.ko
-install -D -m 0644 $TMP/$PRGNAM/rtl8187-newstack/r8187.ko \
-  $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/r8187.ko
-install -D -m 0644 $TMP/$PRGNAM/rtl818x-newstack/r8180.ko \
+install -D -m 0644 $TMP/$PRGNAM-$VERSION/rtl818x-newstack/r8180.ko \
   $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/r8180.ko
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{ieee80211,rtl{8187,818x}-newstack}
 cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION/
 cp -a ieee80211/{LICENSE,README} $PKG/usr/doc/$PRGNAM-$VERSION/ieee80211
-for i in AUTHORS CHANGES COPYING INSTALL LICENSE README ; do
-  cp -a rtl8187-newstack/$i $PKG/usr/doc/$PRGNAM-$VERSION/rtl8187-newstack ;
-done
 for i in AUTHORS CHANGES COPYING INSTALL LICENSE \
  README README.adhoc README.master ; do
   cp -a rtl818x-newstack/$i $PKG/usr/doc/$PRGNAM-$VERSION/rtl818x-newstack ;