[PR PATCH] cryptsetup: update to 2.4.1.

[PR PATCH] cryptsetup: update to 2.4.1.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages cryptsetup-2.4.1
https://github.com/void-linux/void-packages/pull/33324

cryptsetup: update to 2.4.1.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/33324.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cryptsetup-2.4.1-33324.patch --]
[-- Type: text/x-diff, Size: 2246 bytes --]

From 1ccc44c9a125d8b2a2a447008eb04505a39c6ade Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 20:37:11 +0200
Subject: [PATCH] cryptsetup: update to 2.4.1.

---
 srcpkgs/cryptsetup/template | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 949a2ce214a3..25c4d699a3dd 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,14 +1,16 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.3.6
+version=2.4.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
- --enable-cryptsetup-reencrypt --enable-libargon2"
+configure_args="--with-crypto_backend=openssl --enable-cryptsetup-reencrypt
+ --enable-libargon2
+ $(vopt_enable pwquality)"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
 makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
- libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
+ libargon2-devel libssh-devel
+ $(vopt_if pwquality libpwquality-devel)"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -16,7 +18,7 @@ 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=b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f
+checksum=a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f
 make_check=extended
 subpackages="libcryptsetup cryptsetup-devel"
 
@@ -32,12 +34,13 @@ post_patch() {
 	fi
 }
 
-case $XBPS_TARGET_MACHINE in
-	*-musl)
-		configure_args+=" --enable-static-cryptsetup"
-		subpackages+=" cryptsetup-static"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" --enable-static-cryptsetup"
+	subpackages+=" cryptsetup-static"
+
+	makedepends+=" argp-standalone"
+	LDFLAGS+=" -largp"
+fi
 
 cryptsetup-static_package() {
 	short_desc+=" - static cryptsetup"

Re: [PR PATCH] [Updated] cryptsetup: update to 2.4.1.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages cryptsetup-2.4.1
https://github.com/void-linux/void-packages/pull/33324

cryptsetup: update to 2.4.1.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/33324.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cryptsetup-2.4.1-33324.patch --]
[-- Type: text/x-diff, Size: 2240 bytes --]

From 880302c24784f468484db45426a47a4ac9ee62db Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 20:37:11 +0200
Subject: [PATCH] cryptsetup: update to 2.4.1.

---
 srcpkgs/cryptsetup/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 949a2ce214a3..94f6260a1e00 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,14 +1,14 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.3.6
+version=2.4.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
- --enable-cryptsetup-reencrypt --enable-libargon2"
+configure_args="--with-crypto_backend=openssl --enable-cryptsetup-reencrypt
+ --enable-libargon2 $(vopt_enable pwquality)"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
 makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
- libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
+ libargon2-devel libssh-devel $(vopt_if pwquality libpwquality-devel)"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -16,7 +16,7 @@ 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=b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f
+checksum=a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f
 make_check=extended
 subpackages="libcryptsetup cryptsetup-devel"
 
@@ -32,12 +32,13 @@ post_patch() {
 	fi
 }
 
-case $XBPS_TARGET_MACHINE in
-	*-musl)
-		configure_args+=" --enable-static-cryptsetup"
-		subpackages+=" cryptsetup-static"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" --enable-static-cryptsetup"
+	subpackages+=" cryptsetup-static"
+
+	makedepends+=" argp-standalone"
+	LDFLAGS+=" -largp"
+fi
 
 cryptsetup-static_package() {
 	short_desc+=" - static cryptsetup"

Re: [PR PATCH] [Merged]: cryptsetup: update to 2.4.1.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

There's a merged pull request on the void-packages repository

cryptsetup: update to 2.4.1.
https://github.com/void-linux/void-packages/pull/33324

Description:
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR