Skip to Content.
Sympa Menu

sm-commit - [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 <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (66232423ae3112a4c0ea85b9ba9fc437541f90fa)
  • Date: Sat, 21 Jul 2007 00:35:54 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
libs/gmime/DETAILS | 2 +-
libs/gmime/HISTORY | 3 +++
libs/gmime/gmime-2.2.10.tar.gz.sig |binary
libs/gmime/gmime-2.2.9.tar.gz.sig | 0
net/wpa_supplicant/BUILD | 4 ++++
net/wpa_supplicant/CONFIGURE | 19 ++++---------------
net/wpa_supplicant/HISTORY | 5 +++++
net/wpa_supplicant/PRE_BUILD | 6 +++++-
9 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit 66232423ae3112a4c0ea85b9ba9fc437541f90fa
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

wpa_supplicant: corrected to build if using devel version

commit 7271fff5fa9b05eede11ebd9a6fd205ea52bf1ef
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gmime: updated to 2.2.10

diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index 2a42a06..cb464e1 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -1,5 +1,5 @@
SPELL=gmime
- VERSION=2.2.9
+ VERSION=2.2.10
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index 81c7a8f..2ec1391 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,6 @@
+2007-07-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.2.10
+
2007-05-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.2.9

diff --git a/libs/gmime/gmime-2.2.10.tar.gz.sig
b/libs/gmime/gmime-2.2.10.tar.gz.sig
new file mode 100644
index 0000000..aa19036
Binary files /dev/null and b/libs/gmime/gmime-2.2.10.tar.gz.sig differ
diff --git a/libs/gmime/gmime-2.2.9.tar.gz.sig
b/libs/gmime/gmime-2.2.9.tar.gz.sig
deleted file mode 100644
index 3c6899a..0000000
Binary files a/libs/gmime/gmime-2.2.9.tar.gz.sig and /dev/null differ
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index c83931c..3a0c415 100755
--- 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 &&
+
# Create .config file for make (this is here instead of PRE_BUILD because
# OPTS isn't available there, and this is equivalent to running ./configure
# anyway).
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 014f41e..70a4a2a 100755
--- 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 &&

if [[ $CONFIG_EAP_GPSK == y ]]
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 6a1f8c2..6c0da74 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2007-07-20 Robin Cook <rcook AT wryms.net>
+ * PRE_BUILD: cd to correct directory if devel
+ * BUILD: cd to correct directory if devel
+ * CONFIGURE: EAP-PSK and EAP-SAKE no longer conflict
+
2006-07-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.10 / 0.5.8 / 0.6.0
* PREPARE: add back devel version
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index ea5763c..be6004d 100755
--- 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 &&

sed -i "s|/local||g" Makefile &&





Archive powered by MHonArc 2.6.24.

Top of Page