rpms/dnf
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS dnf-4.14.0-17.el9

Browse Source
This commit is contained in:
eabdullin 2024-09-30 15:20:35 +00:00
parent ea69acc362
commit cc2d726add
13 changed files with 640 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
SOURCES/0015-Add-all-candidates-for-reinstall-to-solver.patch Normal file
View File

@ -0,0 +1,79 @@
From 0592ff47bc1b9029eb9b25d59410062038fdacd3 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Thu, 15 Feb 2024 11:28:59 +0100
Subject: [PATCH] Add all candidates for reinstall to solver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 96f8d79c37e119ff56f730797865121b63241a6b
Resolves: https://issues.redhat.com/browse/RHEL-25005
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/base.py | 9 ++++++---
dnf/query.py | 5 ++++-
tests/test_queries.py | 7 ++++++-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/dnf/base.py b/dnf/base.py
index 50869ec4..adb5ad6f 100644
--- a/dnf/base.py
+++ b/dnf/base.py
@@ -2333,19 +2333,22 @@ class Base(object):
if not installed_pkgs:
raise dnf.exceptions.PackagesNotInstalledError(
- 'no package matched', pkg_spec, available_nevra2pkg.values())
+ 'no package matched', pkg_spec, available_q.run())
cnt = 0
clean_deps = self.conf.clean_requirements_on_remove
+ strict = self.conf.strict
for installed_pkg in installed_pkgs:
try:
- available_pkg = available_nevra2pkg[ucd(installed_pkg)]
+ available_pkgs = available_nevra2pkg[ucd(installed_pkg)]
except KeyError:
if not remove_na:
continue
self._goal.erase(installed_pkg, clean_deps=clean_deps)
else:
- self._goal.install(available_pkg)
+ sltr = dnf.selector.Selector(self.sack)
+ sltr.set(pkg=available_pkgs)
+ self._goal.install(select=sltr, optional=(not strict))
cnt += 1
if cnt == 0:
diff --git a/dnf/query.py b/dnf/query.py
index ab4139bf..02e631a6 100644
--- a/dnf/query.py
+++ b/dnf/query.py
@@ -43,4 +43,7 @@ def _by_provides(sack, patterns, ignore_case=False, get_query=False):
return q.run()
def _per_nevra_dict(pkg_list):
- return {ucd(pkg):pkg for pkg in pkg_list}
+ nevra_dic = {}
+ for pkg in pkg_list:
+ nevra_dic.setdefault(ucd(pkg), []).append(pkg)
+ return nevra_dic
diff --git a/tests/test_queries.py b/tests/test_queries.py
index cdcb7ca4..e0253008 100644
--- a/tests/test_queries.py
+++ b/tests/test_queries.py
@@ -128,4 +128,9 @@ class DictsTest(tests.support.TestCase):
dct = dnf.query._per_nevra_dict(pkgs)
self.assertCountEqual(dct.keys(),
["lotus-3-16.x86_64", "lotus-3-16.i686"])
- self.assertCountEqual(dct.values(), pkgs)
+ test_list = []
+ for list_items in dct.values():
+ for item in list_items:
+ test_list.append(item)
+
+ self.assertCountEqual(test_list, pkgs)
--
2.44.0

41
SOURCES/0016-Fix-handling-installonly-packages-reasons.patch Normal file
View File

