From 15d33d7afad3353b2f05e9bcdb793ea0aaeb033c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Mon, 23 Apr 2018 17:16:26 +0200
Subject: [PATCH] cryptsetup: fix libressl-2.7

Import patches from Alpine.
---
 srcpkgs/cryptsetup/patches/flush-stdout.patch | 17 +++++++++++++++++
 srcpkgs/cryptsetup/patches/libressl-2.7.patch | 13 +++++++++++++
 srcpkgs/cryptsetup/template                   |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cryptsetup/patches/flush-stdout.patch
 create mode 100644 srcpkgs/cryptsetup/patches/libressl-2.7.patch

diff --git a/srcpkgs/cryptsetup/patches/flush-stdout.patch b/srcpkgs/cryptsetup/patches/flush-stdout.patch
new file mode 100644
index 00000000000..ae21a235f5a
--- /dev/null
+++ b/srcpkgs/cryptsetup/patches/flush-stdout.patch
@@ -0,0 +1,17 @@
+--- ./src/utils_tools.c.orig	2014-10-24 12:58:35.151717616 -0200
++++ ./src/utils_tools.c	2014-10-24 13:00:42.716855265 -0200
+@@ -105,10 +105,13 @@
+ 
+ 	case CRYPT_LOG_NORMAL:
+ 		fputs(msg, stdout);
++		fflush(stdout);
+ 		break;
+ 	case CRYPT_LOG_VERBOSE:
+-		if (opt_verbose)
++		if (opt_verbose) {
+ 			fputs(msg, stdout);
++			fflush(stdout);
++		}
+ 		break;
+ 	case CRYPT_LOG_ERROR:
+ 		fputs(msg, stderr);
diff --git a/srcpkgs/cryptsetup/patches/libressl-2.7.patch b/srcpkgs/cryptsetup/patches/libressl-2.7.patch
new file mode 100644
index 00000000000..03ece58371e
--- /dev/null
+++ b/srcpkgs/cryptsetup/patches/libressl-2.7.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/crypto_backend/crypto_openssl.c b/lib/crypto_backend/crypto_openssl.c
+index 4929f82..463c3dd 100644
+--- ./lib/crypto_backend/crypto_openssl.c
++++ ./lib/crypto_backend/crypto_openssl.c
+@@ -52,7 +52,7 @@ struct crypt_hmac {
+ /*
+  * Compatible wrappers for OpenSSL < 1.1.0
+  */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ static void openssl_backend_init(void)
+ {
+ 	OpenSSL_add_all_algorithms();
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index ec6c3e95ca7..1f7eec8be10 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,7 +1,7 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.0.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt"