sys-apps/systemd: more fixes for gcc 9

Closes: https://bugs.gentoo.org/685534
Package-Manager: Portage-2.3.67_p4, Repoman-2.3.13_p3
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-apps/systemd/files/242-gcc-9.patch b/sys-apps/systemd/files/242-gcc-9.patch
index e12d657182389054ae9bc32d491559b754d7469f..e9f690a65be514ccc0b5a020d86050545a5722d8 100644 (file)
--- a/sys-apps/systemd/files/242-gcc-9.patch
+++ b/sys-apps/systemd/files/242-gcc-9.patch
@@ -33,3 +33,131 @@ index 533193ac932..6fc82940033 100644
          else
                  log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
  
+From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2019 10:31:01 -0400
+Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
+
+Fixes: https://github.com/systemd/systemd/issues/12534
+---
+ src/shared/machine-image.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6b9d8fb97a6..6a6d952b424 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -201,11 +201,13 @@ static int image_make(
+                 Image **ret) {
+ 
+         _cleanup_free_ char *pretty_buffer = NULL;
++        _cleanup_free_ char *cwd = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+ 
+         assert(dfd >= 0 || dfd == AT_FDCWD);
++        assert(path || dfd == AT_FDCWD);
+         assert(filename);
+ 
+         /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
+@@ -221,6 +223,9 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
++        if (!path)
++                safe_getcwd(&cwd);
++
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+                 (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
+@@ -359,7 +364,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -373,13 +378,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }
+From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 24 May 2019 10:54:09 +0200
+Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
+ first argument is specified
+
+A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
+---
+ src/shared/machine-image.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6a6d952b424..55e5f08f91e 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -200,8 +200,7 @@ static int image_make(
+                 const struct stat *st,
+                 Image **ret) {
+ 
+-        _cleanup_free_ char *pretty_buffer = NULL;
+-        _cleanup_free_ char *cwd = NULL;
++        _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+@@ -223,8 +222,12 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
+-        if (!path)
+-                safe_getcwd(&cwd);
++        if (!path) {
++                if (dfd == AT_FDCWD)
++                        (void) safe_getcwd(&parent);
++                else
++                        (void) fd_get_path(dfd, &parent);
++        }
+ 
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+@@ -364,7 +367,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -378,13 +381,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }