From 914ad32edff63a3105614d2803ba09726ebde24a Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Wed, 3 May 2017 08:29:14 +0000
Subject: [PATCH] libressl: update to 2.5.4.

---
 srcpkgs/libressl/patches/CVE-2017-8301.patch | 28 --------------------
 srcpkgs/libressl/template                    |  6 ++---
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/libressl/patches/CVE-2017-8301.patch

diff --git a/srcpkgs/libressl/patches/CVE-2017-8301.patch b/srcpkgs/libressl/patches/CVE-2017-8301.patch
deleted file mode 100644
index 634fd904da..0000000000
--- a/srcpkgs/libressl/patches/CVE-2017-8301.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e4ea34f17cdd3b81ab1b6bd4df3712fbe49dc136 Mon Sep 17 00:00:00 2001
-From: beck <>
-Date: Fri, 28 Apr 2017 23:03:58 +0000
-Subject: [PATCH] Revert previous change that forced consistency between return
- value and error code, since this breaks the documented API. Under certain
- circumstances this will result in incorrect successful certiticate
- verification (where a user supplied callback always returns 1, and later code
- checks the error code to potentially abort post verification)
-
---- crypto/x509/x509_vfy.c
-+++ crypto/x509/x509_vfy.c
-@@ -541,15 +541,7 @@ X509_verify_cert(X509_STORE_CTX *ctx)
- 	/* Safety net, error returns must set ctx->error */
- 	if (ok <= 0 && ctx->error == X509_V_OK)
- 		ctx->error = X509_V_ERR_UNSPECIFIED;
--
--	/*
--	 * Safety net, if user provided verify callback indicates sucess
--	 * make sure they have set error to X509_V_OK
--	 */
--	if (ctx->verify_cb != null_callback && ok == 1)
--		ctx->error = X509_V_OK;
--
--	return(ctx->error == X509_V_OK);
-+	return ok;
- }
-
- /* Given a STACK_OF(X509) find the issuer of cert (if any)
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 2824de0b6c..8529b5fc2f 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
-version=2.5.3
-revision=2
+version=2.5.4
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="OpenSSL-License, SSLeay-License, ISC"
 homepage="http://www.libressl.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30
+checksum=107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa
 
 provides="openssl-${version}_${revision}"
 replaces="openssl>=0"