Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jeremy Blosser (d1cb1a24955fd07b230c9960d1957ef16aa824d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jeremy Blosser (d1cb1a24955fd07b230c9960d1957ef16aa824d3)
  • Date: Thu, 15 Mar 2007 12:13:16 -0500

GIT changes to stable-rc-0.8 grimoire by Jeremy Blosser
<jblosser-smgl AT firinn.org>:

disk/grub/CONFIGURE | 1 +
disk/grub/HISTORY | 5 +++++
disk/grub/PRE_BUILD | 6 ++++--
net/wpa_supplicant/CONFIGURE | 19 +++++++++++++++----
net/wpa_supplicant/HISTORY | 4 ++++
5 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit d1cb1a24955fd07b230c9960d1957ef16aa824d3
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

wpa_supplicant: made EAP-PSK and EAP-SAKE options mutually exclusive,
fixes bug #13518
(cherry picked from commit d860ca4efe52766f250c7f0f4ddbba8f4fe28211)

commit 764730658d1fa61b96c5a0a9e45b62c30a13976e
Author: George Sherwood <chat AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

grub: Added query for graphical boot screen. Bug 12852.(cherry picked
from commit 63cc8ceb40994de5ef7c545e3fda79258c2f4a6a)

diff --git a/disk/grub/CONFIGURE b/disk/grub/CONFIGURE
index 4beef42..2a69965 100755
--- a/disk/grub/CONFIGURE
+++ b/disk/grub/CONFIGURE
@@ -50,6 +50,7 @@ kernel (hd0,0)/boot/vmlinubz-${UNAME_R}
EOF
}

+config_query GRUB_GRAPHICS "Enable graphical boot screen?" n
&&
config_query GRUB_EXT2 "Enable ext2 support in stage 2?" y
&&
config_query GRUB_FAT "Enable FAT16/32 support in stage 2?" y
&&
config_query GRUB_FFS "Enable FFS support in stage 2?" y
&&
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 61d1cf1..1a1c098 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,8 @@
+2007-03-15 George Sherwood <george AT beernabeer.com>
+ * CONFIGURE: Add query to use graphical boot screen. Bug #12852
+ * PRE_BUILD: Added if statement to check if user wants to
+ apply graphics patch
+
2006-12-20 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD, configure.ac.patch: added a patch to get rid of
automake-1.9, works with automake now
diff --git a/disk/grub/PRE_BUILD b/disk/grub/PRE_BUILD
index 0cb46e2..781eb69 100755
--- a/disk/grub/PRE_BUILD
+++ b/disk/grub/PRE_BUILD
@@ -7,9 +7,11 @@ patch -p1 < ${SCRIPT_DIRECTORY}/grub-
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-nxstack.patch &&
patch -p0 < ${SCRIPT_DIRECTORY}/configure.ac.patch &&

-if [ "$GRUB_REISER4" = "y" ]; then
+if [ "$GRUB_GRAPHICS" == "y" ]; then
+ if [ "$GRUB_REISER4" = "y" ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-reiser4-20050808.patch
&&
patch -p1 <
${SCRIPT_DIRECTORY}/grub-0.96-graphics-for-reiser4.patch
-else
+ else
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.96-graphics.patch
+ fi
fi
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 70a4a2a..014f41e 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -79,13 +79,24 @@ config_query CONFIG_EAP_GTC "EAP-GTC s
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 &&
-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
+ 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 &&

if [[ $WPA_RELEASE != old ]]
then
- config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
+ 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_GPSK "EAP-GPSK support?" n &&

if [[ $CONFIG_EAP_GPSK == y ]]
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index c29231e..dec622c 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2007-03-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Made EAP-PSK and EAP-SAKE options mutually exclusive,
+ fixes #13518.
+
2007-02-01 Juuso Alasuutari <iuso AT sourcemage.org>
* init.d/wpa_supplicant: Added check for wireless extensions,
removed redundant iwconfig forks.



  • [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jeremy Blosser (d1cb1a24955fd07b230c9960d1957ef16aa824d3), Jeremy Blosser, 03/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page