Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f8986f28c72e6adb54f38e73c6b10c808812b5c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f8986f28c72e6adb54f38e73c6b10c808812b5c6)
  • Date: Fri, 23 Apr 2021 18:11:51 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/libressl/HISTORY | 3 +++
crypto/libressl/INSTALL | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit f8986f28c72e6adb54f38e73c6b10c808812b5c6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libressl: Fix installation of openssl.cnf for 3.3

Reported-by: Pavel Vinogradov <vin.public AT gmail.com>

diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index 981621f..5d48b2b 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,6 @@
+2021-04-23 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: fixed installation of openssl.cnf for 3.3
+
2021-04-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated LIBRESSL_BRANCH=devel to 3.3.2

diff --git a/crypto/libressl/INSTALL b/crypto/libressl/INSTALL
index ff69530..0bcd374 100755
--- a/crypto/libressl/INSTALL
+++ b/crypto/libressl/INSTALL
@@ -1,9 +1,10 @@
default_install &&

local SSL_CONFDIR="$INSTALL_ROOT/etc/ssl" &&
-
-if [[ ! -d "$SSL_CONFDIR" ]]; then
- install -vm 755 -d "$SSL_CONFDIR"
-fi &&
-
-install_config_file apps/openssl/openssl.cnf "$SSL_CONFDIR/openssl.cnf"
+install -vm 755 -d "$SSL_CONFDIR" &&
+for i in {,apps/{,openssl/}}openssl.cnf; do
+ if [ -e "$i" ]; then
+ install_config_file "$i" "$SSL_CONFDIR"
+ break
+ fi
+done



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f8986f28c72e6adb54f38e73c6b10c808812b5c6), Ismael Luceno, 04/23/2021

Archive powered by MHonArc 2.6.24.

Top of Page