From 17fe7874aa40e660781ef9705fc759b168bf5ab0 Mon Sep 17 00:00:00 2001
From: Karel Srot <ksrot@redhat.com>
Date: Wed, 15 Jan 2025 15:26:01 +0100
Subject: [PATCH] Adjust SPEC to UsersAndGroups/#_dynamic_allocation

---
 .../rpm-ima-sign-test.spec.f42                | 32 +++++++++++++++++++
 .../rpm-ima-sign-test.sysusers                |  2 ++
 .../install-rpm-with-ima-signature/test.sh    |  9 +++++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 functional/install-rpm-with-ima-signature/rpm-ima-sign-test.spec.f42
 create mode 100644 functional/install-rpm-with-ima-signature/rpm-ima-sign-test.sysusers

diff --git a/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.spec.f42 b/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.spec.f42
new file mode 100644
index 00000000..f034c9af
--- /dev/null
+++ b/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.spec.f42
@@ -0,0 +1,32 @@
+# build with
+# $ rpmbuild -bb -D 'destdir /some/destination/dir' rpm-ima-sign-test.spec
+
+Summary: This is the rpm-ima-sign-test package
+Name: rpm-ima-sign-test
+Version: 1
+Release: 1
+Group: System Environment/Base
+License: GPL
+BuildArch: noarch
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0: rpm-ima-sign-test.sysusers
+%{?sysusers_requires_compat}
+%description
+
+This is a rpm-ima-sign-test test package
+
+%pre
+%sysusers_create_compat %{SOURCE0}
+
+%build
+echo -e '#!/bin/bash\necho' > rpm-ima-sign-test-echo
+
+%install
+install -D -m 755 rpm-ima-sign-test-echo %{buildroot}/%{destdir}/rpm-ima-sign-test-echo
+
+%files
+%{destdir}/rpm-ima-sign-test-echo
+
+%changelog
+* Wed Jan 15 2025 Karel Srot <ksrot@redhat.com> - 0.1-1
+- Update packaging
diff --git a/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.sysusers b/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.sysusers
new file mode 100644
index 00000000..39383569
--- /dev/null
+++ b/functional/install-rpm-with-ima-signature/rpm-ima-sign-test.sysusers
@@ -0,0 +1,2 @@
+#Type Name   ID  GECOS                        Home directory  Shell
+u     limetester  -   "limetester user"  /home/limetester      /sbin/nologin
diff --git a/functional/install-rpm-with-ima-signature/test.sh b/functional/install-rpm-with-ima-signature/test.sh
index b688bf4a..1da0a4ea 100755
--- a/functional/install-rpm-with-ima-signature/test.sh
+++ b/functional/install-rpm-with-ima-signature/test.sh
@@ -81,7 +81,13 @@ EOF
         TESTDIR=`limeCreateTestDir`
         rlRun "chmod a+rx ${TESTDIR}"
         # build test rpm
-        rlRun -s "rpmbuild -bb -D 'destdir ${TESTDIR}' ${TEST_SRC_DIR}/rpm-ima-sign-test.spec"
+        DIST_SUFFIX=""
+        if rlIsFedora '>=42'; then
+            DIST_SUFFIX=.f42
+            rlRun "mkdir -p ~/rpmbuild/SOURCES"
+            rlRun "cp ${TEST_SRC_DIR}/rpm-ima-sign-test.sysusers ~/rpmbuild/SOURCES"
+        fi
+        rlRun -s "rpmbuild -bb -D 'destdir ${TESTDIR}' ${TEST_SRC_DIR}/rpm-ima-sign-test.spec${DIST_SUFFIX}"
         RPM_PATH=$( awk '/Wrote:/ { print $2 }' $rlRun_LOG )
         # generage GPG key for RPM signing
         # add gpg key to rpm macros
@@ -141,6 +147,7 @@ _EOF"
         rlFileRestore
         limeExtendNextExcludelist ${TESTDIR}
         #rlRun "rm -f $TESTDIR/keylime-bad-script.sh"  # possible but not really necessary
+        rlRun "rm -f ~/rpmbuild/SOURCES/rpm-ima-sign-test.sysusers"
     rlPhaseEnd
 
 rlJournalEnd