From owner-svn-src-user@freebsd.org Sat May 25 03:18:42 2019
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 354531596425
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 25 May 2019 03:18:42 +0000 (UTC)
(envelope-from gordon@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)
server-signature RSA-PSS (4096 bits)
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 CCA378B2AE;
Sat, 25 May 2019 03:18:41 +0000 (UTC)
(envelope-from gordon@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 A592B26450;
Sat, 25 May 2019 03:18:41 +0000 (UTC)
(envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4P3Ifmi019788;
Sat, 25 May 2019 03:18:41 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4P3IfEg019787;
Sat, 25 May 2019 03:18:41 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <201905250318.x4P3IfEg019787@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sat, 25 May 2019 03:18:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r348263 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: user/cperciva/freebsd-update-build/scripts
X-SVN-Commit-Revision: 348263
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: CCA378B2AE
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.98 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_SHORT(-0.98)[-0.982,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 May 2019 03:18:42 -0000
Author: gordon
Date: Sat May 25 03:18:41 2019
New Revision: 348263
URL: https://svnweb.freebsd.org/changeset/base/348263
Log:
Fix for newer versions of openssl.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Sat May 25 01:59:24 2019 (r348262)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Sat May 25 03:18:41 2019 (r348263)
@@ -196,7 +196,7 @@ encryptkey () {
KEYOWNER=${SUDO_USER:-${USER}}
echo "Encrypting signing key for ${KEYOWNER}"
- openssl enc -aes-256-cbc \
+ openssl enc -aes-256-cbc -md md5 \
-in ${PRIVKEYDIR}/priv.ssl \
-out ${KEYDIR}/priv.ssl-${KEYOWNER}
}
@@ -206,7 +206,7 @@ decryptkey () {
KEYOWNER=${SUDO_USER:-${USER}}
echo "Decrypting signing key for ${KEYOWNER}"
- openssl enc -d -aes-256-cbc \
+ openssl enc -d -aes-256-cbc -md md5 \
-in ${KEYDIR}/priv.ssl-${KEYOWNER} \
-out ${PRIVKEYDIR}/priv.ssl
}