summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormwberry2017-01-15 13:08:14 -0800
committermwberry2017-01-15 13:23:33 -0800
commit259d6ee7303a1014bc4fc33b057a3012e64c10dd (patch)
tree7b1cbd26c9566d081c1a7a3572e84976b4b234e5
parent23afef4bfe7db11fd0cbad9f320e4821f422c6f7 (diff)
downloadaur-259d6ee7303a1014bc4fc33b057a3012e64c10dd.tar.gz
add detached LUKS header support
-rw-r--r--PKGBUILD6
-rw-r--r--header_support.patch9
2 files changed, 14 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3a91164590de..23dca56aa0cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=cryptsetup-keyscript
cryptsetupver=1.7.2
pkgver=${cryptsetupver}.keyscript
-pkgrel=1
+pkgrel=2
pkgdesc="Patched cryptsetup that supports invoking a script to obtain passphrase"
arch=(i686 x86_64)
license=('GPL')
@@ -20,6 +20,7 @@ source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-${cryp
encrypt_install
sd-encrypt
keyscript.patch
+ header_support.patch
)
validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com>
sha256sums=('dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342'
@@ -28,11 +29,14 @@ sha256sums=('dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342'
'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd'
'ddcd30cd99f4731dbfab987812cd6e83c87e2c45666cfbaf3fd31c127640681a'
+ 'b1b1367ea91a8aae922fd0b53b4c6153ac3154b2f426b488d985b0e1cc637520'
)
prepare() {
patch --follow-symlinks encrypt_hook keyscript.patch
+ patch --follow-symlinks encrypt_hook header_support.patch
rm keyscript.patch
+ rm header_support.patch
}
build() {
diff --git a/header_support.patch b/header_support.patch
new file mode 100644
index 000000000000..f81695e21247
--- /dev/null
+++ b/header_support.patch
@@ -0,0 +1,9 @@
+@@ -54,6 +54,8 @@ EOF
+ allow-discards)
+ cryptargs="${cryptargs} --allow-discards"
+ ;;
++ header=*)
++ cryptargs="${cryptargs} --header=${cryptopt#header=}"
+ *)
+ echo "Encryption option '${cryptopt}' not known, ignoring." >&2
+ ;;