cryptsetup: fix libressl-2.7

Import patches from Alpine.
This commit is contained in:
Enno Boland 2018-04-23 17:16:26 +02:00
parent d0f0155fac
commit 15d33d7afa
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
3 changed files with 31 additions and 1 deletions

View File

@ -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);

View File

@ -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();

View File

@ -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"