commit 427d42e00051a5f364e2e7e8fe76dac63207be69
Author: Jan Rękorajski <[email protected]>
Date: Thu Sep 7 20:30:38 2017 +0200
- fix crypt root setup
- rel 2
cryptsetup-fix-infinite-timeout-6486.patch | 42 ++++++++++++++++++++++++++++++
systemd.spec | 4 ++-
2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/systemd.spec b/systemd.spec
index 889f10b..07f5d2e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -26,7 +26,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla
Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are
incompatible/breaking changes very often)
Version: 234
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -74,6 +74,7 @@ Patch13: sysctl.patch
Patch14: pld-pam-%{name}-user.patch
Patch15: %{name}-seccomp_disable_on_i386.patch
Patch16: %{name}-path.patch
+Patch17: cryptsetup-fix-infinite-timeout-6486.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -640,6 +641,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
cp -p %{SOURCE2} src/systemd_booted.c
diff --git a/cryptsetup-fix-infinite-timeout-6486.patch
b/cryptsetup-fix-infinite-timeout-6486.patch
new file mode 100644
index 0000000..860d816
--- /dev/null
+++ b/cryptsetup-fix-infinite-timeout-6486.patch
@@ -0,0 +1,42 @@
+From c64c6a8b259abfbff5ce202d5d5982b120cf928f Mon Sep 17 00:00:00 2001
+From: Andrew Soutar <[email protected]>
+Date: Mon, 31 Jul 2017 02:19:16 -0400
+Subject: [PATCH] cryptsetup: fix infinite timeout (#6486)
+
+0004f698d causes `arg_timeout` to be infinity instead of 0 when timeout=0. The
+logic here now matches this change.
+
+Fixes #6381
+
+(cherry picked from commit 0864d311766498563331f486909a0d950ba7de87)
+---
+ src/cryptsetup/cryptsetup.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index 3b4c086162..08ed7e53ba 100644
+--- a/src/cryptsetup/cryptsetup.c
++++ b/src/cryptsetup/cryptsetup.c
+@@ -56,7 +56,7 @@ static bool arg_tcrypt_veracrypt = false;
+ static char **arg_tcrypt_keyfiles = NULL;
+ static uint64_t arg_offset = 0;
+ static uint64_t arg_skip = 0;
+-static usec_t arg_timeout = 0;
++static usec_t arg_timeout = USEC_INFINITY;
+
+ /* Options Debian's crypttab knows we don't:
+
+@@ -670,10 +670,10 @@ int main(int argc, char *argv[]) {
+ if (arg_discards)
+ flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+
+- if (arg_timeout > 0)
+- until = now(CLOCK_MONOTONIC) + arg_timeout;
+- else
++ if (arg_timeout == USEC_INFINITY)
+ until = 0;
++ else
++ until = now(CLOCK_MONOTONIC) + arg_timeout;
+
+ arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/427d42e00051a5f364e2e7e8fe76dac63207be69
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
