From a66f10a891f0da25d064a41c1d7a9cd8ac98a7ca Mon Sep 17 00:00:00 2001
From: ikerexxe <ipedrosa@redhat.com>
Date: Tue, 24 Mar 2020 10:46:27 +0100
Subject: [PATCH] useradd: clarify the useradd -d parameter behavior in man
 page

---
 shadow-4.8.1-useradd-man-clarification.patch | 35 ++++++++++++++++++++
 shadow-utils.spec                            |  8 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 shadow-4.8.1-useradd-man-clarification.patch

diff --git a/shadow-4.8.1-useradd-man-clarification.patch b/shadow-4.8.1-useradd-man-clarification.patch
new file mode 100644
index 0000000..9fdb652
--- /dev/null
+++ b/shadow-4.8.1-useradd-man-clarification.patch
@@ -0,0 +1,35 @@
+From 6543c600d841e4f7779269412d470e50eae25b13 Mon Sep 17 00:00:00 2001
+From: ikerexxe <ipedrosa@redhat.com>
+Date: Wed, 4 Mar 2020 14:50:04 +0100
+Subject: [PATCH] useradd: clarify the useradd -d parameter behavior in man
+ page
+
+Explanation: clarify the useradd -d parameter as it does create directory HOME_DIR if it doesn't exit.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1677005
+
+Changelog: [serge] minor tweak to the text
+---
+ man/useradd.8.xml | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/man/useradd.8.xml b/man/useradd.8.xml
+index 03612ce8..023c0d69 100644
+--- a/man/useradd.8.xml
++++ b/man/useradd.8.xml
+@@ -181,8 +181,10 @@
+ 	    login directory. The default is to append the
+ 	    <replaceable>LOGIN</replaceable> name to
+ 	    <replaceable>BASE_DIR</replaceable> and use that as the login
+-	    directory name. The directory <replaceable>HOME_DIR</replaceable>
+-	    does not have to exist but will not be created if it is missing.
++	    directory name.  If the directory
++	    <replaceable>HOME_DIR</replaceable> does not exist, then it
++	    will be created unless the <option>-M</option> option is
++	    specified.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+-- 
+2.25.1
+
diff --git a/shadow-utils.spec b/shadow-utils.spec
index 5b58ae6..b3e4575 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
@@ -51,6 +51,8 @@ Patch38: shadow-4.6-sysugid-min-limit.patch
 Patch40: shadow-4.8-ignore-login-prompt.patch
 # Generate /var/spool/mail/$USER with the proper SELinux user identity - already upstreamed
 Patch42: shadow-4.8-useradd-selinux-mail.patch
+# Clarify useradd man regarding "-d" parameter - already upstreamed
+Patch43: shadow-4.8.1-useradd-man-clarification.patch
 
 License: BSD and GPLv2+
 BuildRequires: gcc
@@ -99,6 +101,7 @@ are used for managing group accounts.
 %patch38 -p1 -b .sysugid-min-limit
 %patch40 -p1 -b .login-prompt
 %patch42 -p1 -b .useradd-selinux-mail
+%patch43 -p1 -b .useradd-man-clarification
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -254,6 +257,9 @@ done
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Tue Mar 24 2020 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.8.1-2
+- useradd: clarify the useradd -d parameter behavior in man page
+
 * Tue Mar 17 2020 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.8.1-1
 - updated upstream to 4.8.1