diff --git a/bugfix-protect-dnf-and-yum.patch b/bugfix-protect-dnf-and-yum.patch new file mode 100644 index 0000000000000000000000000000000000000000..38ba4d53c6785297881a424328113f7b3364c9a6 --- /dev/null +++ b/bugfix-protect-dnf-and-yum.patch @@ -0,0 +1,31 @@ +From 1dec0967894c59f1daf2154e86d2a714327c52c4 Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Fri, 29 Aug 2025 18:07:13 +0800 +Subject: [PATCH] protect dnf and yum + +--- + etc/dnf/protected.d/dnf.conf | 4 +--- + etc/dnf/protected.d/yum.conf | 5 +---- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/etc/dnf/protected.d/dnf.conf b/etc/dnf/protected.d/dnf.conf +index c2b5885..6148f6c 100644 +--- a/etc/dnf/protected.d/dnf.conf ++++ b/etc/dnf/protected.d/dnf.conf +@@ -1,3 +1 @@ +-# DNF is obsoleted in Fedora 39 by DNF 5 and should no longer be marked as protected. +- +-# dnf ++dnf +diff --git a/etc/dnf/protected.d/yum.conf b/etc/dnf/protected.d/yum.conf +index 4f1d0b5..f42afee 100644 +--- a/etc/dnf/protected.d/yum.conf ++++ b/etc/dnf/protected.d/yum.conf +@@ -1,4 +1 @@ +-# In Fedora 39, yum is obsoleted/provided by the dnf5 package rather than dnf, +-# and DNF cannot replace itself with DNF5 if yum is marked as protected. +- +-# yum ++yum +-- +2.43.0 diff --git a/dnf.spec b/dnf.spec index f95968ae9b18728637a4e29f7e7c2d986f8021cb..9b5b82300931781cce08ed37bbaad5c1c7f11f79 100644 --- a/dnf.spec +++ b/dnf.spec @@ -4,7 +4,7 @@ Name: dnf Version: 4.16.2 -Release: 9 +Release: 10 Summary: A software package manager that manages packages on Linux distributions. License: GPL-2.0-or-later AND GPL-1.0-only URL: https://github.com/rpm-software-management/dnf @@ -17,6 +17,8 @@ Patch9004: fix-dnf-history-undo-error-when-history-sqlite-missing.pat Patch9006: get-lockfile-exists-before-unlick.patch %endif +Patch9007: bugfix-protect-dnf-and-yum.patch + %ifarch sw_64 Patch6000: dnf-4.10.0-sw.patch %endif @@ -257,6 +259,12 @@ export TERM=linux %{_mandir}/man8/%{name}-automatic.8* %changelog +* Fri Aug 29 2025 yueyuankun - 4.16.2-10 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Protect dnf and yum + * Fri Dec 20 2024 Funda Wang - 4.16.2-9 - adopt to new cmake macro