From 938cc31da497eebb0005d9a4ed76447128fca4bc Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 4 Feb 2022 16:42:15 +0000 Subject: [PATCH] Bump libressl's version in pkgconfig to 2.0.0 LibreSSL's pc files effectively hardcode the version to 1.0.0 since LibreSSL exists. That probably never made much sense. This causes some pain for ports that "need 'openssl' ['>= +1.1.0'] found '1.0.0'" or similar while they would build perfectly fine with LibreSSL. This only affects OpenBSD. We do not put the actual LibreSSL version in there since it may cause trouble Discussed with sthen, millert, inoguchi, beck over the past year. Diff from/ok sthen --- lib/libcrypto/generate_pkgconfig.sh | 5 +++-- lib/libssl/generate_pkgconfig.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libcrypto/generate_pkgconfig.sh b/lib/libcrypto/generate_pkgconfig.sh index e03f849e761..d9ee4e79e79 100644 --- a/lib/libcrypto/generate_pkgconfig.sh +++ b/lib/libcrypto/generate_pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: generate_pkgconfig.sh,v 1.3 2021/06/08 11:19:39 inoguchi Exp $ +# $OpenBSD: generate_pkgconfig.sh,v 1.4 2022/02/04 16:42:15 tb Exp $ # # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse # @@ -53,7 +53,8 @@ fi version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" #version_file=${curdir}/src/crypto/opensslv.h version_file=${curdir}/opensslv.h -lib_version=$(sed -nE ${version_re} ${version_file}) +#lib_version=$(sed -nE ${version_re} ${version_file}) +lib_version=2.0.0 # Put -I${includedir} into Cflags so configure script tests like # test -n "`pkg-config --cflags openssl`" diff --git a/lib/libssl/generate_pkgconfig.sh b/lib/libssl/generate_pkgconfig.sh index 4bc22c3267f..e1e663f399d 100644 --- a/lib/libssl/generate_pkgconfig.sh +++ b/lib/libssl/generate_pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: generate_pkgconfig.sh,v 1.10 2021/06/08 11:19:39 inoguchi Exp $ +# $OpenBSD: generate_pkgconfig.sh,v 1.11 2022/02/04 16:42:15 tb Exp $ # # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse # @@ -52,7 +52,8 @@ fi version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" version_file=${curdir}/../libcrypto/opensslv.h -lib_version=$(sed -nE ${version_re} ${version_file}) +#lib_version=$(sed -nE ${version_re} ${version_file}) +lib_version=2.0.0 # Put -I${includedir} into Cflags so configure script tests like # test -n "`pkg-config --cflags openssl`" -- 2.20.1