Update of /cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24669
Modified Files:
buildtool.cfg buildtool.mk wpa_supplicant.conf
wpasupplicant.default wpasupplicant.init
Added Files:
.config wpa_supplicant-0.5.7.tar.gz
Removed Files:
wpa_supplicant-0.4.9.tar.gz wpasupplicant_config.patch
Log Message:
update to version 0.5.7 and various improvements
--- wpasupplicant_config.patch DELETED ---
--- NEW FILE: .config ---
CONFIG_DRIVER_ATMEL=y
CONFIG_DRIVER_HOSTAP=y
#CONFIG_DRIVER_IPW=y
CONFIG_DRIVER_MADWIFI=y
#CONFIG_DRIVER_NDISWRAPPER=y
CONFIG_DRIVER_WEXT=y
CONFIG_DRIVER_WIRED=y
#CONFIG_DRIVER_TEST=y
#CONFIG_DRIVER_PRISM54=y # Prism54 support broken upstream
#CONFIG_DRIVER_NDIS=y # Windows only
#CONFIG_DRIVER_HERMES=y # Non-GPL header required
#CONFIG_DRIVER_BROADCOM=y # Non-GPL header required
#CONFIG_DRIVER_BSD=y
CONFIG_IEEE8021X_EAPOL=y
CONFIG_EAP_MD5=y
CONFIG_EAP_MSCHAPV2=y
#CONFIG_EAP_FAST=y # Requires OpenSSL rebuild
CONFIG_EAP_TLS=y
CONFIG_EAP_PEAP=y
CONFIG_EAP_TTLS=y
CONFIG_EAP_GTC=y
CONFIG_EAP_OTP=y
#CONFIG_EAP_SIM=y
CONFIG_EAP_PSK=y
CONFIG_EAP_PAX=y
CONFIG_EAP_LEAP=y
#CONFIG_EAP_AKA=y
#CONFIG_EAP_SAKE=y
#CONFIG_EAP_GPSK=y
#CONFIG_EAP_GPSK_SHA256=y
CONFIG_PKCS12=y
CONFIG_SMARTCARD=y
#CONFIG_PCSC=y
CONFIG_CTRL_IFACE=y
#CONFIG_CTRL_IFACE_DBUS=y
#CONFIG_READLINE=y
#CONFIG_NO_STDOUT_DEBUG=y
CONFIG_PEERKEY=y
#CONFIG_IEEE80211W=y
CONFIG_BACKEND=file
Index: wpasupplicant.default
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant/wpasupplicant.default,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wpasupplicant.default 7 Jan 2006 14:25:20 -0000 1.2
--- wpasupplicant.default 4 Jan 2007 22:33:43 -0000 1.3
***************
*** 1,21 ****
! # /etc/default/wpasupplicant
!
! # WARNING! Make sure you have a configuration file!
ENABLED=0
! # Useful flags:
! # -D <driver> Wireless drive, typically optional.
! # -i <ifname> Interface
! # -c <config file> Configuration file
! # -d Debugging (-dd for more)
! # -w Wait for interface to come up
!
! # See the manual page wpa_supplicant(1) for more options and information.
! OPTIONS="-w"
! # EXAMPLES:
! # OPTIONS="-i wlan0 -D hostap -c /etc/wpa_supplicant.conf"
! # OPTIONS="-i ath0 -D madwifi -c /etc/wpa_supplicant.conf"
--- 1,28 ----
! # To activate the wpasupplicant daemon, set ENABLED to 1
ENABLED=0
! # Specify the network interface that the daemon will attach to.
! #
! # Examples: INTERFACE="eth1"
! # INTERFACE="ath0"
! #
! # Failure to set INTERFACE to a valid network interface name will
! # cause the daemon to fail or exit immediately.
! INTERFACE=""
! # DRIVER specifies the driver type of the interface defined above.
! #
! # If DRIVER is not set, the daemon will default to the "wext" driver
! #
! # Currently, the following drivers are supported:
! # hostap = Host AP driver (Intersil Prism2/2.5/3)
! # madwifi = MADWIFI 802.11 support (Atheros, etc.)
! # atmel = ATMEL AT76C5XXx (USB, PCMCIA)
! # wext = Linux wireless extensions (generic, ipw2100/2200/3495, linux >=
2.6.14)
! # ndiswrapper = Linux ndiswrapper
! # ipw = Intel ipw2100/2200 driver (linux kernels 2.6.13 or older only)
! # wired = wpa_supplicant wired Ethernet driver
! DRIVER=""
--- wpa_supplicant-0.4.9.tar.gz DELETED ---
Index: wpasupplicant.init
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant/wpasupplicant.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wpasupplicant.init 25 Jun 2005 21:20:07 -0000 1.1
--- wpasupplicant.init 4 Jan 2007 22:33:43 -0000 1.2
***************
*** 1,78 ****
#!/bin/sh
! # Buyer beware! This is really only useful if you have a
! # MiniPCI or other permanent wireless device.
!
! # However, the wpa_supplicant daemon will start, and sit waiting
! # for the name interface to come up. Therefore, if you want to use
! # this with pcmcia or other nonsense, it may be best to ifrename
! # your wireless interface if it has an "ethX" name that is variable.
!
! RCDLINKS="2,S20 3,S20 4,S20 5,S20 0,K20 1,K20 6,K20"
PATH=/sbin:/bin:/usr/sbin:/usr/bin
! DAEMON=/usr/sbin/wpa_supplicant
! PIDFILE="/var/run/wpasupplicant.pid"
CONFIG="/etc/wpa_supplicant.conf"
PNAME="wpa_supplicant"
! # insane defaults
! OPTIONS="-Bw" # daemonize and wait for interface
! ENABLED=0
! [ -f /etc/default/wpasupplicant ] && . /etc/default/wpasupplicant
if [ "$ENABLED" = "0" ]; then
echo "wpasupplicant: disabled, see /etc/default/wpasupplicant"
! exit 0;
fi
! [ -f $CONFIG ] || ( echo "No configuration file found, not starting."; \
! exit 1; )
! [ -f $DAEMON ] || exit 0
set -e
case "$1" in
! start)
! echo -n "Starting wpasupplicant: "
! start-stop-daemon --start --name $PNAME \
! --oknodo --startas $DAEMON -- -B $OPTIONS
! echo "done."
! ;;
! stop)
! echo -n "Stopping wpasupplicant: "
! start-stop-daemon --stop --name $PNAME \
! --oknodo
! echo "done."
! if [ -f $PIDFILE ]; then
! rm -f $PIDFILE;
! fi
! ;;
! reload|force-reload)
! echo -n "Reloading wpasupplicant: "
! start-stop-daemon --stop --signal 1 \
! --name $PNAME
! echo "done."
! ;;
! restart)
! echo -n "Restarting wpasupplicant: "
! start-stop-daemon --stop --name $PNAME \
! --oknodo
! sleep 1
! if [ -f $PIDFILE ]; then
! rm -f $PIDFILE;
fi
! start-stop-daemon --start --name $PNAME \
! --oknodo --startas $DAEMON -- -B $OPTIONS
! echo "done."
! ;;
! *)
! echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
! exit 1
! ;;
esac
! exit 0
--- 1,87 ----
#!/bin/sh
! # Buyer beware! This is really only useful if you want to use
! # wpasupplicant in roaming mode.
! #
! RCDLINKS="2,S15 3,S15 4,S15 5,S15 0,K90 1,K90 6,K90"
PATH=/sbin:/bin:/usr/sbin:/usr/bin
! ENABLED=0
! INTERFACE=""
CONFIG="/etc/wpa_supplicant.conf"
+ DAEMON="/usr/sbin/wpa_supplicant"
PNAME="wpa_supplicant"
! # exit silently if daemon is not installed/executable
! [ -x $DAEMON ] || exit 0
! [ -f /etc/default/wpasupplicant ] && ./etc/default/wpasupplicant
if [ "$ENABLED" = "0" ]; then
echo "wpasupplicant: disabled, see /etc/default/wpasupplicant"
! exit 0;
fi
! if [ -z "$INTERFACE" ]; then
! echo "No INTERFACE was defined, not starting.";
! exit 1;
! fi
! if [ ! -r "$CONFIG" ]; then
! echo "No configuration file found, not starting.";
! exit 1;
! fi
!
! if [ -z "$DRIVER" ]; then
! DRIVER="wext"
! fi
!
! PIDFILE="/var/run/wpa_supplicant.$INTERFACE.pid"
!
! OPTIONS="-B -w -i $INTERFACE -D $DRIVER -c $CONFIG -P $PIDFILE"
set -e
case "$1" in
! start)
! if [ -f "$PIDFILE" ]; then
! echo "$PNAME not starting, $PIDFILE already exists."
! exit 1
fi
! echo "Starting $PNAME."
! start-stop-daemon --start --name $PNAME \
! --oknodo --startas $DAEMON -- $OPTIONS
! ;;
! stop)
! echo "Stopping $PNAME."
! start-stop-daemon --stop --name $PNAME \
! --oknodo
! if [ -f "$PIDFILE" ]; then
! rm -f $PIDFILE;
! fi
! ;;
! reload|force-reload)
! echo "Reloading $PNAME."
! start-stop-daemon --stop --signal 1 \
! --name $PNAME
! ;;
! restart)
! echo "Stopping $PNAME."
! start-stop-daemon --stop --name $PNAME \
! --oknodo
! if [ -f "$PIDFILE" ]; then
! rm -f $PIDFILE;
! fi
!
! echo "Starting $PNAME."
! start-stop-daemon --start --name $PNAME \
! --oknodo --startas $DAEMON -- $OPTIONS
! ;;
! *)
! echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
! exit 1
! ;;
esac
! exit 0
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant/buildtool.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtool.mk 26 Jun 2006 20:01:18 -0000 1.7
--- buildtool.mk 4 Jan 2007 22:33:42 -0000 1.8
***************
*** 2,6 ****
include $(MASTERMAKEFILE)
! WPA_DIR:=wpa_supplicant-0.4.9
WPA_TARGET_DIR:=$(BT_BUILD_DIR)/wpasupplicant
--- 2,6 ----
include $(MASTERMAKEFILE)
! WPA_DIR:=wpa_supplicant-0.5.7
WPA_TARGET_DIR:=$(BT_BUILD_DIR)/wpasupplicant
***************
*** 8,12 ****
$(WPA_DIR)/.source:
zcat $(WPA_SOURCE) | tar -xvf -
! cat $(WPA_PATCH) | patch -d $(WPA_DIR) -p1
touch $(WPA_DIR)/.source
--- 8,12 ----
$(WPA_DIR)/.source:
zcat $(WPA_SOURCE) | tar -xvf -
! # cat $(WPA_PATCH) | patch -d $(WPA_DIR) -p1
touch $(WPA_DIR)/.source
***************
*** 19,22 ****
--- 19,23 ----
mkdir -p $(WPA_TARGET_DIR)/etc/default
mkdir -p $(WPA_TARGET_DIR)/etc/init.d
+ cp -a .config $(WPA_DIR)/
( cd $(WPA_DIR) ; export CFLAGS="$(BT_COPT_FLAGS) -MMD -Wall -g
-I$(BT_STAGING_DIR)/usr/include" ; \
export LIBS=-L$(BT_STAGING_DIR)/usr/lib ; make CC=$(TARGET_CC) ) ;
--- NEW FILE: wpa_supplicant-0.5.7.tar.gz ---
(This appears to be a binary file; contents omitted.)
Index: wpa_supplicant.conf
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant/wpa_supplicant.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wpa_supplicant.conf 7 Jan 2006 14:25:20 -0000 1.1
--- wpa_supplicant.conf 4 Jan 2007 22:33:43 -0000 1.2
***************
*** 1,9 ****
# Minimal /etc/wpa_supplicant.conf to associate with open
! # access points. Please see
! # /usr/share/doc/wpasupplicant/wpa_supplicant.conf.gz for more complete
! # configuration parameters.
ctrl_interface=/var/run/wpa_supplicant
- ctrl_interface_group=0
eapol_version=1
--- 1,7 ----
# Minimal /etc/wpa_supplicant.conf to associate with open
! # access points.
+ # path to UNIX socket control interface
ctrl_interface=/var/run/wpa_supplicant
eapol_version=1
***************
*** 11,18 ****
fast_reauth=1
### Associate with any open access point
### Scans/ESSID changes can be done with wpa_cli
network={
- ssid=""
key_mgmt=NONE
}
--- 9,21 ----
fast_reauth=1
+ ### Example of basic WPA-PSK secured AP
+ #network={
+ # ssid="ournet"
+ # psk="w243sd5f324asdf5123sadf54324"
+ #}
+
### Associate with any open access point
### Scans/ESSID changes can be done with wpa_cli
network={
key_mgmt=NONE
}
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/wpasupplicant/buildtool.cfg,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildtool.cfg 26 Jun 2006 20:01:18 -0000 1.12
--- buildtool.cfg 4 Jan 2007 22:33:42 -0000 1.13
***************
*** 5,9 ****
</File>
! <File wpa_supplicant-0.4.9.tar.gz>
Server = cvs-sourceforge
Revision = HEAD
--- 5,9 ----
</File>
! <File wpa_supplicant-0.5.7.tar.gz>
Server = cvs-sourceforge
Revision = HEAD
***************
*** 12,19 ****
</File>
! <File wpasupplicant_config.patch>
Server = cvs-sourceforge
Revision = HEAD
- envname = WPA_PATCH
Directory = wpasupplicant
</File>
--- 12,18 ----
</File>
! <File .config>
Server = cvs-sourceforge
Revision = HEAD
Directory = wpasupplicant
</File>
***************
*** 39,43 ****
<Package>
<wpasupp>
! Version = 0.4.9
Revision = 1
--- 38,42 ----
<Package>
<wpasupp>
! Version = 0.5.7
Revision = 1
***************
*** 61,67 ****
<Contents>
<File>
! Source = etc/wpa_supplicant.conf
! Filename = etc/wpa_supplicant.conf
! Description = wpa_supplicant configuration
Type = conf
Type = local
--- 60,66 ----
<Contents>
<File>
! Source = etc/default/wpasupplicant
! Filename = etc/default/wpasupplicant
! Description = wpa_supplicant default file
Type = conf
Type = local
***************
*** 69,78 ****
</File>
<File>
! Source = etc/default/wpasupplicant
! Filename = etc/default/wpasupplicant
! Description = wpa_supplicant default file
Type = conf
Type = local
Type = binary
</File>
<File>
--- 68,78 ----
</File>
<File>
! Source = etc/wpa_supplicant.conf
! Filename = etc/wpa_supplicant.conf
! Description = wpa_supplicant configuration
Type = conf
Type = local
Type = binary
+ Permissions = 600
</File>
<File>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
