gentoo resync : 09.12.2017

4 files changed, 0 insertions, 167 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index affba23a763a..113b2717ca1b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,9 +6,6 @@ AUX 233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch 16209 BL
 AUX 233-CVE-2017-9445.patch 5491 BLAKE2B 9c0e252dbbc273481fde939ef90be1d61046a8c4ae9c288d9aca0167322d669750c7545f572386ddefe2b666ecc26e79fe9f143109946a0be9e0eb6fd002f280 SHA512 16308657911dc3f85520d6de0ee85f04afed1a7940a8a23ece641af2b3766e44e88d8de21cb53afd4db7b8ad8324eeed2860009f3fcc05a227f0c6faafbf351f
 AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
 AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
-AUX 234-0002-cryptsetup-fix-infinite-timeout-6486.patch 1469 BLAKE2B 3b198510a1959aab8f639f11ead425938accf3d71d28f2e57e9a049a83352516c3e3dfbbb45726019b85860e6f3ff8a7965a831506668deacd8b4409b32a1fed SHA512 05ea81aa275921c5c9673e02a2da7c6c3bb43809fc5b6d0c51036735f502b58d062e553973055e964a66d667ffc8869e325323c9cf4347c2622227ed27f30be5
-AUX 234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch 4075 BLAKE2B 6caca60f48869c9a37d71ef2f5d79e29b4afa518f52f41287e782622dd3509f3ed5c1024c3c781cd01fa79c599c00264874c3f5cb8d2877e59218de9b8c83ba7 SHA512 1c5c882d0306d7f0663c8a31faba72601da8f159a2eea2a84e12416f473321be829268edf6db3aace7c3590b2f3b85afedd61fd3993346717b2fb0e8452d8ab2
-AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 BLAKE2B 86af8b6520cd7839efb76553552a35969fdb6061939e8672f98e7b2ed243745abe5752b950a7fb78cbbc10d7d6f3ab12da4581366d0b436db7e1cb0d7f6b0128 SHA512 b791f49036981cb6e91d8597e7c0433549208afb661fdbc9631dd66a868cdb0741847bf7188c514179c3a920721568e65f09a38ca9e133ca7226bfad6f4aa1c2
 AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
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
-
diff --git a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch b/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
deleted file mode 100644
index e083f854107e..000000000000
--- a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 47d36aeaebc3083795de40c80e75f0fda48c3053 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 21 Jul 2017 07:51:07 -0400
-Subject: [PATCH 3/3] resolved: make sure idn2 conversions are roundtrippable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-While working on the gateway→_gateway conversion, I noticed that
-libidn2 strips the leading underscore in some names.
-https://gitlab.com/libidn/libidn2/issues/30 was resolved in
-https://gitlab.com/libidn/libidn2/commit/05d753ea69e2308cd02436d0511f4b844071dc79,
-which disabled "STD3 ASCII rules" by default, i.e. disabled stripping
-of underscores. So the situation is that with previously released libidn2
-versions we would get incorrect behaviour, and once new libidn2 is released,
-we should be OK.
-
-Let's implement a simple test which checks that the name survives the
-roundtrip, and if it doesn't, skip IDN resolution. Under old libidn2 this will
-fail in more cases, and under new libidn2 in fewer, but should be the right
-thing to do also under new libidn2.
----
- src/shared/dns-domain.c    | 29 ++++++++++++++++++++++++++---
- src/test/test-dns-domain.c |  6 ++++++
- 2 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index 12c4d65dd..139d286af 100644
---- a/src/shared/dns-domain.c
-+++ b/src/shared/dns-domain.c
-@@ -1274,15 +1274,38 @@ int dns_name_apply_idna(const char *name, char **ret) {
- 
- #if defined(HAVE_LIBIDN2)
-         int r;
-+        _cleanup_free_ char *t = NULL;
- 
-         assert(name);
-         assert(ret);
- 
--        r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) ret,
-+        r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) &t,
-                            IDN2_NFC_INPUT | IDN2_NONTRANSITIONAL);
--        if (r == IDN2_OK)
-+        log_debug("idn2_lookup_u8: %s → %s", name, t);
-+        if (r == IDN2_OK) {
-+                if (!startswith(name, "xn--")) {
-+                        _cleanup_free_ char *s = NULL;
-+
-+                        r = idn2_to_unicode_8z8z(t, &s, 0);
-+                        if (r != IDN2_OK) {
-+                                log_debug("idn2_to_unicode_8z8z(\"%s\") failed: %d/%s",
-+                                          t, r, idn2_strerror(r));
-+                                return 0;
-+                        }
-+
-+                        if (!streq_ptr(name, s)) {
-+                                log_debug("idn2 roundtrip failed: \"%s\" → \"%s\" → \"%s\", ignoring.",
-+                                          name, t, s);
-+                                return 0;
-+                        }
-+                }
-+
-+                *ret = t;
-+                t = NULL;
-                 return 1; /* *ret has been written */
--        log_debug("idn2_lookup_u8(\"%s\") failed: %s", name, idn2_strerror(r));
-+        }
-+
-+        log_debug("idn2_lookup_u8(\"%s\") failed: %d/%s", name, r, idn2_strerror(r));
-         if (r == IDN2_2HYPHEN)
-                 /* The name has two hypens — forbidden by IDNA2008 in some cases */
-                 return 0;
-diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
-index 11cf0b1f0..cbd2d1e65 100644
---- a/src/test/test-dns-domain.c
-+++ b/src/test/test-dns-domain.c
-@@ -652,6 +652,12 @@ static void test_dns_name_apply_idna(void) {
-         test_dns_name_apply_idna_one("föö.bär.", ret, "xn--f-1gaa.xn--br-via");
-         test_dns_name_apply_idna_one("xn--f-1gaa.xn--br-via", ret, "xn--f-1gaa.xn--br-via");
- 
-+        test_dns_name_apply_idna_one("_443._tcp.fedoraproject.org", ret2,
-+                                     "_443._tcp.fedoraproject.org");
-+        test_dns_name_apply_idna_one("_443", ret2, "_443");
-+        test_dns_name_apply_idna_one("gateway", ret, "gateway");
-+        test_dns_name_apply_idna_one("_gateway", ret2, "_gateway");
-+
-         test_dns_name_apply_idna_one("r3---sn-ab5l6ne7.googlevideo.com", ret2,
-                                      ret2 ? "r3---sn-ab5l6ne7.googlevideo.com" : "");
- }
--- 
-2.14.0
-
diff --git a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
deleted file mode 100644
index 97230f9dd2ae..000000000000
--- a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f7d27d130eaac222b2d11c4d4415c9b599934da8 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 26 Aug 2017 15:19:26 +0200
-Subject: [PATCH] logind: make sure we don't process the same method call twice
- (#6583)
-
-Tiny mistake, big effect.
-
-Fixes: #6375
----
- src/login/logind-session-dbus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index 22e5349a6..649f3c155 100644
---- a/src/login/logind-session-dbus.c
-+++ b/src/login/logind-session-dbus.c
-@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, void *userdata, sd_bus_er
-                 goto error;
- 
-         session_save(s);
--        return 0;
-+        return 1;
- 
- error:
-         session_device_free(sd);
--- 
-2.14.1
-