From 0b9efbf5e40746220c40bf27e202d039b16b4f3fa0a03e5419a5e6dceaa38400 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 8 Oct 2020 20:42:21 +0000
Subject: [PATCH 1/2] Accepting request 840138 from
 home:sbrabec:branches:util-linux-multibuild

- shadow-login_defs-check.sh: Fix the regexp to get a real variable
  list (boo#1164274).

OBS-URL: https://build.opensuse.org/request/show/840138
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=92
---
 shadow-login_defs-check.sh | 2 +-
 shadow.changes             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shadow-login_defs-check.sh b/shadow-login_defs-check.sh
index b6dab00..e7ca2e4 100644
--- a/shadow-login_defs-check.sh
+++ b/shadow-login_defs-check.sh
@@ -54,7 +54,7 @@ fi
 echo "Extracting variables from pam..."
 cd openSUSE:Factory/pam/BUILD/*
 grep -rh LOGIN_DEFS . |
-	sed -n 's/^.*search_key *("\([A-Z0-9_]*\)", *LOGIN_DEFS).*$/\1/p' |
+	sed -n 's/^.*search_key *([A-Za-z_]*, *[A-Z_]*LOGIN_DEFS, *"\([A-Z0-9_]*\)").*$/\1/p' |
 	LC_ALL=C sort -u >../../../../shadow-login_defs-check-pam.lst
 cd ../../../..
 
diff --git a/shadow.changes b/shadow.changes
index 9e19dfa..4f0c54d 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  8 03:16:58 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
+
+- shadow-login_defs-check.sh: Fix the regexp to get a real variable
+  list (boo#1164274).
+
 -------------------------------------------------------------------
 Tue Sep  8 00:56:37 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
 

From 6ffcde29a430c7a3a2960c74622284c5e49b554d9fd71cc8501e3c70c374e3d8 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 9 Oct 2020 13:16:40 +0000
Subject: [PATCH 2/2] boo#1173321

OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=93
---
 shadow.changes |  5 +++++
 useradd.local  | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/shadow.changes b/shadow.changes
index 4f0c54d..d00a2b9 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  9 13:12:11 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Add support for /usr/etc/skel to useradd.local script (boo#1173321) 
+
 -------------------------------------------------------------------
 Thu Oct  8 03:16:58 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
 
diff --git a/useradd.local b/useradd.local
index 06bbc2d..8bc049f 100644
--- a/useradd.local
+++ b/useradd.local
@@ -21,6 +21,19 @@ if [ $# -lt 1 -o $# -gt 4 ]; then
   exit 1
 fi
 
+# definition of "root" $HOME for users
+. /etc/default/useradd
+
+USER=$1
+GID=$(id -g $USER)
+HOMEDIR=$HOME/$USER
+
+if [ $# -lt 4 ]; then
+  HOMEDIR=$HOME/$USER
+else
+  HOMEDIR=$4
+fi
+
 # Update NIS database
 # make -C /var/yp
 
@@ -29,16 +42,23 @@ fi
 if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ; then
   test -x /sbin/restorecon || exit 2
 
-  if [ $# -lt 4 ]; then
-    home_dir=/home/$1
-  else
-    home_dir=$4
-  fi
-
-  if [ -d $home_dir ]; then
-      /sbin/restorecon -R $home_dir
+  if [ -d $HOMEDIR ]; then
+      /sbin/restorecon -R $HOMEDIR
   fi
 fi
 
+#
+# Copy also skeleton files from /usr/etc/skel (boo#1173321)
+#
+
+USRSKELDIR=/usr/etc/skel
+for file in $(ls -A $USRSKELDIR); do
+  # Only copy if not exist yet, i.e. does *not* exist in /etc/skel, which is still
+  # being preferred ...
+  test -e $HOMEDIR/$file && continue
+  cp -a $USRSKELDIR/$file $HOMEDIR
+  chown -R $USER.$GID $HOMEDIR/$file
+done
+
 # All done.
 exit 0