diff --git a/0020-automatic-Use-add_security_filters-not-_update_secur.patch b/0020-automatic-Use-add_security_filters-not-_update_secur.patch new file mode 100644 index 0000000..2e70570 --- /dev/null +++ b/0020-automatic-Use-add_security_filters-not-_update_secur.patch @@ -0,0 +1,39 @@ +From 5388d980c8137c3ee6924f145bd284169d838fad Mon Sep 17 00:00:00 2001 +From: Evan Goode +Date: Tue, 30 Jan 2024 21:36:46 +0000 +Subject: [PATCH] automatic: Use add_security_filters, not + _update_security_filters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream commit: 0b4b8cc8940a4073b33f1bb772651ae27e55f299 +Resolves: https://issues.redhat.com/browse/RHEL-21874 + +It seems that these two approaches for selecting security updates +sometimes disagree. The regular `dnf update` command uses +base.add_security_filters to select security updates, so dnf-automatic +should do the same. + +Signed-off-by: Petr Písař +--- + dnf/automatic/main.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/dnf/automatic/main.py b/dnf/automatic/main.py +index f6f4049b..caef627f 100644 +--- a/dnf/automatic/main.py ++++ b/dnf/automatic/main.py +@@ -375,8 +375,7 @@ def main(args): + + def upgrade(base, upgrade_type): + if upgrade_type == 'security': +- base._update_security_filters.append(base.sack.query().upgrades().filterm( +- advisory_type='security')) ++ base.add_security_filters("gte", ("security",)) + base.upgrade_all() + elif upgrade_type == 'default': + base.upgrade_all() +-- +2.45.0 + diff --git a/dnf.spec b/dnf.spec index 0587282..be38eeb 100644 --- a/dnf.spec +++ b/dnf.spec @@ -94,6 +94,7 @@ Patch16: 0016-Fix-handling-installonly-packages-reasons.patch Patch17: 0017-Remove-confusing-sentence-from-documentation.patch Patch18: 0018-Remove-leaf-word-from-documentation.patch Patch19: 0019-Update-documentation-of-history-userinstalled-comman.patch +Patch20: 0020-automatic-Use-add_security_filters-not-_update_secur.patch BuildArch: noarch BuildRequires: cmake @@ -385,6 +386,8 @@ popd * Mon May 06 2024 Petr Pisar - 4.14.0-11 - Fix handling an installation reason of install-only packages on autoremove (RHEL-15902) +- Fix dnf-automatic service to apply security updates the same way as dnf tool + (RHEL-21874) * Tue Apr 23 2024 Petr Pisar - 4.14.0-10 - Fix preferring the lowest-cost repositories on a reinstallation (RHEL-25005)