diff --git a/srcpkgs/cryptsetup/patches/libressl-2.7.patch b/srcpkgs/cryptsetup/patches/libressl-2.7.patch deleted file mode 100644 index 03ece58371e..00000000000 --- a/srcpkgs/cryptsetup/patches/libressl-2.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 81c2685f21f..a7a51bc036e 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup -version=2.0.3 -revision=2 +version=2.0.4 +revision=1 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt" @@ -11,10 +11,10 @@ makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel short_desc="Setup virtual encryption devices under Linux dm-crypt" maintainer="Juan RP " license="GPL-2.0-or-later" -changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes" homepage="https://gitlab.com/cryptsetup/cryptsetup" +changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes" distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4 +checksum=9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734 build_options="pwquality" desc_option_pwquality="Enable support for checking password quality via libpwquality" @@ -37,6 +37,7 @@ libcryptsetup_package() { vmove "usr/lib/*.so.*" } } + cryptsetup-devel_package() { depends="libcryptsetup>=${version}_${revision}" short_desc+=" - development files"