Browse Source

Refresh patch queue

* cherry-pick.v8-1-g69524aa.fix-typo-in-libaudit-requirement.patch
  was cherry-pick from upstream, deleted here
* use-socat.patch
  Follow code change
Christoph Biedl 6 years ago
parent
commit
969b162a1d

+ 0 - 16
debian/patches/cherry-pick.v8-1-g69524aa.fix-typo-in-libaudit-requirement.patch

@@ -1,16 +0,0 @@
-Subject: Fix typo in libaudit requirement
-Origin: v8-1-g69524aa
-Upstream-Author: Nathaniel McCallum <npmccallum@redhat.com>
-Date: Tue Nov 14 10:24:35 2017 -0500
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@
- PKG_CHECK_MODULES([jose], [jose >= 8])
- PKG_CHECK_MODULES([systemd], [systemd])
- PKG_CHECK_MODULES([dracut], [dracut])
--PKG_CHECK_MODULES([audit], [audit >> 2.7.8])
-+PKG_CHECK_MODULES([audit], [audit >= 2.7.8])
- 
- AC_CHECK_PROG([PWMAKE], [pwmake], [yes])
- test -n "$PWMAKE" || AC_MSG_ERROR([pwmake required!])

+ 0 - 1
debian/patches/series

@@ -1,4 +1,3 @@
-cherry-pick.v8-1-g69524aa.fix-typo-in-libaudit-requirement.patch
 test-exec-path.patch
 disable-dracut-check.patch
 fix-manpage-add-name.patch

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

@@ -12,8 +12,8 @@ Forwarded: not-needed
 
 --- a/src/dracut/module-setup.sh.in
 +++ b/src/dracut/module-setup.sh.in
-@@ -43,7 +43,7 @@
-         clevis \
+@@ -48,7 +48,7 @@
+         mktemp \
          curl \
          jose \
 -        nc
@@ -23,12 +23,12 @@ Forwarded: not-needed
  }
 --- a/src/systemd/clevis-luks-askpass
 +++ b/src/systemd/clevis-luks-askpass
-@@ -41,7 +41,7 @@
-         [ "$uuid" != "$UUID" ] && continue
+@@ -56,7 +56,7 @@
+             metadata=true
  
-         if pt="`luksmeta load -d $d -s $slot -u $UUID | clevis decrypt`"; then
--            echo -n "+$pt" | nc -U -u --send-only "$s"
-+            echo -n "+$pt" | socat -U "UNIX:$s" -
-             break
-         fi
-     done
+             if pt="`luksmeta load -d $d -s $slot -u $UUID | clevis decrypt`"; then
+-                echo -n "+$pt" | nc -U -u --send-only "$s"
++                echo -n "+$pt" | socat -U "UNIX:$s" -
+                 unlocked=true
+                 break
+             fi