From bab4cdb45c1a2887b3f48778155db694fb14ba51 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 16 Mar 2017 23:19:28 +0100 Subject: [PATCH] cryptsetup: update to 1.7.4 --- srcpkgs/cryptsetup/patches/libressl.patch | 11 ----------- srcpkgs/cryptsetup/template | 9 +++++---- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/cryptsetup/patches/libressl.patch diff --git a/srcpkgs/cryptsetup/patches/libressl.patch b/srcpkgs/cryptsetup/patches/libressl.patch deleted file mode 100644 index 1766b3fb2a6..00000000000 --- a/srcpkgs/cryptsetup/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto_backend/crypto_openssl.c.orig 2016-10-28 10:58:10.000000000 +0200 -+++ lib/crypto_backend/crypto_openssl.c 2016-10-31 02:17:52.154628201 +0100 -@@ -73,7 +73,7 @@ - /* - * Compatible wrappers for OpenSSL < 1.1.0 - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - static EVP_MD_CTX *EVP_MD_CTX_new(void) - { - EVP_MD_CTX *md = malloc(sizeof(*md)); diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index a123bb5eea6..0ed9afb6313 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,17 +1,18 @@ # Template file for 'cryptsetup' pkgname=cryptsetup -version=1.7.3 +version=1.7.4 revision=1 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)" hostmakedepends="pkg-config" -makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel $(vopt_if pwquality libpwquality-devel)" +makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel + $(vopt_if pwquality libpwquality-devel)" short_desc="Setup virtual encryption devices under Linux dm-crypt" maintainer="Juan RP " -license="GPL-3" +license="GPL-2" homepage="https://gitlab.com/cryptsetup/cryptsetup" distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz" -checksum=af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 +checksum=7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 build_options="pwquality" desc_option_pwquality="Enable support for checking password quality via libpwquality"