From 684c8f18ec2a6c443a9372488fb1db4252efa860 Mon Sep 17 00:00:00 2001
From: Jan Kolarik <jkolarik@redhat.com>
Date: Fri, 1 Sep 2023 11:04:41 +0200
Subject: [PATCH] Update to 4.17.0

---
 .gitignore |  1 +
 dnf.spec   | 34 +++++++++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 279d63a..a31b12e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,4 @@
 /dnf-4.16.0.tar.gz
 /dnf-4.16.1.tar.gz
 /dnf-4.16.2.tar.gz
+/dnf-4.17.0.tar.gz
diff --git a/dnf.spec b/dnf.spec
index 7071063..5351c14 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -2,10 +2,10 @@
 %define __cmake_in_source_build 1
 
 # default dependencies
-%global hawkey_version 0.66.0
+%global hawkey_version 0.71.0
 %global libcomps_version 0.1.8
 %global libmodulemd_version 2.9.3
-%global rpm_version 4.14.0
+%global rpm_version 4.18.0
 
 # conflicts
 %global conflicts_dnf_plugins_core_version 4.0.26
@@ -67,8 +67,8 @@
 It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
-Version:        4.16.2
-Release:        4%{?dist}
+Version:        4.17.0
+Release:        1%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPL-2.0-or-later AND GPL-1.0-only
@@ -130,8 +130,6 @@ BuildRequires:  python3-libcomps >= %{libcomps_version}
 BuildRequires:  python3-libdnf
 BuildRequires:  libmodulemd >= %{libmodulemd_version}
 Requires:       libmodulemd >= %{libmodulemd_version}
-BuildRequires:  python3-gpg
-Requires:       python3-gpg
 Requires:       %{name}-data = %{version}-%{release}
 %if 0%{?fedora}
 Recommends:     deltarpm
@@ -299,15 +297,10 @@ popd
 %dir %{confdir}/aliases.d
 %exclude %{confdir}/aliases.d/zypper.conf
 %if %{without dnf5_obsoletes_dnf}
+# If DNF5 does not obsolete DNF ownership of dnf.conf should be DNF's
 %config(noreplace) %{confdir}/%{name}.conf
 %endif
-
-# 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
+%config(noreplace) %{confdir}/protected.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %ghost %attr(644,-,-) %{_localstatedir}/log/hawkey.log
 %ghost %attr(644,-,-) %{_localstatedir}/log/%{name}.log
@@ -333,10 +326,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
@@ -382,6 +381,15 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Fri Sep 01 2023 Jan Kolarik <jkolarik@redhat.com> - 4.17.0-1
+- Update to 4.17.0
+- crypto: Use libdnf crypto API instead of using GnuPG/GpgME
+- Reprotect dnf, unprotect python3-dnf (RhBug:2221905)
+- Block signals during RPM transaction processing (RhBug:2133398)
+- Fix bash completion due to sqlite changes (RhBug:2232052)
+- automatic: allow use of STARTTLS/TLS
+- automatic: use email_port specified in config
+
 * Wed Aug 16 2023 Jan Kolarik <jkolarik@redhat.com> - 4.16.2-4
 - Fixes of conditions in spec file
 
diff --git a/sources b/sources
index 0d59ae8..6e063eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-4.16.2.tar.gz) = 2a4cad1594c6f6f51958a7cb04632d3d4dee9df99cd29c68fa937b505fe348531cf3b1e89722563a20970dc1a301f7d2171976d92d6d702d761faa8c5af99313
+SHA512 (dnf-4.17.0.tar.gz) = d9d18bb5e3e0bdd77221ff886569a3210288c4fabb536c90b476351b5f53f443be86a4b4c086da168dde48718382bb1427bc9259a3241266847c7bb0940bdfb9