===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.507
retrieving revision 1.508
diff -c -r1.507 -r1.508
*** src/etc/rc	2017/07/04 19:02:11	1.507
--- src/etc/rc	2017/07/17 12:02:53	1.508
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.507 2017/07/04 19:02:11 rpe Exp $
  
  # System startup script run by init on autoboot or after single-user.
  # Output and error are redirected to console by init, and the console is the
--- 1,4 ----
! #	$OpenBSD: rc,v 1.508 2017/07/17 12:02:53 tb Exp $
  
  # System startup script run by init on autoboot or after single-user.
  # Output and error are redirected to console by init, and the console is the
***************
*** 158,164 ****
  
  # Re-link libraries, placing the objects in a random order.
  reorder_libs() {
! 	local _dkdev _l _liba _libas _mp _tmpdir _remount=false _error=false
  
  	[[ $library_aslr == NO ]] && return
  
--- 158,164 ----
  
  # Re-link libraries, placing the objects in a random order.
  reorder_libs() {
! 	local _dkdev _liba _libas _mp _tmpdir _remount=false _error=false
  
  	[[ $library_aslr == NO ]] && return
  
***************
*** 171,183 ****
  	echo -n 'reordering libraries:'
  
  	# Only choose the latest version of the libraries.
! 	for _liba in /usr/lib/libc.so.*.a /usr/lib/libcrypto.so.*.a; do
! 		_liba=$(ls ${_liba%%.[0-9]*}*.a | sort -V | tail -1)
! 		for _l in $_libas; do
! 			[[ $_l == $_liba ]] && continue 2
! 		done
! 		_libas="$_libas $_liba"
  	done
  
  	# Remount read-write, if /usr/lib is on a read-only ffs filesystem.
  	if [[ $_mp == *' type ffs '*'read-only'* ]]; then
--- 171,180 ----
  	echo -n 'reordering libraries:'
  
  	# Only choose the latest version of the libraries.
! 	for _liba in /usr/lib/lib{c,crypto}; do
! 		_libas="$_libas $(ls $_liba.so.+([0-9.]).a | sort -V | tail -1)"
  	done
+ 	_libas=${_libas# }
  
  	# Remount read-write, if /usr/lib is on a read-only ffs filesystem.
  	if [[ $_mp == *' type ffs '*'read-only'* ]]; then