Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/util-linux.git#1c853c1f4ba6f4afeb9009710e49f0783af53720

login-default-motd-file.patch

@@ -0,0 +1,13 @@
+diff --git a/include/pathnames.h b/include/pathnames.h
+index 3845d4c33..fac3a0783 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -41,7 +41,7 @@
+ #ifndef _PATH_MAILDIR
+ # define _PATH_MAILDIR		"/var/spool/mail"
+ #endif
+-#define	_PATH_MOTDFILE		"/usr/share/misc/motd:/run/motd:/etc/motd"
++#define	_PATH_MOTDFILE		"/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d"
+ #ifndef _PATH_NOLOGIN
+ # define _PATH_NOLOGIN		"/etc/nologin"
+ #endif

util-linux.spec

@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.36.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: http://en.wikipedia.org/wiki/Util-linux
 
@@ -110,6 +110,9 @@ Patch0: login-lastlog-create.patch
 Patch1: libmount-remove-read-mountinfo-workaround.patch
 # usptream patch, https://github.com/karelzak/util-linux/issues/1193
 Patch2: libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
+# Add `/run/motd.d` to the hardcoded MOTD_FILE
+# https://github.com/coreos/console-login-helper-messages/issues/60
+Patch3: login-default-motd-file.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -945,6 +948,9 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
+* Wed Jan 27 2021 Kelvin Fan <kfan@redhat.com> - 2.36.1-4
+- Add patch to add /run/motd.d to default MOTD_FILE in login(1)
+
 * Thu Jan 14 2021 Karel Zak <kzak@redhat.com> - 2.36.1-3
 - improve uuidd scriptlets (fix #1767553)