toolchain: Rebuild audit with systemd-bootstrap-rpm-macros installed (#…

…2878)

* toolchain: Rebuild audit with systemd-bootstrap-rpm-macros installed
* audit: Add BR on systemd-bootstrap-rpm-macros

SPECS/audit/audit.spec

@@ -1,7 +1,7 @@
 Summary:        Kernel Audit Tool
 Name:           audit
 Version:        3.0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -11,6 +11,7 @@ Source0:        https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Patch0:         refuse-manual-stop.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  krb5-devel
+BuildRequires:  systemd-bootstrap-rpm-macros
 BuildRequires:  swig
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       gawk
@@ -137,6 +138,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{python3_sitelib}/*
 
 %changelog
+* Mon Apr 25 2022 Olivia Crain <[email protected]> - 3.0.6-6
+- Add BR on systemd-bootstrap-rpm-macros for correctness
+
 * Wed Apr 20 2022 Daniel McIlvaney <[email protected]> - 3.0.6-5
 - Return audit logs to their normal location without the use of a symlink
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -247,5 +247,5 @@ chkconfig-1.20-3.cm2.aarch64.rpm
 chkconfig-lang-1.20-3.cm2.aarch64.rpm
 msopenjdk-11-11.0.14.1+1-LTS-31207.aarch64.rpm
 pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
-audit-3.0.6-5.cm2.aarch64.rpm
-audit-libs-3.0.6-5.cm2.aarch64.rpm
+audit-3.0.6-6.cm2.aarch64.rpm
+audit-libs-3.0.6-6.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -247,5 +247,5 @@ chkconfig-1.20-3.cm2.x86_64.rpm
 chkconfig-lang-1.20-3.cm2.x86_64.rpm
 msopenjdk-11-11.0.14.1+1-LTS-31207.x86_64.rpm
 pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
-audit-3.0.6-5.cm2.x86_64.rpm
-audit-libs-3.0.6-5.cm2.x86_64.rpm
+audit-3.0.6-6.cm2.x86_64.rpm
+audit-libs-3.0.6-6.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -1,8 +1,8 @@
 asciidoc-9.1.0-1.cm2.noarch.rpm
-audit-3.0.6-5.cm2.aarch64.rpm
-audit-debuginfo-3.0.6-5.cm2.aarch64.rpm
-audit-devel-3.0.6-5.cm2.aarch64.rpm
-audit-libs-3.0.6-5.cm2.aarch64.rpm
+audit-3.0.6-6.cm2.aarch64.rpm
+audit-debuginfo-3.0.6-6.cm2.aarch64.rpm
+audit-devel-3.0.6-6.cm2.aarch64.rpm
+audit-libs-3.0.6-6.cm2.aarch64.rpm
 autoconf-2.71-3.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
 bash-5.1.8-1.cm2.aarch64.rpm
@@ -506,7 +506,7 @@ procps-ng-lang-3.3.17-1.cm2.aarch64.rpm
 pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
 python-markupsafe-debuginfo-2.1.0-1.cm2.aarch64.rpm
 python3-3.9.10-1.cm2.aarch64.rpm
-python3-audit-3.0.6-5.cm2.aarch64.rpm
+python3-audit-3.0.6-6.cm2.aarch64.rpm
 python3-cracklib-2.9.7-4.cm2.aarch64.rpm
 python3-curses-3.9.10-1.cm2.aarch64.rpm
 python3-Cython-0.29.26-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -1,8 +1,8 @@
 asciidoc-9.1.0-1.cm2.noarch.rpm
-audit-3.0.6-5.cm2.x86_64.rpm
-audit-debuginfo-3.0.6-5.cm2.x86_64.rpm
-audit-devel-3.0.6-5.cm2.x86_64.rpm
-audit-libs-3.0.6-5.cm2.x86_64.rpm
+audit-3.0.6-6.cm2.x86_64.rpm
+audit-debuginfo-3.0.6-6.cm2.x86_64.rpm
+audit-devel-3.0.6-6.cm2.x86_64.rpm
+audit-libs-3.0.6-6.cm2.x86_64.rpm
 autoconf-2.71-3.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
 bash-5.1.8-1.cm2.x86_64.rpm
@@ -506,7 +506,7 @@ procps-ng-lang-3.3.17-1.cm2.x86_64.rpm
 pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
 python-markupsafe-debuginfo-2.1.0-1.cm2.x86_64.rpm
 python3-3.9.10-1.cm2.x86_64.rpm
-python3-audit-3.0.6-5.cm2.x86_64.rpm
+python3-audit-3.0.6-6.cm2.x86_64.rpm
 python3-cracklib-2.9.7-4.cm2.x86_64.rpm
 python3-curses-3.9.10-1.cm2.x86_64.rpm
 python3-Cython-0.29.26-1.cm2.x86_64.rpm

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -551,6 +551,12 @@ build_rpm_in_chroot_no_install chkconfig
 build_rpm_in_chroot_no_install mariner-repos
 build_rpm_in_chroot_no_install pyproject-rpm-macros
 
+# Rebuild audit with systemd-bootstrap-rpm-macros installed.
+# Without it, audit's systemd macros won't expand and install/uninstall
+# will fail.
+build_rpm_in_chroot_no_install audit
+copy_rpm_subpackage python3-audit
+
 chroot_and_print_installed_rpms
 
 # Ensure all RPMS are copied out of the chroot