From nobody Tue Dec 14 19:13:34 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 51C5918E45ED; Tue, 14 Dec 2021 19:13:35 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JD7MM0CvKz4rJk; Tue, 14 Dec 2021 19:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB76E5DE0; Tue, 14 Dec 2021 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEJDYjF095992; Tue, 14 Dec 2021 19:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEJDYCx095991; Tue, 14 Dec 2021 19:13:34 GMT (envelope-from git) Date: Tue, 14 Dec 2021 19:13:34 GMT Message-Id: <202112141913.1BEJDYCx095991@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 00935ff28f32 - main - security/openssl: Update to 1.1.1m List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00935ff28f32fc509d93045002cebfa4baf81d87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639509215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SR3OfWlM28IfvX9fbJ2VWJEkxOFx5uH92Iv2g1t0eP0=; b=pSXMzGUilUwMXJkGLMUEXZpf/DQHgxJOeROv0qFeDrdwS2G9geNToDWOGMDTOojRHPp9iH KecSCpl152W/iwPui5OtVZGgvNyCe4cHY2TdzbJcUQp59FjI13mjMx41QfNRGluLsG+Tev /5ysJ/EXVQiCxBRji0jnsbNdBouJAcsJPP8L2PFM56RV/CUyON8/GMGPYU/MwCoFruMfxi kvCT8Llq1kq2AgQGRYAYeeeB/7RC8yADfiHAGjtT0OP3K+BqfKinGvi/aPilTxwheFu9AE s8uqbwkNvNqHogIGKOymtT/IF2YPv+AUdNasAGJDO5Pc2F6V6dTjGKn0g/wALA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639509215; a=rsa-sha256; cv=none; b=gB5mTErNBsAEhw+rETmQETMWBZ3A8caKgX1z1Zn4WMjCfUJnSwmcqqjiHDotzWRm/Z55HU cRRueLPiXwLTNSDkEym8fVF3RJE7bXXkW7VWTACaR4KBW7s02pENnBuodwKPdq43dB/TTj XK9o5soFmaC8kt6hGtV2APJRR7GwVO3xoOtaj088FUFoS23lN8jt5xgVrn05nH9C3g9Wtz B36m3A7NqcC++PFUT75lk6qba1R0JmUKqZ/ooZuis1hEhpM5CAmQXYgNfq8h9jMCoXBNOb ONaIf4fgKrsAiLnkCv5UWsd9iNMXVbpF8mylHYmrl7y/GE2dbOVrFtK0fAUggQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=00935ff28f32fc509d93045002cebfa4baf81d87 commit 00935ff28f32fc509d93045002cebfa4baf81d87 Author: Bernard Spil AuthorDate: 2021-12-14 19:13:32 +0000 Commit: Bernard Spil CommitDate: 2021-12-14 19:13:32 +0000 security/openssl: Update to 1.1.1m --- security/openssl/Makefile | 3 +-- security/openssl/distinfo | 6 ++--- security/openssl/files/patch-D33061 | 53 ------------------------------------- 3 files changed, 4 insertions(+), 58 deletions(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 93fb54f8b5bc..d0b156e605ea 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,8 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -PORTVERSION= 1.1.1l -PORTREVISION= 1 +PORTVERSION= 1.1.1m PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/distinfo b/security/openssl/distinfo index ea60c25fc735..5c822ac8126a 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629816807 -SHA256 (openssl-1.1.1l.tar.gz) = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 -SIZE (openssl-1.1.1l.tar.gz) = 9834044 +TIMESTAMP = 1639508375 +SHA256 (openssl-1.1.1m.tar.gz) = f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 +SIZE (openssl-1.1.1m.tar.gz) = 9847315 diff --git a/security/openssl/files/patch-D33061 b/security/openssl/files/patch-D33061 deleted file mode 100644 index 2a917ab079c9..000000000000 --- a/security/openssl/files/patch-D33061 +++ /dev/null @@ -1,53 +0,0 @@ -Upstream: - * https://github.com/openssl/openssl/pull/17079 - * https://github.com/openssl/openssl/pull/17084 - - ---- Configurations/10-main.conf.orig 2021-08-24 13:38:47.000000000 +0000 -+++ Configurations/10-main.conf 2021-11-18 21:12:30.060493000 +0000 -@@ -988,6 +988,13 @@ - perlasm_scheme => "elf", - }, - -+ "BSD-aarch64" => { -+ inherit_from => [ "BSD-generic64", asm("aarch64_asm") ], -+ lib_cppflags => add("-DL_ENDIAN"), -+ bn_ops => "SIXTY_FOUR_BIT_LONG", -+ perlasm_scheme => "linux64", -+ }, -+ - "bsdi-elf-gcc" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], - CC => "gcc", ---- crypto/armcap.c.orig 2021-08-24 13:38:47 UTC -+++ crypto/armcap.c -@@ -106,20 +106,23 @@ static unsigned long getauxval(unsigned long key) - * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas - * AArch64 used AT_HWCAP. - */ -+# ifndef AT_HWCAP -+# define AT_HWCAP 16 -+# endif -+# ifndef AT_HWCAP2 -+# define AT_HWCAP2 26 -+# endif - # if defined(__arm__) || defined (__arm) --# define HWCAP 16 -- /* AT_HWCAP */ -+# define HWCAP AT_HWCAP - # define HWCAP_NEON (1 << 12) - --# define HWCAP_CE 26 -- /* AT_HWCAP2 */ -+# define HWCAP_CE AT_HWCAP2 - # define HWCAP_CE_AES (1 << 0) - # define HWCAP_CE_PMULL (1 << 1) - # define HWCAP_CE_SHA1 (1 << 2) - # define HWCAP_CE_SHA256 (1 << 3) - # elif defined(__aarch64__) --# define HWCAP 16 -- /* AT_HWCAP */ -+# define HWCAP AT_HWCAP - # define HWCAP_NEON (1 << 1) - - # define HWCAP_CE HWCAP