summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2017-12-04 21:21:01 +0100
committerMike Gilbert <floppym@gentoo.org>2017-12-06 19:18:29 -0500
commita68d4d6d99bce54902f408696f239223decc25b2 (patch)
tree33ff5b136d22f9662754a93107bdf83c7c59e2de /sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
parentmedia-video/vlc: Drop obsolete vlc-cache-gen --force option (diff)
downloadgentoo-a68d4d6d99bce54902f408696f239223decc25b2.tar.gz
gentoo-a68d4d6d99bce54902f408696f239223decc25b2.tar.bz2
gentoo-a68d4d6d99bce54902f408696f239223decc25b2.zip
sys-apps/systemd: remove unused patches
Diffstat (limited to 'sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch')
-rw-r--r--sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch b/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
deleted file mode 100644
index 8ea131adfd07..000000000000
--- a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 793c786f470aeedf443686cff30f97acaff23a04 Mon Sep 17 00:00:00 2001
-From: Andrew Soutar <andrew@andrewsoutar.com>
-Date: Mon, 31 Jul 2017 02:19:16 -0400
-Subject: [PATCH 2/3] 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
----
- 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 3b4c08616..08ed7e53b 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));
-
---
-2.14.0
-