Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 ChangeLog             |    5 +++++
 libs/readline/HISTORY |    6 ++++++
 libs/readline/INSTALL |    8 ++++++--
 protect_special_libs  |    7 ++++---
 4 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit a6bf56c8701fedabf2da034f08e178914eb49b83
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    readline: Re-setup .5 and .6 .so files otherwise stable-0.62 -> test
    
    breaks as stable grimoire is still on readline 6.3.
    Symlink target as relative path for protect_special_files copy to not
    refer to /lib files which no longer exist.
    
    Tested with and without castfs upgrading readline from 6.3 (stable-0.62) 
to 8.0 (test).
    Requires export LD_LIBRARY_PATH fix for protect_special_libs functions.

commit 4dfb58481a40cc25f35f56387c9fba1365546f6c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    protect_special_libs: Export LD_LIBRARY_PATH to include $PROTECT path
    
    Otherwise $PROTECT does nothing effective (e.g. when readline updates)
    even with `ldconfig $PROTECT` being run

diff --git a/ChangeLog b/ChangeLog
index 49f0098..791f082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-30 Eric Sandall <sandalle AT sourcemage.org>
+       * protect_special_libs: Export LD_LIBRARY_PATH to include $PROTECT 
path
+         Otherwise $PROTECT does nothing effective (e.g. when readline 
updates)
+         even with `ldconfig $PROTECT` being run.
+
 2019-05-27 Treeve Jelbert <treeve AT sourcemage.org>
        * accounts, group: add sndiod
 
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 582e10b..cc4cbb6 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,9 @@
+2019-05-30 Eric Sandall <sandalle AT sourceamge.org>
+       * INSTALL: Re-setup .5 and .6 .so files otherwise stable-0.62 -> test
+         breaks as stable grimoire is still on readline 6.3.
+         Symlink target as relative path for protect_special_files copy to 
not
+         refer to /lib files which no longer exist.
+
 2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
        * FINAL: don't run ldconfig on non-glibc systems
 
diff --git a/libs/readline/INSTALL b/libs/readline/INSTALL
index 1998911..565f269 100755
--- a/libs/readline/INSTALL
+++ b/libs/readline/INSTALL
@@ -1,8 +1,12 @@
 make install DESTDIR="$INSTALL_ROOT"  &&
 # also symlink old version, to keep bash working during an upgrade
+pushd "$INSTALL_ROOT/lib"  &&
 for i in readline history; do
-  ln -vsf "$TRACK_ROOT/lib/lib$i.so.$VERSION" "$INSTALL_ROOT/lib/lib$i.so.7"
-done
+  ln -vsf "lib$i.so.$VERSION" "$INSTALL_ROOT/lib/lib$i.so.7" # grimoire: 
test-201609
+  ln -vsf "lib$i.so.$VERSION" "$INSTALL_ROOT/lib/lib$i.so.6" # grimoire: 
stable-0.62
+  ln -vsf "lib$i.so.$VERSION" "$INSTALL_ROOT/lib/lib$i.so.5" # grimoire: 
stable-0.62
+done  &&
+popd  &&
 
 # install inputrc stuff to have better key mappings in console
 if [[ "$INSTALL_INPUTRC" == y ]]; then
diff --git a/protect_special_libs b/protect_special_libs
index f453260..ef696a4 100644
--- a/protect_special_libs
+++ b/protect_special_libs
@@ -14,15 +14,16 @@ if [[ -z $INSTALL_ROOT ]]; then
   local each  &&
   for each in /lib{,64,32}/*; do
     if test -f "$each"; then
-      cp -a "$each" $PROTECT
+      cp -a "$each" "$PROTECT"
     fi
   done  &&
-  ldconfig $PROTECT
+  export LD_LIBRARY_PATH="${PROTECT}:${LD_LIBRARY_PATH}" &&
+  ldconfig "$PROTECT"
  }
 fi
 
 # some spells, such as glibc may need some special processing between calls 
to
-# these two fucnctions
+# these two functions
 
 do_dispel() {
   message "${MESSAGE_COLOR}Dispelling $SPELL${DEFAULT_COLOR}" &&