From ce70d189f2c228a7ec3e6cfaac5aacfa3769ab94 Mon Sep 17 00:00:00 2001
From: Justin Stephenson <jstephen@redhat.com>
Date: Mon, 7 Aug 2023 15:56:22 -0400
Subject: [PATCH] systemd sysusers additions

---
 .github/actions/build-sssd-srpm/action.yml  | 3 ++-
 Makefile.am                                 | 1 +
 configure.ac                                | 2 +-
 contrib/{sssd.sysusers => sssd.sysusers.in} | 0
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename contrib/{sssd.sysusers => sssd.sysusers.in} (100%)

diff --git a/.github/actions/build-sssd-srpm/action.yml b/.github/actions/build-sssd-srpm/action.yml
index ae628150fdd..4123b89349c 100644
--- a/.github/actions/build-sssd-srpm/action.yml
+++ b/.github/actions/build-sssd-srpm/action.yml
@@ -38,7 +38,7 @@ runs:
       tar -cvzf "$name.tar.gz" --transform "s,^,$name/," *
 
       cp contrib/sssd.spec.in ./sssd.spec
-      cp contrib/sssd.sysusers ./sssd.sysusers
+      cp contrib/sssd.sysusers.in ./sssd.sysusers
 
       sed -iE "s/@PACKAGE_NAME@/sssd/g" ./sssd.spec
       sed -iE "s/@PACKAGE_VERSION@/${{ steps.sanitize.outputs.version }}/g" ./sssd.spec
@@ -50,3 +50,4 @@ runs:
     with:
       tarball: ${{ inputs.working-directory }}/sssd-${{ steps.sanitize.outputs.version }}.tar.gz
       specfile: ${{ inputs.working-directory }}/sssd.spec
+      sourcefiles: ${{ inputs.working-directory }}/sssd.sysusers
diff --git a/Makefile.am b/Makefile.am
index e780e8a146f..ba72423c9aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5671,6 +5671,7 @@ if GIT_CHECKOUT
 	git checkout $(srcdir)/po $(srcdir)/src/man/po
 endif
 	cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
+	cp $(builddir)/contrib/sssd.sysusers $(RPMBUILD)/SOURCES
 	cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
 
 rpms: rpmbrprep
diff --git a/configure.ac b/configure.ac
index 470c0494967..56bc6ad92fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,7 +548,7 @@ AC_SUBST([abs_builddir], $abs_build_dir)
 my_srcdir=`readlink -f $srcdir`
 AC_DEFINE_UNQUOTED([ABS_SRC_DIR], ["$my_srcdir"], [Absolute path to the source directory])
 
-AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
+AC_CONFIG_FILES([Makefile contrib/sssd.spec contrib/sssd.sysusers src/examples/rwtab src/doxy.config
                  contrib/sssd-pcsc.rules
                  src/sysv/sssd src/sysv/gentoo/sssd src/sysv/gentoo/sssd-kcm
                  po/Makefile.in src/man/Makefile src/tests/cwrap/Makefile
diff --git a/contrib/sssd.sysusers b/contrib/sssd.sysusers.in
similarity index 100%
rename from contrib/sssd.sysusers
rename to contrib/sssd.sysusers.in