new file mode 100644

@@ -0,0 +1,72 @@

+From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001

+From: Michael Olbrich <m.olbrich@pengutronix.de>

+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

+@@ -17,6 +17,7 @@

+   along with systemd; If not, see <http://www.gnu.org/licenses/>.

+ ***/

+ 

++#include <sys/mount.h>

+ #include <sys/prctl.h>

+ 

+ #ifdef HAVE_SECCOMP

+diff --git a/src/core/manager.h b/src/core/manager.h

+index 28c5da225b1..e09e0cdf5e9 100644

+--- a/src/core/manager.h

+@@ -20,7 +20,6 @@

+   along with systemd; If not, see <http://www.gnu.org/licenses/>.

+ ***/

+ 

+-#include <libmount.h>

+ #include <stdbool.h>

+ #include <stdio.h>

+ 

+@@ -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

+@@ -23,6 +23,8 @@

+ #include <stdio.h>

+ #include <sys/epoll.h>

+ 

++#include <libmount.h>

++

+ #include "sd-messages.h"

+ 

+ #include "alloc-util.h"

@@ -1,7 +1,7 @@

 Summary:          Systemd-233

 Name:             systemd

 Version:          233

-Release:          12%{?dist}

+Release:          13%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

 URL:              http://www.freedesktop.org/wiki/Software/systemd/

 Group:            System Environment/Security

@@ -29,6 +29,7 @@ Patch11:          systemd-233-ra-improvements.patch

 Patch12:          systemd-233-link-disabled-nullptr-fix.patch

 Patch13:          systemd-228-CVE-2017-15908-dns-pkt-loop-fix.patch

 Patch14:          systemd-233-CVE-2017-18078.patch

+Patch15:          systemd-233-util-linux-build-failure.patch

 Requires:         Linux-PAM

 Requires:         libcap

@@ -97,6 +98,7 @@ sed -i "/xlocale.h/d" src/basic/parse-util.c

 %patch12 -p1

 %patch13 -p1

 %patch14 -p1

+%patch15 -p1

 sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf

@@ -245,6 +247,8 @@ rm -rf %{buildroot}/*

 %files lang -f %{name}.lang

 %changelog

+*    Wed Apr 11 2018 Xiaolin Li <xiaolinl@vmware.com>  233-13

+-    Build systemd with util-linux 2.32.

 *    Wed Mar 14 2018 Xiaolin Li <xiaolinl@vmware.com>  233-12

 -    Fix CVE-2017-18078.

 *    Thu Nov 09 2017 Vinay Kulkarni <kulkarniv@vmware.com>  233-11

@@ -1,14 +1,14 @@

 Summary:        Utilities for file systems, consoles, partitions, and messages

 Name:           util-linux

-Version:        2.29.2

-Release:        5%{?dist}

+Version:        2.32

+Release:        1%{?dist}

 URL:            http://www.kernel.org/pub/linux/utils/util-linux

 License:        GPLv2+

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        %{name}-%{version}.tar.xz

-%define sha1    util-linux=b488f185e74187a63b55baef9d3f48d5b1780118

+%define sha1    util-linux=4a21387d51f73bab44230c3bf9fe5a291e761111

 BuildRequires:  ncurses-devel

 %if %{with_check}

 BuildRequires:  ncurses-terminfo

@@ -97,6 +97,8 @@ rm -rf %{buildroot}/lib/systemd/system

 %{_mandir}/man3/*

 %changelog

+*   Mon Apr 09 2018 Xiaolin Li <xiaolinl@vmware.com> 2.32-1

+-   Update to version 2.32, fix CVE-2018-7738

 *   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 2.29.2-5

 -   Added conflicts toybox

 *   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 2.29.2-4