From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B877C1382C5 for ; Mon, 26 Mar 2018 21:17:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91AA3E08F1; Mon, 26 Mar 2018 21:17:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52DF4E08F1 for ; Mon, 26 Mar 2018 21:17:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 339F4335C06 for ; Mon, 26 Mar 2018 21:17:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7316258 for ; Mon, 26 Mar 2018 21:17:32 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1522099043.9463c487ae1bf6a960ea83fafcda88b17c90ef06.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/238-libmount-include.patch sys-apps/systemd/systemd-236-r5.ebuild sys-apps/systemd/systemd-237-r3.ebuild sys-apps/systemd/systemd-238-r1.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9463c487ae1bf6a960ea83fafcda88b17c90ef06 X-VCS-Branch: master Date: Mon, 26 Mar 2018 21:17:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e3a5be5f-2d3d-42e5-94c0-75ea6f6ee6cd X-Archives-Hash: 7883051ba610e93b2c41cfa62f9c8079 commit: 9463c487ae1bf6a960ea83fafcda88b17c90ef06 Author: Mike Gilbert gentoo org> AuthorDate: Mon Mar 26 21:17:04 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Mar 26 21:17:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9463c487 sys-apps/systemd: fix build with util-linux-2.32 Closes: https://bugs.gentoo.org/651304 Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 sys-apps/systemd/files/238-libmount-include.patch | 72 +++++++++++++++++++++++ sys-apps/systemd/systemd-236-r5.ebuild | 1 + sys-apps/systemd/systemd-237-r3.ebuild | 1 + sys-apps/systemd/systemd-238-r1.ebuild | 1 + 4 files changed, 75 insertions(+) diff --git a/sys-apps/systemd/files/238-libmount-include.patch b/sys-apps/systemd/files/238-libmount-include.patch new file mode 100644 index 00000000000..6a02dff65e4 --- /dev/null +++ b/sys-apps/systemd/files/238-libmount-include.patch @@ -0,0 +1,72 @@ +From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Mon, 26 Mar 2018 17:34:53 +0200 +Subject: [PATCH] core: don't include libmount.h in a header file (#8580) + +linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* +definitions. + +To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h +should be included. And missing.h must be included last. + +Without this, building systemd may fail with: + +In file included from [...]/libmount/libmount.h:31:0, + from ../systemd-238/src/core/manager.h:23, + from ../systemd-238/src/core/emergency-action.h:37, + from ../systemd-238/src/core/unit.h:34, + from ../systemd-238/src/core/dbus-timer.h:25, + from ../systemd-238/src/core/timer.c:26: +[...]/sys/mount.h:57:2: error: expected identifier before numeric constant +--- + src/core/dbus-execute.c | 1 + + src/core/manager.h | 3 ++- + src/core/mount.c | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 7344623ebf6..c342093bca4 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -18,6 +18,7 @@ + along with systemd; If not, see . + ***/ + ++#include + #include + #include + +diff --git a/src/core/manager.h b/src/core/manager.h +index 28c5da225b1..e09e0cdf5e9 100644 +--- a/src/core/manager.h ++++ b/src/core/manager.h +@@ -20,7 +20,6 @@ + along with systemd; If not, see . + ***/ + +-#include + #include + #include + +@@ -34,6 +33,8 @@ + #include "list.h" + #include "ratelimit.h" + ++struct libmnt_monitor; ++ + /* Enforce upper limit how many names we allow */ + #define MANAGER_MAX_NAMES 131072 /* 128K */ + +diff --git a/src/core/mount.c b/src/core/mount.c +index 0e755da5c02..0154ebda5d6 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include ++ + #include "sd-messages.h" + + #include "alloc-util.h" diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild index ed62d0a6f44..aed2113e91a 100644 --- a/sys-apps/systemd/systemd-236-r5.ebuild +++ b/sys-apps/systemd/systemd-236-r5.ebuild @@ -148,6 +148,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) diff --git a/sys-apps/systemd/systemd-237-r3.ebuild b/sys-apps/systemd/systemd-237-r3.ebuild index 466126ca683..d0254ee71db 100644 --- a/sys-apps/systemd/systemd-237-r3.ebuild +++ b/sys-apps/systemd/systemd-237-r3.ebuild @@ -150,6 +150,7 @@ src_unpack() { src_prepare() { local PATCHES=( "${FILESDIR}/237-0001-networkctl-display-type.patch" + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild index 2898aa322ed..2903bb82e51 100644 --- a/sys-apps/systemd/systemd-238-r1.ebuild +++ b/sys-apps/systemd/systemd-238-r1.ebuild @@ -150,6 +150,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch" "${FILESDIR}/238-0002-core-do-not-free-heap-allocated-strings-8391.patch" + "${FILESDIR}/238-libmount-include.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )