From 913ace4529a624e616068bde610831fc3cf2ac58 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Wed, 20 Sep 2023 18:02:44 +0000
Subject: [PATCH 1/2] Add back hardcoded self-protection of `dnf`

Now that obsoletion of protected packages is allowed
(https://github.com/rpm-software-management/libdnf/pull/1610), it's best
to hardcode the protection of dnf here instead of using the file in
/etc/dnf/protected.d. This way, DNF 4 cannot uninstall itself, but DNF 5
can uninstall DNF 4, and likewise (given a similar change in DNF 5), DNF
5 cannot uninstall itself, but DNF 4 can uninstall DNF 5.

Related: https://bugzilla.redhat.com/show_bug.cgi?id=2221905
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2221907

= changelog =
msg: Allow dnf to be removed by DNF 5
type: enhancement
---
 libdnf/conf/ConfigMain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libdnf/conf/ConfigMain.cpp b/libdnf/conf/ConfigMain.cpp
index 9c71d7802..40ae7b8fc 100644
--- a/libdnf/conf/ConfigMain.cpp
+++ b/libdnf/conf/ConfigMain.cpp
@@ -313,8 +313,9 @@ class ConfigMain::Impl {
         }
     };
 
-    OptionStringList protected_packages{resolveGlobs("glob:/etc/yum/protected.d/*.conf " \
-                                          "glob:/etc/dnf/protected.d/*.conf")};
+    OptionStringList protected_packages{resolveGlobs("dnf " \
+                                                     "glob:/etc/yum/protected.d/*.conf " \
+                                                     "glob:/etc/dnf/protected.d/*.conf")};
     OptionString username{""};
     OptionString password{""};
     OptionBool gpgcheck{false};

From a2804d5542694cfa6361c462007e3c461a12cfa5 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Thu, 21 Sep 2023 17:54:48 +0000
Subject: [PATCH 2/2] Release 0.71.1

---
 VERSION.cmake          | 2 +-
 docs/release_notes.rst | 9 +++++++++
 libdnf.spec            | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/VERSION.cmake b/VERSION.cmake
index 1d4057242..3d084455f 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,6 @@
 set (DEFAULT_LIBDNF_MAJOR_VERSION 0)
 set (DEFAULT_LIBDNF_MINOR_VERSION 71)
-set (DEFAULT_LIBDNF_MICRO_VERSION 0)
+set (DEFAULT_LIBDNF_MICRO_VERSION 1)
 
 if(DEFINED LIBDNF_MAJOR_VERSION)
   if(NOT ${DEFAULT_LIBDNF_MAJOR_VERSION} STREQUAL ${LIBDNF_MAJOR_VERSION})
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index efa5b6ce9..74049ccc4 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -19,6 +19,15 @@
  LIBDNF Release Notes
 ######################
 
+====================
+0.71.1 Release Notes
+====================
+
+- New features:
+  - Allow DNF to be removed by DNF 5
+
+Bugs fixed in 0.71.1:
+
 ====================
 0.71.0 Release Notes
 ====================
diff --git a/libdnf.spec b/libdnf.spec
index 45ac311ac..59e9259de 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -5,7 +5,7 @@
 %global swig_version 3.0.12
 %global libdnf_major_version 0
 %global libdnf_minor_version 71
-%global libdnf_micro_version 0
+%global libdnf_micro_version 1
 
 %define __cmake_in_source_build 1