From: W.C.A. Wijngaards Date: Tue, 17 Aug 2021 11:15:20 +0000 (+0200) Subject: - Fix sed script in ssldir split handling. X-Git-Tag: release-1.14.0rc1~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51f5b3ab44cb84815384e633a7a966c39050b65d;p=thirdparty%2Funbound.git - Fix sed script in ssldir split handling. --- diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4 index ed3cdb067..1574f97bf 100644 --- a/acx_nlnetlabs.m4 +++ b/acx_nlnetlabs.m4 @@ -2,7 +2,8 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 42 +# Version 43 +# 2021-08-17 fix sed script in ssldir split handling. # 2021-08-17 fix for openssl to detect split version, with ssldir_include # and ssldir_lib output directories. # 2021-07-30 fix for openssl use of lib64 directory. @@ -660,11 +661,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [ withval="" ssldir_include="$ssldir" dnl find the libdir - ssldir_lib=`echo $ssldir | sed -e '/include/lib/'` + ssldir_lib=`echo $ssldir | sed -e 's/include/lib/'` if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then : # found here else - ssldir_lib=`echo $ssldir | sed -e '/include/lib64/'` + ssldir_lib=`echo $ssldir | sed -e 's/include/lib64/'` if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then : # found here else diff --git a/configure b/configure index 186a13bfa..03e8fb5fd 100755 --- a/configure +++ b/configure @@ -18007,11 +18007,11 @@ $as_echo_n "checking for SSL... " >&6; } found_ssl="yes" withval="" ssldir_include="$ssldir" - ssldir_lib=`echo $ssldir | sed -e '/include/lib/'` + ssldir_lib=`echo $ssldir | sed -e 's/include/lib/'` if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then : # found here else - ssldir_lib=`echo $ssldir | sed -e '/include/lib64/'` + ssldir_lib=`echo $ssldir | sed -e 's/include/lib64/'` if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then : # found here else diff --git a/doc/Changelog b/doc/Changelog index 103fb37cb..c02c5d319 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - Fix that --with-ssl can use "/usr/include/openssl11" to pass the location of a different openssl version. - Fix #527: not sending quad9 cert to syslog (and may be more). + - Fix sed script in ssldir split handling. 16 August 2021: George - Merge PR #528 from fobser: Make sldns_str2wire_svcparam_buf()