Removed audit indirect dependency on finger (#1973)

* Removed audit indirect dependency on finger

* Updated poackage versions in toolchain manifest for audit

Author: nisamson

SPECS/audit/audit.spec

@@ -4,7 +4,7 @@
 Summary:        Kernel Audit Tool
 Name:           audit
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Source0:        https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz
 Patch0:         refuse-manual-stop.patch
 License:        GPLv2+
@@ -15,15 +15,13 @@ Distribution:   Mariner
 BuildRequires:  krb5-devel
 BuildRequires:  openldap
 BuildRequires:  golang
-BuildRequires:  tcp_wrappers-devel
 BuildRequires:  libcap-ng-devel
 BuildRequires:  swig
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  systemd
 Requires:       systemd
 Requires:       krb5
 Requires:       openldap
-Requires:       tcp_wrappers
 Requires:       libcap-ng
 Requires:       gawk
 Requires:       audit-libs
@@ -86,7 +84,6 @@ and libauparse.
     --sysconfdir=%{_sysconfdir} \
     --with-python=yes \
     --with-python3=yes \
-    --with-libwrap \
     --enable-gssapi-krb5=yes \
     --with-libcap-ng=yes \
     --with-aarch64 \
@@ -173,12 +170,12 @@ make %{?_smp_mflags} check
 %{python3_sitelib}/*
 
 %changelog
-* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 3.0-10
-- Increment release for force republishing using golang 1.16.12
-
-* Tue Nov 02 2021 Thomas Crain <[email protected]> - 3.0-9
-- Increment release for force republishing using golang 1.16.9
-
+*   Fri Jan 21 2022 Nick Samson <nisamson@microsoft.com> - 3.0-11
+-   Removed libwrap support to remove dependency on finger
+*   Wed Jan 19 2022 Henry Li <[email protected]> - 3.0-10
+-   Increment release for force republishing using golang 1.16.12
+*   Tue Nov 02 2021 Thomas Crain <[email protected]> - 3.0-9
+-   Increment release for force republishing using golang 1.16.9
 *   Fri Aug 06 2021 Nicolas Guibourge <[email protected]> 3.0-8
 -   Increment release to force republishing using golang 1.16.7.
 *   Tue Jun 08 2021 Henry Beberman <[email protected]> 3.0-7

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -2,11 +2,11 @@ alsa-lib-1.2.2-1.cm1.aarch64.rpm
 alsa-lib-debuginfo-1.2.2-1.cm1.aarch64.rpm
 alsa-lib-devel-1.2.2-1.cm1.aarch64.rpm
 asciidoc-8.6.10-4.cm1.noarch.rpm
-audit-3.0-10.cm1.aarch64.rpm
-audit-debuginfo-3.0-10.cm1.aarch64.rpm
-audit-devel-3.0-10.cm1.aarch64.rpm
-audit-libs-3.0-10.cm1.aarch64.rpm
-audit-python-3.0-10.cm1.aarch64.rpm
+audit-3.0-11.cm1.aarch64.rpm
+audit-debuginfo-3.0-11.cm1.aarch64.rpm
+audit-devel-3.0-11.cm1.aarch64.rpm
+audit-libs-3.0-11.cm1.aarch64.rpm
+audit-python-3.0-11.cm1.aarch64.rpm
 autoconf-2.69-10.cm1.noarch.rpm
 automake-1.16.1-3.cm1.noarch.rpm
 bash-4.4.23-1.cm1.aarch64.rpm
@@ -92,9 +92,6 @@ filesystem-1.1-7.cm1.aarch64.rpm
 findutils-4.6.0-7.cm1.aarch64.rpm
 findutils-debuginfo-4.6.0-7.cm1.aarch64.rpm
 findutils-lang-4.6.0-7.cm1.aarch64.rpm
-finger-0.17-4.cm1.aarch64.rpm
-finger-debuginfo-0.17-4.cm1.aarch64.rpm
-finger-server-0.17-4.cm1.aarch64.rpm
 flex-2.6.4-6.cm1.aarch64.rpm
 flex-debuginfo-2.6.4-6.cm1.aarch64.rpm
 flex-devel-2.6.4-6.cm1.aarch64.rpm
@@ -357,7 +354,7 @@ python2-libcap-ng-0.7.9-3.cm1.aarch64.rpm
 python2-libs-2.7.18-8.cm1.aarch64.rpm
 python2-test-2.7.18-8.cm1.aarch64.rpm
 python2-tools-2.7.18-8.cm1.aarch64.rpm
-python3-audit-3.0-10.cm1.aarch64.rpm
+python3-audit-3.0-11.cm1.aarch64.rpm
 python3-cracklib-2.9.7-2.cm1.aarch64.rpm
 python3-gpg-1.13.1-6.cm1.aarch64.rpm
 python3-libcap-ng-0.7.9-3.cm1.aarch64.rpm
@@ -402,9 +399,6 @@ systemd-devel-239-38.cm1.aarch64.rpm
 systemd-lang-239-38.cm1.aarch64.rpm
 tar-1.32-2.cm1.aarch64.rpm
 tar-debuginfo-1.32-2.cm1.aarch64.rpm
-tcp_wrappers-7.6-9.cm1.aarch64.rpm
-tcp_wrappers-debuginfo-7.6-9.cm1.aarch64.rpm
-tcp_wrappers-devel-7.6-9.cm1.aarch64.rpm
 tdnf-2.1.0-6.cm1.aarch64.rpm
 tdnf-cli-libs-2.1.0-6.cm1.aarch64.rpm
 tdnf-debuginfo-2.1.0-6.cm1.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -2,11 +2,11 @@ alsa-lib-1.2.2-1.cm1.x86_64.rpm
 alsa-lib-debuginfo-1.2.2-1.cm1.x86_64.rpm
 alsa-lib-devel-1.2.2-1.cm1.x86_64.rpm
 asciidoc-8.6.10-4.cm1.noarch.rpm
-audit-3.0-10.cm1.x86_64.rpm
-audit-debuginfo-3.0-10.cm1.x86_64.rpm
-audit-devel-3.0-10.cm1.x86_64.rpm
-audit-libs-3.0-10.cm1.x86_64.rpm
-audit-python-3.0-10.cm1.x86_64.rpm
+audit-3.0-11.cm1.x86_64.rpm
+audit-debuginfo-3.0-11.cm1.x86_64.rpm
+audit-devel-3.0-11.cm1.x86_64.rpm
+audit-libs-3.0-11.cm1.x86_64.rpm
+audit-python-3.0-11.cm1.x86_64.rpm
 autoconf-2.69-10.cm1.noarch.rpm
 automake-1.16.1-3.cm1.noarch.rpm
 bash-4.4.23-1.cm1.x86_64.rpm
@@ -92,9 +92,6 @@ filesystem-1.1-7.cm1.x86_64.rpm
 findutils-4.6.0-7.cm1.x86_64.rpm
 findutils-debuginfo-4.6.0-7.cm1.x86_64.rpm
 findutils-lang-4.6.0-7.cm1.x86_64.rpm
-finger-0.17-4.cm1.x86_64.rpm
-finger-debuginfo-0.17-4.cm1.x86_64.rpm
-finger-server-0.17-4.cm1.x86_64.rpm
 flex-2.6.4-6.cm1.x86_64.rpm
 flex-debuginfo-2.6.4-6.cm1.x86_64.rpm
 flex-devel-2.6.4-6.cm1.x86_64.rpm
@@ -357,7 +354,7 @@ python2-libcap-ng-0.7.9-3.cm1.x86_64.rpm
 python2-libs-2.7.18-8.cm1.x86_64.rpm
 python2-test-2.7.18-8.cm1.x86_64.rpm
 python2-tools-2.7.18-8.cm1.x86_64.rpm
-python3-audit-3.0-10.cm1.x86_64.rpm
+python3-audit-3.0-11.cm1.x86_64.rpm
 python3-cracklib-2.9.7-2.cm1.x86_64.rpm
 python3-gpg-1.13.1-6.cm1.x86_64.rpm
 python3-libcap-ng-0.7.9-3.cm1.x86_64.rpm
@@ -402,9 +399,6 @@ systemd-devel-239-38.cm1.x86_64.rpm
 systemd-lang-239-38.cm1.x86_64.rpm
 tar-1.32-2.cm1.x86_64.rpm
 tar-debuginfo-1.32-2.cm1.x86_64.rpm
-tcp_wrappers-7.6-9.cm1.x86_64.rpm
-tcp_wrappers-debuginfo-7.6-9.cm1.x86_64.rpm
-tcp_wrappers-devel-7.6-9.cm1.x86_64.rpm
 tdnf-2.1.0-6.cm1.x86_64.rpm
 tdnf-cli-libs-2.1.0-6.cm1.x86_64.rpm
 tdnf-debuginfo-2.1.0-6.cm1.x86_64.rpm

toolkit/resources/manifests/package/update_manifests.sh

@@ -60,7 +60,6 @@ remove_packages_for_pkggen_core () {
     sed -i '/e2fsprogs-lang/d' $TmpPkgGen
     sed -i '/openj/d' $TmpPkgGen
     sed -i '/freetype2/d' $TmpPkgGen
-    sed -i '/finger-[[:alpha:]]/d' $TmpPkgGen
     sed -i '/gfortran/d' $TmpPkgGen
     sed -i '/glib-devel/d' $TmpPkgGen
     sed -i '/glib-schemas/d' $TmpPkgGen
@@ -93,7 +92,6 @@ remove_packages_for_pkggen_core () {
     sed -i '/perl-Text-Template/d' $TmpPkgGen
     sed -i '/python/d' $TmpPkgGen
     sed -i '/shadow/d' $TmpPkgGen
-    sed -i '/tcp_wrappers-[[:alpha:]]/d' $TmpPkgGen
     sed -i '/unzip/d' $TmpPkgGen
     sed -i '/util-linux-lang/d' $TmpPkgGen
     sed -i '/wget/d' $TmpPkgGen

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -509,12 +509,8 @@ chroot_and_install_rpms libtirpc
 chroot_and_install_rpms rpcsvc-proto
 build_rpm_in_chroot_no_install libnsl2
 
-build_rpm_in_chroot_no_install finger
-
 # tcp_wrappers needs libnsl2, finger
 chroot_and_install_rpms libnsl2
-chroot_and_install_rpms finger
-build_rpm_in_chroot_no_install tcp_wrappers
 
 build_rpm_in_chroot_no_install cyrus-sasl
 
@@ -529,7 +525,6 @@ build_rpm_in_chroot_no_install libcap-ng
 chroot_and_install_rpms systemd
 chroot_and_install_rpms golang
 chroot_and_install_rpms openldap
-chroot_and_install_rpms tcp_wrappers
 chroot_and_install_rpms libcap-ng
 build_rpm_in_chroot_no_install audit