From 9da01b88824c24b2bc453159ff18810fa978d50b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 22 May 2025 15:17:54 +0900 Subject: [PATCH] gnu: openssl: Do not version data directory. Rationale: the version 1.1.1u was captured in the phase gexp and carried over in the inherited openssl 3.0.8 package. * gnu/packages/tls.scm (openssl-1.1) [#:phases] : Remove version from openssldir value. : Adjust accordingly. Change-Id: I2795f0b57b8b8382b14e313e3741d0f1c22939ae --- gnu/packages/tls.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 3f43ab9d32..af93167f7d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -495,12 +495,10 @@ OpenSSL for TARGET." "shared" ;build shared libraries "--libdir=lib" - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. + ;; The default for this catch-all directory is PREFIX/ssl. + ;; Change that to something more conventional. (string-append "--openssldir=" #$output - "/share/openssl-" - #$(package-version this-package)) + "/share/openssl") (string-append "--prefix=" #$output) (string-append "-Wl,-rpath," (string-append #$output "/lib")) @@ -544,8 +542,7 @@ OpenSSL for TARGET." ;; Perl scripts. Remove them to avoid retaining a reference on ;; Perl. (delete-file-recursively - (string-append #$output "/share/openssl-" - #$(package-version this-package) "/misc"))))))) + (string-append #$output "/share/openssl/misc"))))))) (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE)) (synopsis "SSL/TLS implementation")