From ff8169d809a5de20864deb6bb41c4b4104a3fb61 Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Thu, 8 Sep 2022 17:02:27 +0200
Subject: [PATCH] New version 2.14.2

sysusers.d: add script and configuration fragments for groups
passwd: align 'nologin' shell path with systemd defaults
uidgid: assign GID 101 for 'ssh_keys' group
uidgid: assign UID/GID 114 for 'polkitd'
passwd: update GECOS field for 'root' user
services: remove commas from aliases for ircu-3
setup.spec: throw away newaliases output again
---
 .gitignore |  1 +
 setup.spec | 28 +++++++++++++++++++++-------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdebba7..636d7d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,4 @@ setup-2.8.25.tar.bz2
 /setup-2.13.9.1.tar.gz
 /setup-2.13.10.tar.gz
 /setup-2.14.1.tar.gz
+/setup-2.14.2.tar.gz
diff --git a/setup.spec b/setup.spec
index 3141c0d..e26ea56 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.14.1
-Release: 2%{?dist}
+Version: 2.14.2
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -22,6 +22,7 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+./generate-sysusers-fragments.sh
 ./shadowconvert.sh
 
 %build
@@ -32,9 +33,11 @@ make check
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/etc/profile.d
-mkdir -p %{buildroot}/etc/motd.d
+mkdir -p %{buildroot}/etc
 cp -ar * %{buildroot}/etc
+mkdir -p %(dirname %{buildroot}%{_sysusersdir})
+mv %{buildroot}/etc/sysusers.d %{buildroot}%{_sysusersdir}
+mkdir -p %{buildroot}/etc/profile.d
 mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/
 rm -f %{buildroot}/etc/uidgid
 rm -f %{buildroot}/etc/COPYING
@@ -43,12 +46,12 @@ touch %{buildroot}/etc/environment
 chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
 touch %{buildroot}/etc/fstab
-mkdir -p %{buildroot}/etc/profile.d
 echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
 echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local
+mkdir -p %{buildroot}/etc/motd.d
 mkdir -p %{buildroot}/run/motd.d
-touch %{buildroot}/run/motd
 mkdir -p %{buildroot}/usr/lib/motd.d
+touch %{buildroot}/run/motd
 touch %{buildroot}/usr/lib/motd
 #tmpfiles needed for files in /run
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -60,6 +63,7 @@ chmod 0644 %{buildroot}%{_tmpfilesdir}/%{name}.conf
 rm -f %{buildroot}/etc/Makefile
 rm -f %{buildroot}/etc/serviceslint
 rm -f %{buildroot}/etc/uidgidlint
+rm -f %{buildroot}/etc/generate-sysusers-fragments.sh
 rm -f %{buildroot}/etc/shadowconvert.sh
 rm -f %{buildroot}/etc/setup.spec
 rm -rf %{buildroot}/etc/contrib
@@ -73,7 +77,7 @@ end
 if posix.access("/usr/bin/newaliases", "x") then
   local pid = posix.fork()
   if pid == 0 then
-    posix.redirect2null(2)
+    posix.redirect2null(1)
     posix.exec("/usr/bin/newaliases")
   elseif pid > 0 then
     posix.wait(pid)
@@ -118,8 +122,18 @@ end
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 %{_tmpfilesdir}/%{name}.conf
+%{_sysusersdir}/20-setup-groups.conf
 
 %changelog
+* Thu Sep 08 2022 Martin Osvald <mosvald@redhat.com> - 2.14.2-1
+- sysusers.d: add script and configuration fragments for groups
+- passwd: align 'nologin' shell path with systemd defaults
+- uidgid: assign GID 101 for 'ssh_keys' group
+- uidgid: assign UID/GID 114 for 'polkitd'
+- passwd: update GECOS field for 'root' user
+- services: remove commas from aliases for ircu-3
+- setup.spec: throw away newaliases output again
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 3523a63..37d576c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setup-2.14.1.tar.gz) = ae668a853a6a88a9e076e5c0da304374d758dc4c9fcbf322181c5643f7064fba1a3d6495cc96409c73dacea282eb9866b74be3a00dbec4066cadc46daa8637f1
+SHA512 (setup-2.14.2.tar.gz) = 29ca68a595e61a5446ce9b7014880a2c51c72524a93de04e4e90837c1f4f39913aceae1eb6ab873b171745fdc04eee7affde96c8ef5028b2d85cebc441cdfd19