Polished the SlackBuild for stable version 0.4.7

1 files changed, 23 insertions, 12 deletions

diff --git a/wpa_supplicant/build/wpa_supplicant.SlackBuild b/wpa_supplicant/build/wpa_supplicant.SlackBuild
index 7d65cc27..57a8be16 100755
--- a/wpa_supplicant/build/wpa_supplicant.SlackBuild
+++ b/wpa_supplicant/build/wpa_supplicant.SlackBuild
@@ -45,6 +45,9 @@
 #                Looks like the patch made it into CVS! We can remove out patch.
 # 20051014-1:    * 14/oct/2005 by Eric Hameleers
 #                Update.
+# 0.4.7-1:       * 31/jan/2006 by Eric Hameleers <alien@slackware.com>
+#                Try a "stable" version for the madwifi-ng (Atheros driver) code.
+#                Also, get rid of the developer docs.
 #
 # ------------------------------------------------------------------------------
 # 
@@ -63,9 +66,10 @@ if [ "$TMP" = "" ]; then
   TMP=/tmp
 fi
 
+OFFICIAL_RELEASE="yes"   # make empty if you're building from CVS
 SRCNAM=hostap
 PRGNAM=wpa_supplicant
-VERSION=20051014
+VERSION=0.4.7
 ARCH=${ARCH:-i486}
 BUILD=1
 
@@ -122,13 +126,18 @@ if ! [ -f $CWD/${PRGNAM}-${VERSION}.defconfig ]; then
   echo "You need to create that file using ${SRCNAM}-${VERSION}/${PRGNAM}/defconfig as example."
   exit 1
 fi
-tar -xzvf $CWD/${SRCNAM}-${VERSION}.tar.gz
-cd ${SRCNAM}-${VERSION}/${PRGNAM}
-#patch -p1 < $CWD/driver_madwifi.c.patch 2>&1 | tee $CWD/patch-${PRGNAM}.log
 
-sed -i -e \
-  "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
-  version.h
+if [ -z "$OFFICIAL_RELEASE" ]; then
+  tar -xzvf $CWD/${SRCNAM}-${VERSION}.tar.gz
+  cd ${SRCNAM}-${VERSION}/${PRGNAM}
+  sed -i -e \
+    "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
+    version.h
+else
+  tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+  cd ${PRGNAM}-${VERSION}
+fi
+
 sed -e "s#\@\@MADWIFI_PATH\@\@#${MADWIFI_PATH}#" \
   $CWD/${PRGNAM}-${VERSION}.defconfig \
    > .config
@@ -136,7 +145,9 @@ sed -e "s#\@\@MADWIFI_PATH\@\@#${MADWIFI_PATH}#" \
 chown -R root.root .
 
 make 2>&1 | tee $CWD/make.log
-PATH=".:$PATH" make docs 2>&1 | tee -a $CWD/make.log
+
+# Do not build the developer docs
+#PATH=".:$PATH" make docs 2>&1 | tee -a $CWD/make.log
 
 # This goes in the doc directory later on:
 cp wpa_supplicant.conf wpa_supplicant.conf.sample
@@ -180,8 +191,8 @@ cat <<-_EOT_ > $PKG/etc/wpa_supplicant.conf.new
 	_EOT_
 
 # Strip binaries and libs, fix ownership:
-chown -R root.root $PKG
-chgrp bin $PKG/usr/sbin/*
+chown -R root:root $PKG
+chown root:bin $PKG/usr/sbin/*
 chmod -R o-w $PKG
 
 ( cd $PKG
@@ -218,7 +229,7 @@ EOINS
 # Copy the documentation:
 mkdir -p $PKG/usr/doc/${PRGNAM}-${VERSION}
 cp -a $DOC $PKG/usr/doc/${PRGNAM}-${VERSION}
-chmod -R -w $PKG/usr/doc/${PRGNAM}-${VERSION}/*
+chmod -R a-w $PKG/usr/doc/${PRGNAM}-${VERSION}/*
 
 
 # --- PACKAGE DESCRIPTION ---
@@ -230,7 +241,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 # Build the package and compute its md5 checksum:
 cd $PKG
 makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
 (cd $TMP && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5)