@ -0,0 +1,41 @@
From 657197afd95f387d0c60a288b7cdcbfa914f9cd2 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Mon, 11 Mar 2024 12:36:48 +0100
Subject: [PATCH 1/4] Fix handling installonly packages reasons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: a4d815e4df87f5afbae9d37c7faf6a9871d50b53
The original code took the first item from all remaining packages.
It means a random reason and use it to keep installonly package reason.
Related: https://issues.redhat.com/browse/RHEL-15902
Closes: https://github.com/rpm-software-management/dnf/issues/2061
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/base.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dnf/base.py b/dnf/base.py
index adb5ad6f..b8237183 100644
--- a/dnf/base.py
+++ b/dnf/base.py
@@ -815,9 +815,11 @@ class Base(object):
if erasures:
remaining_installed_query = self.sack.query(flags=hawkey.IGNORE_EXCLUDES).installed()
remaining_installed_query.filterm(pkg__neq=erasures)
+ remaining_installed_query.apply()
for pkg in erasures:
- if remaining_installed_query.filter(name=pkg.name):
- remaining = remaining_installed_query[0]
+ tmp_remaining_installed_query = remaining_installed_query.filter(name=pkg.name, arch=pkg.arch)
+ if tmp_remaining_installed_query:
+ remaining = tmp_remaining_installed_query[0]
ts.get_reason(remaining)
self.history.set_reason(remaining, ts.get_reason(remaining))
self._ds_callback.pkg_added(pkg, 'e')
--
2.45.0

36
SOURCES/0017-Remove-confusing-sentence-from-documentation.patch Normal file
View File

