From a81f038e2e7ff81edfc856b12fdac25fbaeaff48 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Tue, 4 Mar 2025 23:47:33 -0500 Subject: [PATCH] * Tue Mar 04 2025 Jean-Philippe Pialasse 11.0.0-4.sme - update newrpm, templates [SME: 11478] --- root/sbin/e-smith/audittools/newrpms | 10 ++++++---- root/sbin/e-smith/audittools/templates | 2 +- smeserver-audittools.spec | 5 ++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/root/sbin/e-smith/audittools/newrpms b/root/sbin/e-smith/audittools/newrpms index a5b0bbc..5cbcb41 100644 --- a/root/sbin/e-smith/audittools/newrpms +++ b/root/sbin/e-smith/audittools/newrpms @@ -2,12 +2,14 @@ #List rpms installed from outside the standard yum repositories -yum list extras \ +dnf list extras \ --disablerepo=* \ ---enablerepo=base \ ---enablerepo=smeupdates \ ---enablerepo=updates \ +--enablerepo=baseos \ +--enablerepo=appstream \ +--enablerepo=powertools \ --enablerepo=smeos \ --enablerepo=smeaddons \ --enablerepo=remi-safe \ +--enablerepo=remi-modular \ +| grep -vi '@anaconda' \ | grep -vi gpg-pubkey diff --git a/root/sbin/e-smith/audittools/templates b/root/sbin/e-smith/audittools/templates index d96bb93..945884b 100644 --- a/root/sbin/e-smith/audittools/templates +++ b/root/sbin/e-smith/audittools/templates @@ -83,7 +83,7 @@ sub rpm_status my $st = stat($options{name}) or die "Couldn't stat $options{name}: $!"; - return "MODIFIED " . $rpms[0]->as_nvre if ($st->mtime > $install_time); + return "MODIFIED " . $rpms[0]->as_nvre if (! -l "$options{name}" && $st->mtime > $install_time); return "OWNED_BY_RPM"; } diff --git a/smeserver-audittools.spec b/smeserver-audittools.spec index 0b89c59..001c9f1 100644 --- a/smeserver-audittools.spec +++ b/smeserver-audittools.spec @@ -4,7 +4,7 @@ Summary: SME Server auditing tools %define name smeserver-audittools Name: %{name} %define version 11.0.0 -%define release 3 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -22,6 +22,9 @@ Tools for consistency audits of SME Servers. Useful for determining local modifications prior to upgrades. %changelog +* Tue Mar 04 2025 Jean-Philippe Pialasse 11.0.0-4.sme +- update newrpm, templates [SME: 11478] + * Thu Apr 04 2024 Brian Read 11.0.0-3.sme - Set license file to GPL2.0 [SME: 12577]