Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1590229926190030"
MIME-Version: 1.0
Date: Sat, 23 May 2020 10:32:06 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/security/openssl
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20200523103206.7D7C1FC2E@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1590229926190030
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Sat May 23 10:32:06 UTC 2020

Modified Files:
	pkgsrc/security/openssl: distinfo
Added Files:
	pkgsrc/security/openssl/patches: patch-Configurations_shared-info.pl

Log Message:
openssl: Unbreak Darwin installs after --libdir change.

Adding --libdir seems innocuous enough, but due to OpenSSL's crazy complicated
build system actually results in LIBDIR becoming unset, which trickles down to
the Darwin -install_name being wrong.  This broke the 'openssl' command and
thus many many dependencies.

Switch to $(libdir) instead which appears to still be set correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/openssl/patches/patch-Configurations_shared-info.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1590229926190030
Content-Disposition: inline
Content-Length: 2125
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.141 pkgsrc/security/openssl/distinfo:1.142
--- pkgsrc/security/openssl/distinfo:1.141	Thu Apr 30 11:21:57 2020
+++ pkgsrc/security/openssl/distinfo	Sat May 23 10:32:06 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.141 2020/04/30 11:21:57 nia Exp $
+$NetBSD: distinfo,v 1.142 2020/05/23 10:32:06 jperkin Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
 SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
+SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
 SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956

Added files:

Index: pkgsrc/security/openssl/patches/patch-Configurations_shared-info.pl
diff -u /dev/null pkgsrc/security/openssl/patches/patch-Configurations_shared-info.pl:1.1
--- /dev/null	Sat May 23 10:32:06 2020
+++ pkgsrc/security/openssl/patches/patch-Configurations_shared-info.pl	Sat May 23 10:32:06 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Configurations_shared-info.pl,v 1.1 2020/05/23 10:32:06 jperkin Exp $
+
+Specifying --libdir makes LIBDIR empty and breaks library names.
+
+--- Configurations/shared-info.pl.orig	2020-04-21 12:22:39.000000000 +0000
++++ Configurations/shared-info.pl
+@@ -44,7 +44,7 @@ my %shared_info;
+     'darwin-shared' => {
+         module_ldflags        => '-bundle',
+         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',
+-        shared_sonameflag     => '-install_name $(INSTALLTOP)/$(LIBDIR)/',
++        shared_sonameflag     => '-install_name $(libdir)/',
+     },
+     'cygwin-shared' => {
+         shared_ldflag         => '-shared -Wl,--enable-auto-image-base',


--_----------=_1590229926190030--