Use hostap CVS now; improvements to the generated .conf file.

1 files changed, 49 insertions, 8 deletions

diff --git a/wpa_supplicant/build/wpa_supplicant.SlackBuild b/wpa_supplicant/build/wpa_supplicant.SlackBuild
index 2476b26e..71983a7a 100755
--- a/wpa_supplicant/build/wpa_supplicant.SlackBuild
+++ b/wpa_supplicant/build/wpa_supplicant.SlackBuild
@@ -17,6 +17,10 @@
 # 0.3.8-2:       * 09/apr/2005 by Eric Hameleers
 #                Enabled support for ndiswrapper.
 #                Parametrized the location for the madwifi driver sources.
+# 20050415-1:    * 15/apr/2005 by Eric Hameleers
+#                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).
 #
 # ------------------------------------------------------------------------------
 # 
@@ -35,17 +39,19 @@ if [ "$TMP" = "" ]; then
   TMP=/tmp
 fi
 
+SRCNAM=hostap
 PRGNAM=wpa_supplicant
-VERSION=0.3.8
+VERSION=20050415
 ARCH=${ARCH:-i486}
-BUILD=2
+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"
 
-DOC="ChangeLog COPYING README doc/* $CWD/wpa_supplicant_config $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"
@@ -81,23 +87,58 @@ cd $TMP/tmp-$PRGNAM
 #
 # Extract the source archive, patch and modify
 #
-tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
-cd ${PRGNAM}-${VERSION}
+tar -xzvf $CWD/${SRCNAM}-${VERSION}.tar.gz
+cd ${SRCNAM}-${VERSION}/wpa_supplicant
 
 sed -i -e 's#\@\@MADWIFI_PATH\@\@#${MADWIFI_PATH}#' \
-  $CWD/wpa_supplicant_defconfig.patch
-patch -p 0 < $CWD/${PRGNAM}_defconfig.patch
+  $CWD/${PRGNAM}_cvs-devel_defconfig.patch
+#patch -p 0 < $CWD/${PRGNAM}_defconfig.patch
+patch -p 0 < $CWD/${PRGNAM}_cvs-devel_defconfig.patch
 cp defconfig .config
 
 chown -R root.root .
 
 make 2>&1 | tee $CWD/make.log
 
+# This goes in the doc directoryi later on:
+cp wpa_supplicant.conf wpa_supplicant.conf.sample
+
 mkdir -p $PKG/usr/sbin
 cp wpa_supplicant wpa_passphrase wpa_cli $PKG/usr/sbin/
 
 mkdir -p $PKG/etc
-cp wpa_supplicant.conf $PKG/etc/wpa_supplicant.conf.sample
+cat <<-_EOT_ > $PKG/etc/wpa_supplicant.conf
+	# See /usr/doc/${PRGNAM}-${VERSION}/wpa_supplicant.conf.sample
+	# for many more options that you can use in this file.
+	
+	# This line enables the use of wpa_cli which is used by rc.wireless
+	# if possible (to check for successful association)
+	ctrl_interface=/var/run/wpa_supplicant
+	# By default, only root (group 0) may use wpa_cli
+	ctrl_interface_group=0
+	eapol_version=1
+	ap_scan=1
+	fast_reauth=1
+	
+	# WPA protected network, supply your own ESSID and WPAPSK here:
+	network={
+	  scan_ssid=0
+	  ssid="your_essid_here"
+	  proto=WPA
+	  key_mgmt=WPA-PSK
+	  pairwise=CCMP TKIP
+	  group=CCMP TKIP WEP104 WEP40
+	  psk=your_psk_here
+	}
+	
+	# Plaintext connection (no WPA, no IEEE 802.1X),
+	# nice for hotel/airport types of WiFi network.
+	network={
+	  ssid="any"
+	  key_mgmt=NONE
+	  priority=2	
+	}
+	_EOT_
 
 # Strip binaries and libs, fix ownership:
 chown -R root.root $PKG