@ -0,0 +1,36 @@
From 64ca173adf414354c158e429ffec23e4560bb65f Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Fri, 8 Mar 2024 12:51:26 +0100
Subject: [PATCH 2/4] Remove confusing sentence from documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 824a95e1786b460102d9bf4a2cec0ce7973f882e
Installonly packages are handled by autoremove command in a similar
way like other package.
Resolves: https://issues.redhat.com/browse/RHEL-15902
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 3 ---
1 file changed, 3 deletions(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index 0e6cea01..b92a1f10 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -501,9 +501,6 @@ Autoremove Command
Removes all "leaf" packages from the system that were originally installed as dependencies of user-installed packages, but which are no longer required by any such package.
-Packages listed in :ref:`installonlypkgs <installonlypkgs-label>` are never automatically removed by
-this command.
-
``dnf [options] autoremove <spec>...``
This is an alias for the :ref:`\remove_command-label` command with clean_requirements_on_remove set to
--
2.45.0

36
SOURCES/0018-Remove-leaf-word-from-documentation.patch Normal file
View File

@ -0,0 +1,36 @@
From 2ea32ace13f6a30f86e03b690f284c0ec0992a19 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Fri, 8 Mar 2024 12:56:57 +0100
Subject: [PATCH 3/4] Remove "leaf" word from documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: a6d4cd745ce27c09d6cdb4302177b2bfed600549
Leaf packages term is not define in documentation and it even
represent different set of packages that are showed by leaves command.
Related: https://issues.redhat.com/browse/RHELDOCS-17711
Resolves: https://issues.redhat.com/browse/RHEL-15902
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index b92a1f10..8991df2f 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -499,7 +499,7 @@ Autoremove Command
``dnf [options] autoremove``
- Removes all "leaf" packages from the system that were originally installed as dependencies of user-installed packages, but which are no longer required by any such package.
+ Removes all packages from the system that were originally installed as dependencies of user-installed packages, but which are no longer required by any such package.
``dnf [options] autoremove <spec>...``
--
2.45.0

37
SOURCES/0019-Update-documentation-of-history-userinstalled-comman.patch Normal file
View File

@ -0,0 +1,37 @@
From c09865aa3af8248c69b7aa064fe6e96f68e03de1 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Fri, 8 Mar 2024 14:06:26 +0100
Subject: [PATCH 4/4] Update documentation of history userinstalled command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 929d9133971b53eabfd65d989ded0de8f72f95ea
The described behavior differs from current behavior therefore
it might create a confusion.
Resolves: https://issues.redhat.com/browse/RHEL-15902
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index 8991df2f..ffb84407 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -795,8 +795,8 @@ transactions and act according to this information (assuming the
the current state of RPMDB, it will not undo the transaction.
``dnf history userinstalled``
- Show all installonly packages, packages installed outside of DNF and packages not
- installed as dependency. I.e. it lists packages that will stay on the system when
+ Show all packages installed by user, installed from a group or a module profile, and packages
+ installed outside of DNF. I.e. it lists packages that will stay on the system when
:ref:`\autoremove_command-label` or :ref:`\remove_command-label` along with
`clean_requirements_on_remove` configuration option set to True is executed. Note the same
results can be accomplished with ``dnf repoquery --userinstalled``, and the repoquery
--
2.45.0

39
SOURCES/0020-automatic-Use-add_security_filters-not-_update_secur.patch Normal file
View File

@ -0,0 +1,39 @@
From 5388d980c8137c3ee6924f145bd284169d838fad Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
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ř <ppisar@redhat.com>
---
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

38
SOURCES/0021-remove-duplicates-when-no-duplicates-exit-with-0-RHE.patch Normal file
View File

@ -0,0 +1,38 @@
From c24e1521813dc002994f243c2b9de331b763b434 Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Fri, 5 Apr 2024 14:42:38 +0200
Subject: [PATCH 1/2] remove --duplicates: when no duplicates, exit with 0
(RHEL-6424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 720338fed8124b120b56cc99cc0b13dfe48ffe95
If no duplicates are present, then the command succesfully removed all
duplicates and should exit with 0 and write the message to stdout
instead of stderr.
Resolves: https://issues.redhat.com/browse/RHEL-6424
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/cli/commands/remove.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dnf/cli/commands/remove.py b/dnf/cli/commands/remove.py
index e455ba6e..af9622fd 100644
--- a/dnf/cli/commands/remove.py
+++ b/dnf/cli/commands/remove.py
@@ -92,7 +92,8 @@ class RemoveCommand(commands.Command):
instonly = self.base._get_installonly_query(q.installed())
dups = q.duplicated().difference(instonly)
if not dups:
- raise dnf.exceptions.Error(_('No duplicated packages found for removal.'))
+ logger.info(_('No duplicated packages found for removal.'))
+ return
for (name, arch), pkgs_list in dups._na_dict().items():
if len(pkgs_list) < 2:
--
2.45.0

38
SOURCES/0022-remove-oldinstallonly-when-no-old-installonly-packag.patch Normal file
View File

@ -0,0 +1,38 @@
From 1e78096d569eecbd3201c821cb3484328caf8789 Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Fri, 5 Apr 2024 14:43:04 +0200
Subject: [PATCH 2/2] remove --oldinstallonly: when no old installonly
packages, exit with 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 87eb5a7a3561381b5ef5e70548f49288251300fc
If no old installonly packages are present, then the command succesfully
removed all of them and should exit with 0 and write the message to
stdout instead of stderr.
Resolves: https://issues.redhat.com/browse/RHEL-6424
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/cli/commands/remove.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dnf/cli/commands/remove.py b/dnf/cli/commands/remove.py
index af9622fd..32e78d6d 100644
--- a/dnf/cli/commands/remove.py
+++ b/dnf/cli/commands/remove.py
@@ -124,8 +124,7 @@ class RemoveCommand(commands.Command):
for pkg in instonly:
self.base.package_remove(pkg)
else:
- raise dnf.exceptions.Error(
- _('No old installonly packages found for removal.'))
+ logger.info(_('No old installonly packages found for removal.'))
return
# Remove groups.
--
2.45.0

138
SOURCES/0023-Limit-queries-to-nevra-forms-when-provided-by-comman.patch Normal file
View File

@ -0,0 +1,138 @@
From 9870192e1acdfa6bb786faf8ae7f989795e52003 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Wed, 22 May 2024 11:09:34 +0200
Subject: [PATCH 1/2] Limit queries to nevra forms when provided by command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: b3b9b3a48ca5efd9935f3f12bb65530a51ade09c
Command `dnf install-n <provide>` does not install only according
to package mame but still search in provides. The patch limits
searrch only to NEVRA forms for install, remove, autoremove,
and repoquery commands.
Resolves partially: https://issues.redhat.com/browse/RHEL-5747
Resolves: https://issues.redhat.com/browse/RHEL-38470
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/base.py | 14 ++++++++++++--
dnf/cli/commands/repoquery.py | 5 +++--
doc/api_base.rst | 6 +++++-
doc/command_ref.rst | 7 +++++--
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/dnf/base.py b/dnf/base.py
index b8237183..13222407 100644
--- a/dnf/base.py
+++ b/dnf/base.py
@@ -2061,9 +2061,14 @@ class Base(object):
def install(self, pkg_spec, reponame=None, strict=True, forms=None):
# :api
"""Mark package(s) given by pkg_spec and reponame for installation."""
+ kwargs = {'forms': forms, 'with_src': False}
+ if forms:
+ kwargs['with_nevra'] = True
+ kwargs['with_provides'] = False
+ kwargs['with_filenames'] = False
subj = dnf.subject.Subject(pkg_spec)
- solution = subj.get_best_solution(self.sack, forms=forms, with_src=False)
+ solution = subj.get_best_solution(self.sack, **kwargs)
if self.conf.multilib_policy == "all" or subj._is_arch_specified(solution):
q = solution['query']
@@ -2303,8 +2308,13 @@ class Base(object):
def remove(self, pkg_spec, reponame=None, forms=None):
# :api
"""Mark the specified package for removal."""
+ kwargs = {'forms': forms}
+ if forms:
+ kwargs['with_nevra'] = True
+ kwargs['with_provides'] = False
+ kwargs['with_filenames'] = False
- matches = dnf.subject.Subject(pkg_spec).get_best_query(self.sack, forms=forms)
+ matches = dnf.subject.Subject(pkg_spec).get_best_query(self.sack, **kwargs)
installed = [
pkg for pkg in matches.installed()
if reponame is None or
diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
index dcd7996f..e8ca38c5 100644
--- a/dnf/cli/commands/repoquery.py
+++ b/dnf/cli/commands/repoquery.py
@@ -447,9 +447,10 @@ class RepoQueryCommand(commands.Command):
if self.opts.key:
remote_packages = self._add_add_remote_packages()
- kwark = {}
+ kwark = {'with_provides': False}
if self.opts.command in self.nevra_forms:
kwark["forms"] = [self.nevra_forms[self.opts.command]]
+ kwark['with_filenames'] = False
pkgs = []
query_results = q.filter(empty=True)
@@ -460,7 +461,7 @@ class RepoQueryCommand(commands.Command):
for key in self.opts.key:
query_results = query_results.union(
dnf.subject.Subject(key, ignore_case=True).get_best_query(
- self.base.sack, with_provides=False, query=q, **kwark))
+ self.base.sack, query=q, **kwark))
q = query_results
if self.opts.recent:
diff --git a/doc/api_base.rst b/doc/api_base.rst
index 389b28ec..95d2d570 100644
--- a/doc/api_base.rst
+++ b/doc/api_base.rst
@@ -280,7 +280,11 @@
.. method:: install(pkg_spec, reponame=None, strict=True, forms=None)
Mark packages matching `pkg_spec` for installation.
- `reponame` can be a name of a repository or a list of repository names. If given, the selection of available packages is limited to packages from these repositories. If strict is set to False, the installation ignores packages with dependency solving problems. Parameter `forms` has the same meaning as in :meth:`dnf.subject.Subject.get_best_query`.
+ `reponame` can be a name of a repository or a list of repository names. If given, the selection of available
+ packages is limited to packages from these repositories. If strict is set to False, the installation ignores
+ packages with dependency solving problems. Parameter `forms` is list of pattern forms from `hawkey`_.
+ Leaving the parameter to ``None`` results in using a reasonable default list of forms. When forms is specified,
+ method will not match `pkg_spec` with provides and file provides.
.. method:: package_downgrade(pkg, strict=False)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index ffb84407..e97c0d60 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -857,7 +857,8 @@ Install Command
are considered correct, the resulting package is picked simply by lexicographical order.
There are also a few specific install commands ``install-n``, ``install-na`` and
- ``install-nevra`` that allow the specification of an exact argument in the NEVRA format.
+ ``install-nevra`` that allow the specification of an exact argument in the NEVRA format. As a consequence, <spec>
+ will be not matched with provides and file provides.
See also :ref:`\configuration_files_replacement_policy-label`.
@@ -1190,7 +1191,8 @@ Remove Command
Removes old installonly packages, keeping only latest versions and version of running kernel.
There are also a few specific remove commands ``remove-n``, ``remove-na`` and ``remove-nevra``
- that allow the specification of an exact argument in the NEVRA format.
+ that allow the specification of an exact argument in the NEVRA format. As a consequence, <spec>
+ will be not matched with provides and file provides.
Remove Examples
---------------
@@ -1254,6 +1256,7 @@ Repoquery Command
There are also a few specific repoquery commands ``repoquery-n``, ``repoquery-na`` and ``repoquery-nevra``
that allow the specification of an exact argument in the NEVRA format (does not affect arguments of options like --whatprovides <arg>, ...).
+ As a consequence, <spec> will be not matched with file provides.
Select Options
--------------
--
2.45.1

35
SOURCES/0024-doc-Remove-provide-of-spec-definition-for-repoquery-.patch Normal file
View File

@ -0,0 +1,35 @@
From b406aa778031abe550b84bdbdd6826ac3cf0866f Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Thu, 23 May 2024 11:25:29 +0200
Subject: [PATCH 2/2] [doc] Remove provide of spec definition for repoquery
command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: f211e1a41a3d3180481e930836ee1a52a7a32487
Repoquery command never matched spec with provides.
Resolves: https://issues.redhat.com/browse/RHEL-38470
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index e97c0d60..c419e7ed 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -1265,7 +1265,7 @@ Together with ``<package-file-spec>``, control what packages are displayed in th
packages to those matching the specification. All packages are considered if no ``<package-file-spec>`` is specified.
``<package-file-spec>``
- Package specification in the NEVRA format (name[-[epoch:]version[-release]][.arch]), a package provide or a file provide. See :ref:`Specifying Packages
+ Package specification in the NEVRA format (name[-[epoch:]version[-release]][.arch]) or a file provide. See :ref:`Specifying Packages
<specifying_packages-label>`.
``-a``, ``--all``
--
2.45.1

40
SOURCES/0025-man-Improve-upgrade-minimal-command-docs-RHEL-6417.patch Normal file
View File

@ -0,0 +1,40 @@
From 103d442551bfa11a2dae72fd31941ba1d5435bb6 Mon Sep 17 00:00:00 2001
From: Jan Kolarik <jkolarik@redhat.com>
Date: Tue, 30 Apr 2024 06:50:14 +0000
Subject: [PATCH] man: Improve upgrade-minimal command docs (RHEL-6417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 4a2b425d3f0b7ea95f9584834e86a15ad3c447ab
Making the man pages for the `upgrade-minimal` command clearer about how packages with advisories are upgraded.
Resolves: https://issues.redhat.com/browse/RHEL-6417
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index c419e7ed..42dd6e8a 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -1761,11 +1761,11 @@ Upgrade-Minimal Command
| Deprecated aliases: ``update-minimal``
``dnf [options] upgrade-minimal``
- Updates each package to the latest available version that provides a bugfix, enhancement
- or a fix for a security issue (security).
+ Updates each package to the nearest available version that provides
+ a bugfix, enhancement or a fix for a security issue (security).
``dnf [options] upgrade-minimal <package-spec>...``
- Updates each specified package to the latest available version that provides
+ Updates each specified package to the nearest available version that provides
a bugfix, enhancement or a fix for security issue (security). Updates
dependencies as necessary.
--
2.45.2

38
SOURCES/0026-doc-Makecache-with-timer-tries-only-one-mirror.patch Normal file
View File

@ -0,0 +1,38 @@
From 9ceb9b3591899aaa9bb4932bc20be2fa650cbddc Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Mon, 18 Mar 2024 11:58:08 +0100
Subject: [PATCH] doc: Makecache with timer tries only one mirror
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: a6d82221ae32045f0f788708a52d2f2bf5c5740b
Related: https://bugzilla.redhat.com/show_bug.cgi?id=922667
Related: https://issues.redhat.com/browse/RHEL-1342
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
doc/command_ref.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index 42dd6e8a..36817c00 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -973,10 +973,11 @@ Makecache Command
``dnf [options] makecache --timer``
Like plain ``makecache``, but instructs DNF to be more resource-aware,
- meaning it will not do anything if running on battery power and will terminate
+ meaning it will not do anything if running on battery power, it will terminate
immediately if it's too soon after the last successful ``makecache`` run
(see :manpage:`dnf.conf(5)`, :ref:`metadata_timer_sync
- <metadata_timer_sync-label>`).
+ <metadata_timer_sync-label>`), and if the first mirror in a repository mirrorlist fails,
+ it will not try to synchronize the metadata from more mirrors for that repository.
.. _mark_command-label:
--
2.45.2

46
SPECS/dnf.spec
View File

@ -69,7 +69,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf
Version: 4.14.0
Release: 9%{?dist}
Release: 17%{?dist}
Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPLv2+
@ -89,6 +89,18 @@ Patch11: 0011-Document-symbols-in-dnf-history-list-output.patch
Patch12: 0012-RHEL-11345-Fix-japanese-translations.patch
Patch13: 0013-RHEL-6396-Fix-substitution-in-kvp-in-add_new_repo.patch
Patch14: 0014-RHEL-6304-base-Add-obsoleters-of-only-latest-versions.patch
Patch15: 0015-Add-all-candidates-for-reinstall-to-solver.patch
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
Patch21: 0021-remove-duplicates-when-no-duplicates-exit-with-0-RHE.patch
Patch22: 0022-remove-oldinstallonly-when-no-old-installonly-packag.patch
Patch23: 0023-Limit-queries-to-nevra-forms-when-provided-by-comman.patch
Patch24: 0024-doc-Remove-provide-of-spec-definition-for-repoquery-.patch
Patch25: 0025-man-Improve-upgrade-minimal-command-docs-RHEL-6417.patch
Patch26: 0026-doc-Makecache-with-timer-tries-only-one-mirror.patch
BuildArch: noarch
BuildRequires: cmake
@ -377,6 +389,38 @@ popd
%{python3_sitelib}/%{name}/automatic/
%changelog
* Tue Aug 06 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-17
- Revert more specific error message on a locked OSTree system or a bootc system
without a usr-overlay (RHEL-49670)
* Wed Jul 24 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-16
- More specific error message on a locked OSTree system or a bootc system
without a usr-overlay (RHEL-49670)
* Wed Jun 12 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-15
- Document that "dnf makecache --timer" exits on a first failed mirror
(RHEL-1342)
* Mon Jun 03 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-14
- Fix dnf upgrade-minimal documentation in dnf(8) manual (RHEL-6417)
* Thu May 23 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-13
- Fix dnf remove-n, install-n, and autoremove-n commands to only match package
names (RHEL-38470)
* Tue May 21 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-12
- Fix reporting nothing-to-do for "dnf remove --duplicates" (RHEL-6424)
- Fix reporting nothing-to-do for "dnf remove --oldinstallonly" (RHEL-6424)
* Mon May 06 2024 Petr Pisar <ppisar@redhat.com> - 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 <ppisar@redhat.com> - 4.14.0-10
- Fix preferring the lowest-cost repositories on a reinstallation (RHEL-25005)
* Wed Oct 25 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.14.0-9
- Fix japanese translations (RHEL-11345)
- Fix substitution in kay-value-pair list in add_new_repo (RHEL-6396)