Browse Source

Updates for upstream version 15

* Refresh patches
* More programs for clevis luks
Christoph Biedl 3 months ago
parent
commit
eef0218c70

+ 3 - 0
debian/clevis-luks.install

@@ -1,6 +1,9 @@
 
 usr/bin/clevis-luks-bind
 usr/bin/clevis-luks-common-functions
+usr/bin/clevis-luks-edit
 usr/bin/clevis-luks-list
+usr/bin/clevis-luks-regen
+usr/bin/clevis-luks-report
 usr/bin/clevis-luks-unbind
 usr/bin/clevis-luks-unlock

+ 3 - 0
debian/clevis-luks.manpages

@@ -4,3 +4,6 @@ debian/tmp/usr/share/man/man1/clevis-luks-unbind.1
 debian/tmp/usr/share/man/man1/clevis-luks-unlock.1
 debian/tmp/usr/share/man/man7/clevis-luks-unlockers.7
 debian/tmp/usr/share/man/man1/clevis-luks-list.1
+debian/tmp/usr/share/man/man1/clevis-luks-edit.1
+debian/tmp/usr/share/man/man1/clevis-luks-regen.1
+debian/tmp/usr/share/man/man1/clevis-luks-report.1

+ 8 - 11
debian/patches/upstream.embed-more-programs-in-initram.patch

@@ -2,27 +2,24 @@ Subject: Embed more programs in the initramfs/initrd
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date:  2020-05-21
 Bug: https://github.com/latchset/clevis/issues/195
+Last-Update: 2020-11-22
 
 --- a/src/initramfs-tools/hooks/clevis.in
 +++ b/src/initramfs-tools/hooks/clevis.in
-@@ -59,6 +59,9 @@
- copy_exec @bindir@/clevis-decrypt-tang || die 1 "@bindir@/clevis-decrypt-tang not found"
- copy_exec @bindir@/clevis-decrypt-sss || die 1 "@bindir@/clevis-decrypt-sss not found"
+@@ -61,6 +61,7 @@
  copy_exec @bindir@/clevis-decrypt || die 1 "@bindir@/clevis-decrypt not found"
-+copy_exec @bindir@/clevis-luks-common-functions || die 1 "/usr/bin/clevis-luks-common-functions not found"
-+copy_exec @bindir@/clevis-luks-list || die 1 "/usr/bin/clevis-luks-list not found"
-+copy_exec @bindir@/clevis-luks-unlock || die 1 "/usr/bin/clevis-luks-unlock not found"
+ copy_exec @bindir@/clevis-luks-common-functions || die 1 "@bindir@/clevis-luks-common-functions not found"
+ copy_exec @bindir@/clevis-luks-list || die 1 "@bindir@/clevis-luks-list not found"
++copy_exec @bindir@/clevis-luks-unlock || die 1 "@bindir@/clevis-luks-unlock not found"
  if [ -x @bindir@/clevis-decrypt-tpm2 ]; then
      copy_exec @bindir@/clevis-decrypt-tpm2 || die 1 "@bindir@/clevis-decrypt-tpm2 not found"
      tpm2_creatprimary_bin=$(find_binary "tpm2_createprimary")
 --- a/src/luks/systemd/dracut/clevis/module-setup.sh.in
 +++ b/src/luks/systemd/dracut/clevis/module-setup.sh.in
-@@ -31,6 +31,9 @@
- 	/etc/services \
-         @libexecdir@/clevis-luks-askpass \
+@@ -41,6 +41,7 @@
+         grep sed cut \
          clevis-decrypt \
-+        clevis-luks-common-functions \
-+        clevis-luks-list \
+         clevis-luks-list \
 +        clevis-luks-unlock \
          cryptsetup \
          luksmeta \

+ 1 - 1
debian/patches/upstream.embed-tpm-modules-in-initramfs.patch

@@ -5,7 +5,7 @@ Bug: https://github.com/latchset/clevis/issues/194
 
 --- a/src/initramfs-tools/hooks/clevis.in
 +++ b/src/initramfs-tools/hooks/clevis.in
-@@ -72,6 +72,8 @@
+@@ -74,6 +74,8 @@
              copy_exec "${_LIBRARY}" || die 2 "Unable to copy ${_LIBRARY}"
          fi
      done