From 4b69bb2d3476f7880ff76c1ac380a945d2b28f4e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 13 Dec 2022 06:11:16 +0000 Subject: [PATCH] Auto sync2gitlab import of dnf-4.7.0-14.el8.src.rpm --- ...t-changes-to-offline-upgrade-command.patch | 95 +++++++++++++++++++ dnf.spec | 8 +- 2 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 0037-Document-changes-to-offline-upgrade-command.patch diff --git a/0037-Document-changes-to-offline-upgrade-command.patch b/0037-Document-changes-to-offline-upgrade-command.patch new file mode 100644 index 0000000..80ff1ad --- /dev/null +++ b/0037-Document-changes-to-offline-upgrade-command.patch @@ -0,0 +1,95 @@ +From 97fe94c94f030f5596a3a3ac52748bdd7544ad52 Mon Sep 17 00:00:00 2001 +From: Jan Kolarik +Date: Tue, 1 Nov 2022 09:15:08 +0000 +Subject: [PATCH] Document changes to offline-upgrade command (RhBug:1939975) + +A support for security filters was added to the offline-upgrade command. This commit adds the documentation into the man pages. + += changelog = +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1939975 +--- + doc/command_ref.rst | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/doc/command_ref.rst b/doc/command_ref.rst +index bee6a109..7279b3a4 100644 +--- a/doc/command_ref.rst ++++ b/doc/command_ref.rst +@@ -113,7 +113,7 @@ Options + + ``--advisory=, --advisories=`` + Include packages corresponding to the advisory ID, Eg. FEDORA-2201-123. +- Applicable for the install, repoquery, updateinfo and upgrade commands. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``--allowerasing`` + Allow erasing of installed packages to resolve dependencies. This option could be used as an alternative to the ``yum swap`` command where packages to remove are not explicitly defined. +@@ -125,12 +125,12 @@ Options + Try the best available package versions in transactions. Specifically during :ref:`dnf upgrade `, which by default skips over updates that can not be installed for dependency reasons, the switch forces DNF to only consider the latest packages. When running into packages with broken dependencies, DNF will fail giving a reason why the latest version can not be installed. + + ``--bugfix`` +- Include packages that fix a bugfix issue. Applicable for the install, repoquery, updateinfo and +- upgrade commands. ++ Include packages that fix a bugfix issue. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``--bz=, --bzs=`` +- Include packages that fix a Bugzilla ID, Eg. 123123. Applicable for the install, repoquery, +- updateinfo and upgrade commands. ++ Include packages that fix a Bugzilla ID, Eg. 123123. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``-C, --cacheonly`` + Run entirely from system cache, don't update the cache and use it even in case it is expired. +@@ -148,8 +148,8 @@ Options + + ``--cve=, --cves=`` + Include packages that fix a CVE (Common Vulnerabilities and Exposures) ID +- (http://cve.mitre.org/about/), Eg. CVE-2201-0123. Applicable for the install, repoquery, updateinfo, +- and upgrade commands. ++ (http://cve.mitre.org/about/), Eg. CVE-2201-0123. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``-d , --debuglevel=`` + Debugging output level. This is an integer value between 0 (no additional information strings) and 10 (shows all debugging information, even that not understandable to the user), default is 2. Deprecated, use ``-v`` instead. +@@ -208,8 +208,8 @@ Options + Enable additional repositories by an id or a glob. + + ``--enhancement`` +- Include enhancement relevant packages. Applicable for the install, repoquery, updateinfo and +- upgrade commands. ++ Include enhancement relevant packages. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + .. _exclude_option-label: + +@@ -280,8 +280,8 @@ Options + ``--setopt`` using configuration from ``/path/dnf.conf``. + + ``--newpackage`` +- Include newpackage relevant packages. Applicable for the install, repoquery, updateinfo and +- upgrade commands. ++ Include newpackage relevant packages. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``--noautoremove`` + Disable removal of dependencies that are no longer used. It sets +@@ -353,11 +353,11 @@ Options + + ``--sec-severity=, --secseverity=`` + Includes packages that provide a fix for an issue of the specified severity. +- Applicable for the install, repoquery, updateinfo and upgrade commands. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + ``--security`` +- Includes packages that provide a fix for a security issue. Applicable for the +- upgrade command. ++ Includes packages that provide a fix for a security issue. ++ Applicable for the ``install``, ``repoquery``, ``updateinfo``, ``upgrade`` and ``offline-upgrade`` (dnf-plugins-core) commands. + + .. _setopt_option-label: + +-- +2.38.1 + diff --git a/dnf.spec b/dnf.spec index 5006363..310eb10 100644 --- a/dnf.spec +++ b/dnf.spec @@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ @@ -112,6 +112,7 @@ Patch0033: 0033-Allow-passing-plugin-parameters-with-dashes-in-names.patch Patch0034: 0034-Fix-plugins-unit-tests-unload-plugins-upon-their-del.patch Patch0035: 0035-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch Patch0036: 0036-Add-support-for-rollback-of-group-upgrade-rollback-R.patch +Patch0037: 0037-Document-changes-to-offline-upgrade-command.patch BuildArch: noarch @@ -412,7 +413,10 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog -* Wed Oct 26 2022 Nicola Sella - 4.7.0.13 +* Wed Nov 30 2022 Nicola Sella - 4.7.0-14 +- Document changes to offline-upgrade command (RhBug:1939975,2139324) + +* Wed Oct 26 2022 Nicola Sella - 4.7.0-13 - Add support for rollback of group upgrade rollback (RhBug:2016070) - Move system-upgrade plugin to core (RhBug:2054235) - Fix plugins unit tests + unload plugins upon their deletion (RhBug:2134309)