A lot of tarball updates, and several enhancements to the SlackBuild. Still for

the madwifi-old code though.

1 files changed, 42 insertions, 8 deletions

diff --git a/wpa_supplicant/build/wpa_supplicant.SlackBuild b/wpa_supplicant/build/wpa_supplicant.SlackBuild
index bcbe11aa..7d65cc27 100755
--- a/wpa_supplicant/build/wpa_supplicant.SlackBuild
+++ b/wpa_supplicant/build/wpa_supplicant.SlackBuild
@@ -1,12 +1,15 @@
 #!/bin/sh
 # $Id$
+# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
+# Distributed under the terms of the GNU General Public License, Version 2
 # ------------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers
+# By:        Eric Hameleers <alien@slackware.com>
 # For:       wpa_supplicant
 # URL:       http://hostap.epitest.fi/wpa_supplicant/
+# Descr:     WPA/WPA2/IEEE 802.1X Supplicant
 # Requires:  Source code for supported wireless card drivers
 #            openssl >= 0.9.7
 # Changelog:
@@ -21,9 +24,27 @@
 #                Switched from 'stable' to 'development'.
 #                The development branch has support for the 'any' ESSID, needed
 #                to connect to 'any open' WiFi network (think: hotel/airport).
-# 20050806-1:    * 03/aug/2005 by Eric Hameleers
-#                New snapshot, uses a madwifi-20050806 snapshot.
+# 20050806-1:    * 06/aug/2005 by Eric Hameleers
+#                This snapshot uses a madwifi-20050707 snapshot.
 #                Make snapshot version visible in the program output.
+# 20050809-1:    * 09/aug/2005 by Eric Hameleers
+#                New snapshot, uses a madwifi-20050809 snapshot for testing
+#                reportedly, tha last madwifi CVS snapshot to work with new
+#                wpa_supplicant snapshots is 20050707.
+# 20050913-1:    * 13/sep/2005 by Eric Hameleers
+#                New snapshot from hostap cvs. Also, make the docs.
+# 20051005-1:    * 05/oct/2005 by Eric Hameleers
+#                New snapshot from hostap cvs, to test against today's madwifi
+#                snapshot.
+# 20051007-1:    * 07/oct/2005 by Eric Hameleers
+#                New snapshot from hostap cvs, to test against today's madwifi.
+#                This time, also incorporate a patch found here:
+#                http://hostap.epitest.fi/bugz/show_bug.cgi?id=63 , which should
+#                make madwifi/WPA work again.
+# 20051008-1:    * 08/oct/2005 by Eric Hameleers
+#                Looks like the patch made it into CVS! We can remove out patch.
+# 20051014-1:    * 14/oct/2005 by Eric Hameleers
+#                Update.
 #
 # ------------------------------------------------------------------------------
 # 
@@ -44,17 +65,22 @@ fi
 
 SRCNAM=hostap
 PRGNAM=wpa_supplicant
-VERSION=20050806
+VERSION=20051014
 ARCH=${ARCH:-i486}
 BUILD=1
 
 # Support for madwifi needs the madwifi driver's source tree;
 # Change this to where _your_ madwifi source directory is
 # (the compile will fail if these are not present, sorry...):
-MADWIFI_PATH="/tmp/tmp-madwifi/madwifi"
+# Hack the madwifi support out of 'wpa_supplicant-$VERSION.defconfig
+# in this directory if you don't need support for it
+#MADWIFI_PATH="/tmp/tmp-madwifi/madwifi"
+# Madwifi package for Slackware now installs the headers too:
+MADWIFI_PATH="/usr/include/madwifi"
+
+DOC="ChangeLog COPYING README* doc/html wpa_supplicant-devel.pdf \
+     wpa_supplicant.conf.sample $CWD/README.slackware"
 
-DOC="ChangeLog COPYING README* doc/* wpa_supplicant.conf.sample \
-     $CWD/README.slackware"
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
@@ -90,10 +116,17 @@ cd $TMP/tmp-$PRGNAM
 #
 # Extract the source archive, patch and modify
 #
+
+if ! [ -f $CWD/${PRGNAM}-${VERSION}.defconfig ]; then
+  echo "Could not find ${PRGNAM}-${VERSION}.defconfig!"
+  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 -ie \
+sed -i -e \
   "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
   version.h
 sed -e "s#\@\@MADWIFI_PATH\@\@#${MADWIFI_PATH}#" \
@@ -103,6 +136,7 @@ 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
 
 # This goes in the doc directory later on:
 cp wpa_supplicant.conf wpa_supplicant.conf.sample