[arch-commits] Commit in cryptsetup/trunk (3 files)

Christian Hesse eworm at gemini.archlinux.org
Mon Oct 25 19:46:24 UTC 2021


    Date: Monday, October 25, 2021 @ 19:46:24
  Author: eworm
Revision: 426543

upgpkg: cryptsetup 2.4.1-2: update mkinitcpio hooks

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/install-encrypt
  cryptsetup/trunk/install-sd-encrypt

--------------------+
 PKGBUILD           |    6 +++---
 install-encrypt    |   19 +++++++++----------
 install-sd-encrypt |   35 ++++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-25 19:45:58 UTC (rev 426542)
+++ PKGBUILD	2021-10-25 19:46:24 UTC (rev 426543)
@@ -3,7 +3,7 @@
 
 pkgname=cryptsetup
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
 arch=(x86_64)
 license=('GPL')
@@ -21,8 +21,8 @@
 sha256sums=('a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f'
             'SKIP'
             '29a3f1db5b86a8e6b7c914125e2c46711d6d5985bbf4089e158e06af551c8307'
-            'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
-            '46af2f1353db1909fc483f20e3fa1e13f1e7c0d14f44c0d6163ce0862916c613')
+            '3ac12ef90e1f022dec37a9913809a5e3c19a42b1b85ec3cca706a7d9b79ffc88'
+            'b616470eebbda8edf2a8cb0cd265cada5f03f9a6096683a01974f3812ab9c0f0')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}

Modified: install-encrypt
===================================================================
--- install-encrypt	2021-10-25 19:45:58 UTC (rev 426542)
+++ install-encrypt	2021-10-25 19:46:24 UTC (rev 426543)
@@ -3,25 +3,24 @@
 build() {
     local mod
 
-    add_module "dm-crypt"
-    add_module "dm-integrity"
+    add_module 'dm-crypt'
+    add_module 'dm-integrity'
     if [[ $CRYPTO_MODULES ]]; then
         for mod in $CRYPTO_MODULES; do
             add_module "$mod"
         done
     else
-        add_all_modules "/crypto/"
+        add_all_modules '/crypto/'
     fi
 
-    add_binary "cryptsetup"
-    add_binary "dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+    map add_udev_rule \
+        '10-dm.rules' \
+        '13-dm-disk.rules' \
+        '95-dm-notify.rules' \
+        '/usr/lib/initcpio/udev/11-dm-initramfs.rules'
 
     # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
-    add_binary "/usr/lib/libgcc_s.so.1"
+    add_binary '/usr/lib/libgcc_s.so.1'
 
     add_runscript
 }

Modified: install-sd-encrypt
===================================================================
--- install-sd-encrypt	2021-10-25 19:45:58 UTC (rev 426542)
+++ install-sd-encrypt	2021-10-25 19:46:24 UTC (rev 426543)
@@ -3,32 +3,33 @@
 build() {
     local mod
 
-    add_module "dm-crypt"
-    add_module "dm-integrity"
+    add_module 'dm-crypt'
+    add_module 'dm-integrity'
     if [[ $CRYPTO_MODULES ]]; then
         for mod in $CRYPTO_MODULES; do
             add_module "$mod"
         done
     else
-        add_all_modules "/crypto/"
+        add_all_modules '/crypto/'
     fi
-    add_checked_modules "/drivers/char/tpm/"
+    add_checked_modules '/drivers/char/tpm/'
 
-    add_udev_rule "10-dm.rules"
-    add_udev_rule "13-dm-disk.rules"
-    add_udev_rule "60-fido-id.rules"
-    add_udev_rule "95-dm-notify.rules"
-    add_udev_rule "/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+    map add_udev_rule \
+        '10-dm.rules' \
+        '13-dm-disk.rules' \
+        '60-fido-id.rules' \
+        '95-dm-notify.rules' \
+        '/usr/lib/initcpio/udev/11-dm-initramfs.rules'
 
-    add_systemd_unit "cryptsetup.target"
-    add_binary "/usr/lib/systemd/system-generators/systemd-cryptsetup-generator"
-    add_binary "/usr/lib/systemd/systemd-cryptsetup"
+    add_systemd_unit 'cryptsetup.target'
+    add_binary '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator'
+    add_binary '/usr/lib/systemd/systemd-cryptsetup'
 
-    add_systemd_unit "systemd-ask-password-console.path"
-    add_systemd_unit "systemd-ask-password-console.service"
+    add_systemd_unit 'systemd-ask-password-console.path'
+    add_systemd_unit 'systemd-ask-password-console.service'
 
     # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
-    add_binary "/usr/lib/libgcc_s.so.1"
+    add_binary '/usr/lib/libgcc_s.so.1'
 
     # add libraries dlopen()ed by systemd-cryptsetup
     for LIB in fido2 tss2-{{esys,rc,mu},tcti-'*'}; do
@@ -42,9 +43,9 @@
     done
 
     # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5))
-    add_binary "mkswap"
+    add_binary 'mkswap'
 
-    [[ -f /etc/crypttab.initramfs ]] && add_file "/etc/crypttab.initramfs" "/etc/crypttab"
+    [[ -f /etc/crypttab.initramfs ]] && add_file '/etc/crypttab.initramfs' '/etc/crypttab'
 }
 
 help() {



More information about the arch-commits mailing list