[BACK]Return to rc CVS log [TXT][DIR] Up to [local] / src / etc

Diff for /src/etc/rc between version 1.521 and 1.522

version 1.521, 2017/11/05 10:29:24 version 1.522, 2017/11/06 09:04:18
Line 163 
Line 163 
 # Re-link libraries, placing the objects in a random order.  # Re-link libraries, placing the objects in a random order.
 reorder_libs() {  reorder_libs() {
         local _error=false _dkdev _liba _libas _mp _ro_list _tmpdir          local _error=false _dkdev _liba _libas _mp _ro_list _tmpdir
           local _relink=/usr/share/relink
   
         [[ $library_aslr == NO ]] && return          [[ $library_aslr == NO ]] && return
   
Line 189 
Line 190 
         done          done
   
         # Only choose the latest version of the libraries.          # Only choose the latest version of the libraries.
         for _liba in /usr/share/relink/usr/lib/lib{c,crypto}; do          for _liba in $_relink/usr/lib/lib{c,crypto}; do
                 _libas="$_libas $(ls $_liba.so.+([0-9.]).a | sort -rV | head -1)"                  _libas="$_libas $(ls $_liba.so.+([0-9.]).a | sort -rV | head -1)"
         done          done
   
         for _liba in /usr/share/relink/usr/libexec/ld.so.a $_libas; do          for _liba in $_relink/usr/libexec/ld.so.a $_libas; do
                 _tmpdir=$(mktemp -dq /usr/share/relink/_rebuild.XXXXXXXXXXXX) &&                  _tmpdir=$(mktemp -dq $_relink/_rebuild.XXXXXXXXXXXX) &&
                 (                  (
                 set -o errexit                  set -o errexit
                 _install='install -F -S -o root -g bin -m 0444'                  _install='install -F -S -o root -g bin -m 0444'
                 _lib=${_liba##*/}                  _lib=${_liba##*/}
                 _lib=${_lib%.a}                  _lib=${_lib%.a}
                 _lib_dir=${_liba#/usr/share/relink}                  _lib_dir=${_liba#$_relink}
                 _lib_dir=${_lib_dir%/*}                  _lib_dir=${_lib_dir%/*}
                 cd $_tmpdir                  cd $_tmpdir
                 ar x $_liba                  ar x $_liba
Line 223 
Line 224 
                 ) || { _error=true; break; }                  ) || { _error=true; break; }
         done          done
   
         rm -rf /usr/share/relink/_rebuild.*          rm -rf $_relink/_rebuild.*
   
         # Restore previous mount state if it was changed.          # Restore previous mount state if it was changed.
         for _mp in $_ro_list; do          for _mp in $_ro_list; do
Legend:
Removed from v.1.521  
changed lines
  Added in v.1.522