From 1f5a8593914c42f6e6a014cbf3ca84be47192381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= Date: Mon, 29 Jun 2020 12:13:43 -0400 Subject: [PATCH] contrib: update libressl Change-Id: I1256fcb763bd4982714e9205078919d0d05a1e6b --- contrib/src/libressl/SHA512SUMS | 2 +- contrib/src/libressl/rules.mak | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/src/libressl/SHA512SUMS b/contrib/src/libressl/SHA512SUMS index 1abc7f222..295564463 100644 --- a/contrib/src/libressl/SHA512SUMS +++ b/contrib/src/libressl/SHA512SUMS @@ -1 +1 @@ -e341dbce8ef3e3314a0734918e83d74f6e8f36a0b84e63dde8d3e6fda0205745ba233527339cc065da644d5f784c44aa09c56ef952f0f7de5f2f14c09016a89e portable-0974145a9e62d844b5b159cddbce36552bca30df.tar.gz +03e77a426cf269035caf745db96f3b4a402bfd7e1709ceb23cc0ee6bb6ed4ecd86372e9b46930544573e407ea2aa47cf723e54164b0b43414255562cfc234470 portable-v3.2.0.tar.gz diff --git a/contrib/src/libressl/rules.mak b/contrib/src/libressl/rules.mak index 1c6422b41..ddf56f709 100644 --- a/contrib/src/libressl/rules.mak +++ b/contrib/src/libressl/rules.mak @@ -18,9 +18,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # - -LIBRESSL_VERSION := 0974145a9e62d844b5b159cddbce36552bca30df -OPENBSD_VERSION := OPENBSD_6_3 +SSL_VERSION := 3.2.0 +LIBRESSL_VERSION := v$(SSL_VERSION) +OPENBSD_VERSION := libressl-v$(SSL_VERSION) LIBRESSL_URL := https://github.com/libressl-portable/portable/archive/$(LIBRESSL_VERSION).tar.gz OPENBSD_URL := https://github.com/libressl-portable/openbsd/archive/$(OPENBSD_VERSION).tar.gz @@ -39,7 +39,7 @@ $(TARBALLS)/openbsd-$(OPENBSD_VERSION).tar.gz: libressl: portable-$(LIBRESSL_VERSION).tar.gz openbsd-$(OPENBSD_VERSION).tar.gz $(UNPACK) - $(APPLY) $(SRC)/libressl/getpagesize.patch + mv portable-$(SSL_VERSION) portable-v$(SSL_VERSION) $(APPLY) $(SRC)/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch mv openbsd-$(OPENBSD_VERSION) $(UNPACK_DIR)/openbsd $(MOVE)