From f68c618b1d7ca7ea844c728e3579404cc9a7ab7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Sat, 24 Sep 2022 13:04:50 +0100 Subject: [PATCH] cryptsetup: update to 2.5.0. --- srcpkgs/cryptsetup/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index 40de06c9b1d3..d7595fc7c534 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,12 +1,12 @@ # Template file for 'cryptsetup' pkgname=cryptsetup -version=2.4.3 +version=2.5.0 revision=1 build_style=gnu-configure configure_args="--with-crypto_backend=openssl --enable-cryptsetup-reencrypt --enable-libargon2 $(vopt_enable pwquality)" make_check_args="-C tests" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config ruby-asciidoctor" makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel libargon2-devel libssh-devel $(vopt_if pwquality libpwquality-devel)" checkdepends="procps-ng which jq tar xz xxd" @@ -16,13 +16,19 @@ license="GPL-2.0-or-later" 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=fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 -make_check=extended +checksum=9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 subpackages="libcryptsetup cryptsetup-devel" - build_options="pwquality" desc_option_pwquality="Enable support for checking password quality via libpwquality" +if [ "$XBPS_LIBC" = "musl" ] +then + make_check=no # Test fail on musl see upstream: + # https://gitlab.com/cryptsetup/cryptsetup/-/issues/781 +else + make_check=ci-skip # tests depend on acessing /dev/mapper/control fails on CI +fi + post_patch() { if [ "$XBPS_TARGET_LIBC" = musl ]; then # Require losetup from util-linux, also failing when present