From owner-svn-src-all@freebsd.org Mon Jun 1 18:58:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD0FF33EF10; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bPZV475Mz4SNC; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88DCF100D5; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051IwAtH092333; Mon, 1 Jun 2020 18:58:10 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051Iw9ED092330; Mon, 1 Jun 2020 18:58:09 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202006011858.051Iw9ED092330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 1 Jun 2020 18:58:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361700 - in head: etc/mtree secure/lib/libcrypto secure/lib/libcrypto/engines X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: etc/mtree secure/lib/libcrypto secure/lib/libcrypto/engines X-SVN-Commit-Revision: 361700 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 18:58:10 -0000 Author: tijl Date: Mon Jun 1 18:58:09 2020 New Revision: 361700 URL: https://svnweb.freebsd.org/changeset/base/361700 Log: Install 32-bit libcrypto engines in /usr/lib32/engines instead of /usr/lib32 and let 32-bit libcrypto search that location instead of /usr/lib/engines. Reviewed by: jkim Modified: head/etc/mtree/BSD.lib32.dist head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/engines/Makefile.inc Modified: head/etc/mtree/BSD.lib32.dist ============================================================================== --- head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:43:51 2020 (r361699) +++ head/etc/mtree/BSD.lib32.dist Mon Jun 1 18:58:09 2020 (r361700) @@ -8,6 +8,8 @@ lib32 dtrace .. + engines + .. geom .. i18n Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -75,7 +75,7 @@ CFLAGS+= -DPOLY1305_ASM .if defined(LIB) CFLAGS+= -DOPENSSLDIR="\"/etc/ssl\"" -CFLAGS+= -DENGINESDIR="\"/usr/lib/engines\"" +CFLAGS+= -DENGINESDIR="\"${LIBDIR}/engines\"" .endif CFLAGS+= -DNDEBUG Modified: head/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:43:51 2020 (r361699) +++ head/secure/lib/libcrypto/engines/Makefile.inc Mon Jun 1 18:58:09 2020 (r361700) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /usr/lib/engines +SHLIBDIR= ${LIBDIR}/engines LCRYPTO_SRC= ${SRCTOP}/crypto/openssl