cryptsetup: update 2.3.4

3 files changed, 14 insertions, 9 deletions

diff --git a/abs/core/cryptsetup/PKGBUILD b/abs/core/cryptsetup/PKGBUILD
index 4b2617f..58d0241 100644
--- a/abs/core/cryptsetup/PKGBUILD
+++ b/abs/core/cryptsetup/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id$
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=cryptsetup
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.3.4
+pkgrel=1
 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
 arch=(x86_64)
 license=('GPL')
 url='https://gitlab.com/cryptsetup/cryptsetup/'
-groups=('base')
-depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux' 'json-c' 'argon2')
+depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
+         'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so')
 makedepends=('util-linux')
+provides=('libcryptsetup.so')
 options=('!emptydirs')
 validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com>
-source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/${pkgname}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
         'hooks-encrypt'
         'install-encrypt'
         'install-sd-encrypt')
-sha256sums=('41d188092c52e23d576af41cf0cfe0555d8f7efa21598d4c57c56ea1b6d9c975'
+sha256sums=('9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773'
             'SKIP'
             '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
-            '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
-            '7891087a588ede7a5b885c439217af325c994471e821fbfbf4f4ccce47679261')
+            'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
+            '31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
diff --git a/abs/core/cryptsetup/install-encrypt b/abs/core/cryptsetup/install-encrypt
index 017ba00..4cffb4f 100644
--- a/abs/core/cryptsetup/install-encrypt
+++ b/abs/core/cryptsetup/install-encrypt
@@ -4,6 +4,7 @@ build() {
     local mod
 
     add_module "dm-crypt"
+    add_module "dm-integrity"
     if [[ $CRYPTO_MODULES ]]; then
         for mod in $CRYPTO_MODULES; do
             add_module "$mod"
diff --git a/abs/core/cryptsetup/install-sd-encrypt b/abs/core/cryptsetup/install-sd-encrypt
index 08d83d6..1cc16cf 100644
--- a/abs/core/cryptsetup/install-sd-encrypt
+++ b/abs/core/cryptsetup/install-sd-encrypt
@@ -4,6 +4,7 @@ build() {
     local mod
 
     add_module "dm-crypt"
+    add_module "dm-integrity"
     if [[ $CRYPTO_MODULES ]]; then
         for mod in $CRYPTO_MODULES; do
             add_module "$mod"
@@ -28,6 +29,9 @@ build() {
     # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
     add_binary "/usr/lib/libgcc_s.so.1"
 
+    # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5))
+    add_binary "mkswap"
+
     [[ -f /etc/crypttab.initramfs ]] && add_file "/etc/crypttab.initramfs" "/etc/crypttab"
 }