From bec6c6d57a6eecca304784dfc3b13149ad3f6493 Mon Sep 17 00:00:00 2001
From: Nicola Sella <nsella@redhat.com>
Date: Mon, 28 Aug 2023 13:07:18 +0200
Subject: [PATCH] Revert "Unprotect dnf and yum, protect python3-dnf"

This reverts commit 352b174a0b4ce2048ef1a25b785f20449e2addc2.
adding the condition %{witout dnf5_obsoletes_dnf} to keep the
unprotected directive for chroots that build dnf with rpm
option with=dnf5_obsoletes_dnf
---
 dnf.spec                             | 14 ++++++++++++--
 etc/dnf/protected.d/CMakeLists.txt   |  2 +-
 etc/dnf/protected.d/dnf.conf         |  4 +---
 etc/dnf/protected.d/python3-dnf.conf |  1 -
 etc/dnf/protected.d/yum.conf         |  5 +----
 5 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 etc/dnf/protected.d/python3-dnf.conf

diff --git a/dnf.spec b/dnf.spec
index d7925b31de..60bf3d1f34 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -299,15 +299,19 @@ popd
 %dir %{confdir}/aliases.d
 %exclude %{confdir}/aliases.d/zypper.conf
 %if %{without dnf5_obsoletes_dnf}
+# If DNF5 does not obsoletie DNF ownership of dnf.conf should be dnf's
 %config(noreplace) %{confdir}/%{name}.conf
-%endif
-
+# If DNF5 does not obsolete DNF, protected.d/dnf.conf should be owned by DNF
+%config(noreplace) %{confdir}/protected.d/%{name}.conf
+%else
+# If DNF5 obsoletes DNF
 # No longer using `noreplace` here. Older versions of DNF 4 marked `dnf` as a
 # protected package, but since Fedora 39, DNF needs to be able to update itself
 # to DNF 5, so we need to replace the old /etc/dnf/protected.d/dnf.conf.
 %config %{confdir}/protected.d/%{name}.conf
 # Protect python3-dnf instead, which does not conflict with DNF 5
 %config(noreplace) %{confdir}/protected.d/python3-%{name}.conf
+%endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %ghost %attr(644,-,-) %{_localstatedir}/log/hawkey.log
 %ghost %attr(644,-,-) %{_localstatedir}/log/%{name}.log
@@ -333,10 +337,16 @@ popd
 %{_mandir}/man5/yum.conf.5.*
 %{_mandir}/man8/yum-shell.8*
 %{_mandir}/man1/yum-aliases.1*
+if %{without dnf5_obsoletes_dnf}
+# If DNF5 does not obsolete DNF, protected.d/yum.conf should be owned by DNF
+%config(noreplace) %{confdir}/protected.d/yum.conf
+%else
+# If DNF5 obsoletes DNF
 # No longer using `noreplace` here. Older versions of DNF 4 marked `yum` as a
 # protected package, but since Fedora 39, DNF needs to be able to update itself
 # to DNF 5, so we need to replace the old /etc/dnf/protected.d/yum.conf.
 %config %{confdir}/protected.d/yum.conf
+%endif
 %else
 %exclude %{_sysconfdir}/yum.conf
 %exclude %{_sysconfdir}/yum/pluginconf.d
diff --git a/etc/dnf/protected.d/CMakeLists.txt b/etc/dnf/protected.d/CMakeLists.txt
index d58d805fd4..d368f146ef 100644
--- a/etc/dnf/protected.d/CMakeLists.txt
+++ b/etc/dnf/protected.d/CMakeLists.txt
@@ -1 +1 @@
-INSTALL (FILES "dnf.conf" "yum.conf" "python3-dnf.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
+INSTALL (FILES "dnf.conf" "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
diff --git a/etc/dnf/protected.d/dnf.conf b/etc/dnf/protected.d/dnf.conf
index c2b5885c00..6148f6c965 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/python3-dnf.conf b/etc/dnf/protected.d/python3-dnf.conf
deleted file mode 100644
index f3cce4b0f9..0000000000
--- a/etc/dnf/protected.d/python3-dnf.conf
+++ /dev/null
@@ -1 +0,0 @@
-python3-dnf
diff --git a/etc/dnf/protected.d/yum.conf b/etc/dnf/protected.d/yum.conf
index 4f1d0b5a73..f42afee9fd 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