summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-02-04 16:42:15 +0000
committertb <>2022-02-04 16:42:15 +0000
commita97d9e9ca8287d1d19559ab919f71b5c5771caeb (patch)
tree2809f804012d6757aba28b68d82a0d66b689486c
parent71167f8b1c800e07ea68636abbb3428d1f1589df (diff)
downloadopenbsd-a97d9e9ca8287d1d19559ab919f71b5c5771caeb.tar.gz
openbsd-a97d9e9ca8287d1d19559ab919f71b5c5771caeb.tar.bz2
openbsd-a97d9e9ca8287d1d19559ab919f71b5c5771caeb.zip
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
-rw-r--r--src/lib/libcrypto/generate_pkgconfig.sh5
-rw-r--r--src/lib/libssl/generate_pkgconfig.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/generate_pkgconfig.sh b/src/lib/libcrypto/generate_pkgconfig.sh
index e03f849e76..d9ee4e79e7 100644
--- a/src/lib/libcrypto/generate_pkgconfig.sh
+++ b/src/lib/libcrypto/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $OpenBSD: generate_pkgconfig.sh,v 1.3 2021/06/08 11:19:39 inoguchi Exp $ 3# $OpenBSD: generate_pkgconfig.sh,v 1.4 2022/02/04 16:42:15 tb Exp $
4# 4#
5# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> 5# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
6# 6#
@@ -53,7 +53,8 @@ fi
53version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" 53version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p"
54#version_file=${curdir}/src/crypto/opensslv.h 54#version_file=${curdir}/src/crypto/opensslv.h
55version_file=${curdir}/opensslv.h 55version_file=${curdir}/opensslv.h
56lib_version=$(sed -nE ${version_re} ${version_file}) 56#lib_version=$(sed -nE ${version_re} ${version_file})
57lib_version=2.0.0
57 58
58# Put -I${includedir} into Cflags so configure script tests like 59# Put -I${includedir} into Cflags so configure script tests like
59# test -n "`pkg-config --cflags openssl`" 60# test -n "`pkg-config --cflags openssl`"
diff --git a/src/lib/libssl/generate_pkgconfig.sh b/src/lib/libssl/generate_pkgconfig.sh
index 4bc22c3267..e1e663f399 100644
--- a/src/lib/libssl/generate_pkgconfig.sh
+++ b/src/lib/libssl/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $OpenBSD: generate_pkgconfig.sh,v 1.10 2021/06/08 11:19:39 inoguchi Exp $ 3# $OpenBSD: generate_pkgconfig.sh,v 1.11 2022/02/04 16:42:15 tb Exp $
4# 4#
5# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> 5# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
6# 6#
@@ -52,7 +52,8 @@ fi
52 52
53version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" 53version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p"
54version_file=${curdir}/../libcrypto/opensslv.h 54version_file=${curdir}/../libcrypto/opensslv.h
55lib_version=$(sed -nE ${version_re} ${version_file}) 55#lib_version=$(sed -nE ${version_re} ${version_file})
56lib_version=2.0.0
56 57
57# Put -I${includedir} into Cflags so configure script tests like 58# Put -I${includedir} into Cflags so configure script tests like
58# test -n "`pkg-config --cflags openssl`" 59# test -n "`pkg-config --cflags openssl`"