upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix sed script in ssldir split handling.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-08-17 13:15:20 +02:00
parent d88f554503
commit 51f5b3ab44
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
acx_nlnetlabs.m4
View file

@ -2,7 +2,8 @@
# Copyright 2009, Wouter Wijngaards, NLnet Labs. # Copyright 2009, Wouter Wijngaards, NLnet Labs.
# BSD licensed. # 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 # 2021-08-17 fix for openssl to detect split version, with ssldir_include
# and ssldir_lib output directories. # and ssldir_lib output directories.
# 2021-07-30 fix for openssl use of lib64 directory. # 2021-07-30 fix for openssl use of lib64 directory.
@ -660,11 +661,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
withval="" withval=""
ssldir_include="$ssldir" ssldir_include="$ssldir"
dnl find the libdir 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 if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
: # found here : # found here
else 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 if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
: # found here : # found here
else else

4
configure vendored
View file

@ -18007,11 +18007,11 @@ $as_echo_n "checking for SSL... " >&6; }
found_ssl="yes" found_ssl="yes"
withval="" withval=""
ssldir_include="$ssldir" 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 if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
: # found here : # found here
else 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 if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
: # found here : # found here
else else

1
doc/Changelog
View file

@ -2,6 +2,7 @@
- Fix that --with-ssl can use "/usr/include/openssl11" to pass the - Fix that --with-ssl can use "/usr/include/openssl11" to pass the
location of a different openssl version. location of a different openssl version.
- Fix #527: not sending quad9 cert to syslog (and may be more). - Fix #527: not sending quad9 cert to syslog (and may be more).
- Fix sed script in ssldir split handling.
16 August 2021: George 16 August 2021: George
- Merge PR #528 from fobser: Make sldns_str2wire_svcparam_buf() - Merge PR #528 from fobser: Make sldns_str2wire_svcparam_buf()