Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Robin Cook (66232423ae3112a4c0ea85b9ba9fc437541f90fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <rcook AT wyrms.net>
  • To: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Robin Cook (66232423ae3112a4c0ea85b9ba9fc437541f90fa)
  • Date: Sat, 28 Jul 2007 10:00:44 -0500

On Tue, 2007-07-24 at 10:07 +0300, Juuso Alasuutari wrote:
> On Saturday 21 July 2007 08:35:54 Robin Cook wrote:
> <...>
> > wpa_supplicant: corrected to build if using devel version
> <...>
> > --- a/net/wpa_supplicant/CONFIGURE
> > +++ b/net/wpa_supplicant/CONFIGURE
> > @@ -79,24 +79,13 @@ config_query CONFIG_EAP_GTC "EAP-GTC support?" y
> >
> > && config_query CONFIG_EAP_OTP "EAP-OTC support?" y
> > &&
> > config_query CONFIG_EAP_SIM "EAP-SIM (GSM) support?" n &&
> > config_query CONFIG_EAP_AKA "EAP-AKA (UMTS) support?" n && -if [[
> > $WPA_RELEASE != old ]]
> > -then
> > - message "${MESSAGE_COLOR}Notice: EAP-PSK and EAP-SAKE" \
> > - "options are mutually exclusive.$DEFAULT_COLOR"
> > -fi &&
> > -config_query CONFIG_EAP_PSK "EAP-PSK support?" n &&
> > -config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
> > -config_query CONFIG_EAP_LEAP "LEAP support?" y &&
> > +config_query CONFIG_EAP_PSK "EAP-PSK support?" n &&
> > +config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
> > +config_query CONFIG_EAP_LEAP "LEAP support?" y &&
> >
> > if [[ $WPA_RELEASE != old ]]
> > then
> > - if [[ $CONFIG_EAP_PSK != y ]]
> > - then
> > - config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n
> > - else
> > - message "${MESSAGE_COLOR}EAP-PSK was selected, will" \
> > - "not query about EAP-SAKE.$DEFAULT_COLOR"
> > - fi &&
> > + config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
> > config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
>
> How is removing the EAP-PSK/EAP-SAKE mutex code relevant to enabling the
> devel
> version to build? I'm just concerned because those options used to
> conflict.
> Are you sure that this has changed? Are you sure that they have stopped
> conflicting in both the devel _and_ stable versions?
>

I read the change log and for the stable version 0.5.7 they changed the
EAP type so they don't conflict anymore.

2006-12-31 - v0.5.7
* updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48
* updated EAP-PSK to use the IANA-allocated EAP type 47

> > --- a/net/wpa_supplicant/PRE_BUILD
> > +++ b/net/wpa_supplicant/PRE_BUILD
> > @@ -1,5 +1,9 @@
> > default_pre_build &&
> > -cd "$SOURCE_DIRECTORY" &&
> > +if [[ "${WPA_RELEASE}" == "devel" ]]; then
> > + cd "$SOURCE_DIRECTORY/wpa_supplicant"
> > +else
> > + cd "$SOURCE_DIRECTORY"
> > +fi &&
> <...>
> > --- a/net/wpa_supplicant/BUILD
> > +++ b/net/wpa_supplicant/BUILD
> > @@ -1,3 +1,7 @@
> > +if [[ "${WPA_RELEASE}" == "devel" ]]; then
> > + cd "$SOURCE_DIRECTORY/wpa_supplicant"
> > +fi &&
> > +
>
> Isn't the cd command in BUILD redundant, or am I not getting something?
> Afaik,
> if you've changed to $SOURCE_DIRECTORY/wpa_supplicant in PRE_BUILD you will
> still be there when BUILD is run.
>

The cd command isn't as they moved the actual source and make file into
the wpa_supplicant directory inside of $SOURCE_DIRECTORY, though the
$SOURCE_DIRECTORY could probably be removed I put it in for safety.

Robin Cook CuZnDragon

Attachment: signature.asc
Description: This is a digitally signed message part




Archive powered by MHonArc 2.6.24.

Top of Page