From 7d687e27c18c4f5bf7984f8a184f213602e306ad Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 6 Mar 2021 16:58:24 +0100 Subject: [PATCH 1/6] Update crypto-sdcard.spec --- rpm/crypto-sdcard.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index 00d8557b..f7488108 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -20,10 +20,10 @@ License: MIT URL: https://github.com/Olf0/%{name} Source: https://github.com/Olf0/%{name}/archive/%{version}-%{release}/%{name}-%{version}-%{release}.tar.gz # rpmbuild (as of v4.14.1) handles the Icon tag awkwardly and in contrast to the Source tag(s): -# It only accepts a GIF or XPM file (a path is stripped to its basename) in the SOURCE directory -# (but not in the tarball)! Successfully tested GIF89a and XPMv3, but an XPM icon results in -# bad visual quality and large file size. -# Hence only to be used, when the file is put there: +# It only accepts a GIF or XPM file (a path is stripped to its basename) in the SOURCES directory +# (but not inside a tarball there)! Successfully tested GIF89a and XPMv3, but an XPM icon results +# in bad visual quality and large file size. +# Hence only to be used, when the file (or a symlink to it) is put there: #Icon: smartmedia_mount.256x256.gif BuildArch: noarch Requires: systemd From c949bdde59951b5b4b18520eded93d25a0c85955 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 8 Mar 2021 19:49:48 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b1e3cc7..b3e68632 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Thus *crypto-sdcard* solely protects "data at rest" on SD-cards and other remova "Key"-file path and names are now: * For Cryptsetup LUKS: `/etc/crypto-sdcard/crypto_luks_.key` (since v0.3) * For Cryptsetup "plain": `/etc/crypto-sdcard/crypto_plain_.key` (since v0.5-7) - * A specific `` can be obtained by executing `blkid -c /dev/null -s UUID -o value /dev/` with e.g. `mmcblk1p2` as ``. + * A specific `` can be obtained by executing `blkid -s UUID -o value /dev/` with e.g. `mmcblk1p2` as ``. * v0.5
Although the installed configuration files are unaltered since v0.4-3, the spec-file ("RPM packaging") changes have been significant, so it ultimately earns an increased version number. * v0.4
From d773a33510c4dd7839f7bc3402c32df29c5c7bcb Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 14 Mar 2021 15:28:54 +0100 Subject: [PATCH 3/6] Eliminate sleep option The `ExecStartPre=/bin/sleep 1` was a workaround for a missing `After=start-user-session.service`! --- systemd/system/mount-cryptosd-luks@.service | 5 ----- 1 file changed, 5 deletions(-) diff --git a/systemd/system/mount-cryptosd-luks@.service b/systemd/system/mount-cryptosd-luks@.service index 66b9b4ad..9e9c9167 100644 --- a/systemd/system/mount-cryptosd-luks@.service +++ b/systemd/system/mount-cryptosd-luks@.service @@ -17,11 +17,6 @@ Before=alien-service-manager.service [Service] Type=oneshot RemainAfterExit=yes -# "udisksctl mount" (below) sometimes fails when issued right after -# "udisksd" (per "udisks2.service") has finished starting, as the -# udisks object for an encrypted partition has not been created yet. -# Hence one might give udisksd a second to settle: -# ExecStartPre=/bin/sleep 1 EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I From 66aaff2d226e8e000a40a1759b7014fc3f3ea4a7 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 14 Mar 2021 15:30:06 +0100 Subject: [PATCH 4/6] Eliminate sleep option The `ExecStartPre=/bin/sleep 1` was a workaround for a missing `After=start-user-session.service`! --- systemd/system/mount-cryptosd-plain@.service | 5 ----- 1 file changed, 5 deletions(-) diff --git a/systemd/system/mount-cryptosd-plain@.service b/systemd/system/mount-cryptosd-plain@.service index 7a023384..26a264f1 100644 --- a/systemd/system/mount-cryptosd-plain@.service +++ b/systemd/system/mount-cryptosd-plain@.service @@ -17,11 +17,6 @@ Before=alien-service-manager.service [Service] Type=oneshot RemainAfterExit=yes -# "udisksctl mount" (below) sometimes fails when issued right after -# "udisksd" (per "udisks2.service") has finished starting, as the -# udisks object for an encrypted partition has not been created yet. -# Hence one might give udisksd a second to settle: -# ExecStartPre=/bin/sleep 1 EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I From b43f89e7779d3a010a14cc4ac4d9a48ba6a765e3 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 14 Mar 2021 15:36:40 +0100 Subject: [PATCH 5/6] Post release version increase --- rpm/crypto-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index f7488108..aa2fe541 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -1,6 +1,6 @@ Name: crypto-sdcard Summary: Configuration files for unlocking and mounting encrypted SD-cards automatically -Version: 1.4.0 +Version: 1.4.1 # Since v1.3.1, the release version consists of two or three fields, separated by a dot ("."): # - The first field must contain a natural number greater than zero. # This number may be prefixed by one of {alpha,beta,stable}, e.g. "alpha13". From d205e3729a05342a0043113a51a5253054693ba2 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 14 Mar 2021 16:38:59 +0100 Subject: [PATCH 6/6] Post (failed) release version increase --- rpm/crypto-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index aa2fe541..e2d665d7 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -1,6 +1,6 @@ Name: crypto-sdcard Summary: Configuration files for unlocking and mounting encrypted SD-cards automatically -Version: 1.4.1 +Version: 1.4.2 # Since v1.3.1, the release version consists of two or three fields, separated by a dot ("."): # - The first field must contain a natural number greater than zero. # This number may be prefixed by one of {alpha,beta,stable}, e.g. "alpha13".