Source Mage code commit list

[Justin Boffemmyer <scm AT sourcemage.org>]

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

 crypto/libxcrypt/CONFIGURE |    9 ++++-----
 crypto/libxcrypt/HISTORY   |    3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 974537fc3c8f283a0c62f94c29e1cd982ecfc35c
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    crypto/libxcrypt: fix use of vars in CONFIGURE
    
    Correct OBSOLETE_APIS and HASHES to separate vars for the config_query
    calls and the later value-adjustment mappings. Sorcery treats
    confg_query variables specially, so later modifying the same variable
    and re-adding it as persistent produces unwanted side-effects.

diff --git a/crypto/libxcrypt/CONFIGURE b/crypto/libxcrypt/CONFIGURE
index 1c8819a..3a7b408 100755
--- a/crypto/libxcrypt/CONFIGURE
+++ b/crypto/libxcrypt/CONFIGURE
@@ -7,7 +7,7 @@ config_query_option BUILD_STATIC \
                     --disable-static \
                     &&
 
-config_query_list OBSOLETE_APIS \
+config_query_list OBSOLETE_APIS_OPT \
                   "Which obsolete APIs to enable?" \
                   none \
                   alt \
@@ -24,7 +24,7 @@ config_query_option OBSOLETE_STUBS \
                     --enable-obsolete-api-enosys=no \
                     &&
 
-config_query_multi HASHES "Which hashes to enable?" \
+config_query_multi HASHES_OPT "Which hashes to enable?" \
                    strong \
                    alt \
                    fedora \
@@ -39,13 +39,12 @@ config_query_multi HASHES "Which hashes to enable?" \
                    all \
                    &&
 
-case "$OBSOLETE_APIS" in
+case "$OBSOLETE_APIS_OPT" in
   none) OBSOLETE_APIS=no ;;
   all) OBSOLETE_APIS=yes ;;
 esac &&
 
-HASHES="--enable-hashes=${HASHES// /,}" &&
+HASHES="--enable-hashes=${HASHES_OPT// /,}" &&
 OBSOLETE_APIS="--enable-obsolete-api=$OBSOLETE_APIS" &&
 
-persistent_remove HASHES OBSOLETE_APIS &&
 persistent_add HASHES OBSOLETE_APIS
diff --git a/crypto/libxcrypt/HISTORY b/crypto/libxcrypt/HISTORY
index a9a135e..f4621c8 100644
--- a/crypto/libxcrypt/HISTORY
+++ b/crypto/libxcrypt/HISTORY
@@ -1,4 +1,7 @@
 2023-09-02 Justin Boffemmyer <flux AT sourcemage.org>
+       * CONFIGURE: fix OBSOLETE_APIS and HASHES variables
+
+2023-09-02 Justin Boffemmyer <flux AT sourcemage.org>
        * BUILD: don't hardcode non-essential build options
        * CONFIGURE: new, user configurable build options