Browse Source

Refresh patch queue and packaging

* cherry-pick.v9-2-gdc292ff.dont-attempt-to-create-temporary-files-in-the-user-s-home-directory.patch:
  Was cherry-picked
* typo-fixes.patch: Applied upstreeam
Christoph Biedl 5 years ago
parent
commit
9c56b763ce

+ 1 - 0
debian/clevis-luks.install

@@ -1,4 +1,5 @@
 
 usr/bin/clevis-bind-luks
 usr/bin/clevis-luks-bind
+usr/bin/clevis-luks-unbind
 usr/bin/clevis-luks-unlock

+ 1 - 0
debian/clevis-luks.manpages

@@ -2,3 +2,4 @@
 debian/tmp/usr/share/man/man1/clevis-luks-bind.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-unbind.1

+ 2 - 2
debian/clevis-tpm2.install

@@ -1,3 +1,3 @@
 
-usr/bin/clevis-decrypt-tpm2
-usr/bin/clevis-encrypt-tpm2
+src/clevis-decrypt-tpm2 usr/bin/
+src/clevis-encrypt-tpm2 usr/bin/

+ 1 - 1
debian/clevis-tpm2.manpages

@@ -1,2 +1,2 @@
 
-debian/tmp/usr/share/man/man1/clevis-encrypt-tpm2.1
+doc/clevis-encrypt-tpm2.1

+ 1 - 1
debian/control

@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 10~),
     libudisks2-dev,
     pkg-config,
     systemd,
-    tpm2-tools,
     tang,
+    tpm2-tools,
 Priority: optional
 Section: net
 

+ 0 - 39
debian/patches/cherry-pick.v9-2-gdc292ff.dont-attempt-to-create-temporary-files-in-the-user-s-home-directory.patch

@@ -1,39 +0,0 @@
-Subject: Don't attempt to create temporary files in the user's home directory
-Origin: v9-2-gdc292ff
-Upstream-Author: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue Feb 20 16:51:10 2018 +0100
-
-    To use the tpm2 pin, some temporary files need to be created due how the
-    tpm2-tools work. Currently they are created in the user's home directory
-    but the commands can be executed by a user that doesn't have a home dir.
-    
-    So it's better to just create the temporary directory in /tmp, which is
-    mktemp default. The mktemp default permissions are u+rwx anyways, so it
-    isn't less secure to have the temp dir at /tmp instead of the home dir.
-    
-    Fixes: #30
-    
-    Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-
---- a/src/clevis-decrypt-tpm2
-+++ b/src/clevis-decrypt-tpm2
-@@ -82,7 +82,7 @@
-     exit 1
- fi
- 
--if ! TMP=`mktemp -d -p ~`; then
-+if ! TMP=`mktemp -d`; then
-     echo "Creating a temporary dir for TPM files failed!" >&2
-     exit 1
- fi
---- a/src/clevis-encrypt-tpm2
-+++ b/src/clevis-encrypt-tpm2
-@@ -92,7 +92,7 @@
-     exit 1
- fi
- 
--if ! TMP=`mktemp -d -p ~`; then
-+if ! TMP=`mktemp -d`; then
-     echo "Creating a temporary dir for TPM files failed!" >&2
-     exit 1
- fi

+ 0 - 2
debian/patches/series

@@ -1,5 +1,3 @@
-cherry-pick.v9-2-gdc292ff.dont-attempt-to-create-temporary-files-in-the-user-s-home-directory.patch
-typo-fixes.patch
 test-exec-path.patch
 disable-dracut-check.patch
 fix-manpage-add-name.patch

+ 0 - 27
debian/patches/typo-fixes.patch

@@ -1,27 +0,0 @@
-Description: Typo fixes
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2018-02-24
-Forwarded: https://github.com/latchset/clevis/issues/32
-
---- a/doc/clevis-encrypt-tpm2.1
-+++ b/doc/clevis-encrypt-tpm2.1
-@@ -26,7 +26,7 @@
- .fi
- .PP
- The pin has reasonable defaults for its configuration, but a different
--hierarchy, hash, and key algorithms can be choosen if the defaults used
-+hierarchy, hash, and key algorithms can be chosen if the defaults used
- are not suitable:
- .IP
- .nf
---- a/doc/clevis.1
-+++ b/doc/clevis.1
-@@ -98,7 +98,7 @@
- .fi
- .PP
- The pin has reasonable defaults for its configuration, but a different
--hierarchy, hash, and key algorithms can be choosen if the defaults used
-+hierarchy, hash, and key algorithms can be chosen if the defaults used
- are not suitable.
- .PP
- Decryption also works similar to other pins, only the JWE needs to be

+ 3 - 3
debian/patches/use-socat.patch

@@ -12,15 +12,15 @@ Forwarded: not-needed
 
 --- a/src/dracut/module-setup.sh.in
 +++ b/src/dracut/module-setup.sh.in
-@@ -48,7 +48,7 @@
+@@ -46,7 +46,7 @@
          mktemp \
          curl \
          jose \
 -        nc
 +        socat
  
-     dracut_need_initqueue
- }
+     for cmd in clevis-decrypt-tpm2 \
+ 	tpm2_createprimary \
 --- a/src/systemd/clevis-luks-askpass
 +++ b/src/systemd/clevis-luks-askpass
 @@ -56,7 +56,7 @@