From owner-svn-src-vendor@freebsd.org Wed Dec 9 02:11:59 2020 Return-Path: Delivered-To: svn-src-vendor@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 7578C4B3329; Wed, 9 Dec 2020 02:11:59 +0000 (UTC) (envelope-from jkim@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 4CrLCM2w53z3kkr; Wed, 9 Dec 2020 02:11:59 +0000 (UTC) (envelope-from jkim@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 56F5C1E938; Wed, 9 Dec 2020 02:11:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B92Bxij003191; Wed, 9 Dec 2020 02:11:59 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B92Bxcq003190; Wed, 9 Dec 2020 02:11:59 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202012090211.0B92Bxcq003190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 9 Dec 2020 02:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r368474 - vendor-crypto/openssl/dist X-SVN-Group: vendor-crypto X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: vendor-crypto/openssl/dist X-SVN-Commit-Revision: 368474 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 02:11:59 -0000 Author: jkim Date: Wed Dec 9 02:11:58 2020 New Revision: 368474 URL: https://svnweb.freebsd.org/changeset/base/368474 Log: Update OpenSSL upgrade procedure. Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade ============================================================================== --- vendor-crypto/openssl/dist/FREEBSD-upgrade Wed Dec 9 02:07:01 2020 (r368473) +++ vendor-crypto/openssl/dist/FREEBSD-upgrade Wed Dec 9 02:11:58 2020 (r368474) @@ -11,7 +11,7 @@ First, read http://wiki.freebsd.org/SubversionPrimer/V # Xlist setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist setenv FSVN "svn+ssh://repo.freebsd.org/base" -setenv OSSLVER 1.1.1h +setenv OSSLVER 1.1.1i ###setenv OSSLTAG v`echo ${OSSLVER} | tr . _` @@ -64,16 +64,11 @@ cd secure/lib/libcrypto # Regen assembly files if necessary make -f Makefile.asm all -mv *.[Ss] ${MACHINE_CPUARCH} +mv *.S sys/crypto/openssl/${MACHINE_CPUARCH} make -f Makefile.asm clean - -# Regen manual pages -make man-makefile-update && make man-update -cd ../libssl -make man-makefile-update && make man-update -cd ../../usr.bin/openssl -make man-makefile-update && make man-update cd ../../.. + +# Regen manual pages and update makefiles accordingly # Commit! svn ci crypto/openssl secure/lib/libcrypto secure/lib/libssl secure/usr.bin/openssl