Merge remote-tracking branch 'up/f29' into f29-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

.gitignore

@@ -118,3 +118,8 @@
 /dnf-3.1.0.tar.gz
 /dnf-3.2.0.tar.gz
 /dnf-3.3.0.tar.gz
+/dnf-3.5.0.tar.gz
+/dnf-3.5.1.tar.gz
+/dnf-3.6.1.tar.gz
+/dnf-4.0.4.tar.gz
+/dnf-4.0.9.tar.gz

dnf-riscv64-noaudit-hack.patch

@@ -0,0 +1,13 @@
+diff --git a/dnf/db/history.py b/dnf/db/history.py
+index f4158ec..d336046 100644
+--- a/dnf/db/history.py
++++ b/dnf/db/history.py
+@@ -445,7 +445,7 @@ class SwdbInterface(object):
+             int(calendar.timegm(time.gmtime())),
+             str(rpmdb_version),
+             cmdline or "",
+-            int(misc.getloginuid())
++            0
+             )
+         self.swdb.setReleasever(self.releasever)
+         self._tid = tid

dnf.spec

@@ -1,13 +1,12 @@
 # default dependencies
-%global hawkey_version 0.17.2
-%global librepo_version 1.9.0
+%global hawkey_version 0.22.3
 %global libcomps_version 0.1.8
 %global libmodulemd_version 1.4.0
 %global rpm_version 4.14.0
 
 # conflicts
-%global conflicts_dnf_plugins_core_version 3.0.1
-%global conflicts_dnf_plugins_extras_version 3.0.0
+%global conflicts_dnf_plugins_core_version 4.0.2
+%global conflicts_dnf_plugins_extras_version 3.0.2
 %global conflicts_dnfdaemon_version 0.3.19
 
 # override dependencies for rhel 7
@@ -31,7 +30,8 @@
 %bcond_without python3
 %endif
 
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} > 29
+# Disable python2 build
 %bcond_with python2
 %else
 %bcond_without python2
@@ -40,9 +40,9 @@
 # configurable name for the compat yum package
 %global yum_subpackage_name %{name}-yum
 
-# provide yum4 on rhel <= 7 to avoid conflict with existing yum
+# provide nextgen-yum4 on rhel <= 7 to avoid conflict with existing yum
 %if 0%{?rhel} && 0%{?rhel} <= 7
-    %global yum_subpackage_name yum4
+    %global yum_subpackage_name nextgen-yum4
 %endif
 
 # provide yum on rhel >= 8, it replaces old yum
@@ -72,13 +72,17 @@
 It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
-Version:        3.3.0
-Release:        1%{?dist}
+Version:        4.0.9
+Release:        1.0.riscv64%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+ and GPLv2 and GPL
 URL:            https://github.com/rpm-software-management/dnf
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# HACK for RISC-V (riscv64). We cannot use getloginuid() which depends on
+# audit support in kernel (not available for RISC-V).
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1597005
+Patch0100:      dnf-riscv64-noaudit-hack.patch
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -143,15 +147,14 @@ Provides:       %{name}-conf = %{version}-%{release}
 Common data and configuration files for DNF
 
 %package -n %{yum_subpackage_name}
-# DNF == YUM4; prefix version with 4.0 to make it higher than any version of YUM3
-# save and restore version, otherwise setting Version affects other sub-packages
-%global pkg_version %{version}
-Version:        4.0.%{version}
-%global version %{pkg_version}
 Requires:       %{name} = %{version}-%{release}
 Summary:        %{pkg_summary}
 %if 0%{?fedora}
+%if 0%{?fedora} >= 30
 Conflicts:      yum
+%else
+Conflicts:      yum < 3.4.3-505
+%endif
 %endif
 
 %description -n %{yum_subpackage_name}
@@ -166,26 +169,26 @@ BuildRequires:  python2-hawkey >= %{hawkey_version}
 BuildRequires:  python2-libdnf >= %{hawkey_version}
 BuildRequires:  python2-libcomps >= %{libcomps_version}
 BuildRequires:  python2-libdnf
-BuildRequires:  python2-librepo >= %{librepo_version}
 BuildRequires:  python2-nose
 BuildRequires:  libmodulemd >= %{libmodulemd_version}
 Requires:       libmodulemd >= %{libmodulemd_version}
 %if (0%{?rhel} && 0%{?rhel} <= 7)
 BuildRequires:  pygpgme
 Requires:       pygpgme
-BuildRequires:  python-gobject-base
-Requires:       python-gobject-base
+BuildRequires:  python-enum34
+Requires:       python-enum34
 %else
-BuildRequires:  python2-gobject-base
-Requires:       python2-gobject-base
 BuildRequires:  python2-gpg
 Requires:       python2-gpg
+BuildRequires:  python2-enum34
+Requires:       python2-enum34
 %endif
 BuildRequires:  pyliblzma
 Requires:       pyliblzma
 Requires:       %{name}-data = %{version}-%{release}
 %if 0%{?fedora}
 Recommends:     deltarpm
+Recommends:     python2-unbound
 %endif
 %if 0%{?centos}
 Requires:       deltarpm
@@ -194,7 +197,6 @@ Requires:       python2-hawkey >= %{hawkey_version}
 Requires:       python2-libdnf >= %{hawkey_version}
 Requires:       python2-libcomps >= %{libcomps_version}
 Requires:       python2-libdnf
-Requires:       python2-librepo >= %{librepo_version}
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  python-iniparse
 Requires:       python-iniparse
@@ -223,11 +225,8 @@ BuildRequires:  python3-libdnf >= %{hawkey_version}
 BuildRequires:  python3-iniparse
 BuildRequires:  python3-libcomps >= %{libcomps_version}
 BuildRequires:  python3-libdnf
-BuildRequires:  python3-librepo >= %{librepo_version}
 BuildRequires:  libmodulemd >= %{libmodulemd_version}
 Requires:       libmodulemd >= %{libmodulemd_version}
-BuildRequires:  python3-gobject-base
-Requires:       python3-gobject-base
 BuildRequires:  python3-nose
 BuildRequires:  python3-gpg
 Requires:       python3-gpg
@@ -243,9 +242,9 @@ Requires:       python3-libdnf >= %{hawkey_version}
 Requires:       python3-iniparse
 Requires:       python3-libcomps >= %{libcomps_version}
 Requires:       python3-libdnf
-Requires:       python3-librepo >= %{librepo_version}
 BuildRequires:  python3-rpm >= %{rpm_version}
 Requires:       python3-rpm >= %{rpm_version}
+Recommends:     python3-unbound
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:       rpm-plugin-systemd-inhibit
 %else
@@ -334,6 +333,12 @@ ln -sr  %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/yum
 %endif
 %endif
 rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
+%if "%{yum_subpackage_name}" == "yum"
+mkdir -p %{buildroot}%{_sysconfdir}/yum
+ln -sr  %{buildroot}%{pluginconfpath} %{buildroot}%{_sysconfdir}/yum/pluginconf.d
+ln -sr  %{buildroot}%{confdir}/protected.d %{buildroot}%{_sysconfdir}/yum/protected.d
+ln -sr  %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
+%endif
 
 
 %check
@@ -401,8 +406,6 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %dir %{confdir}/modules.d
 %dir %{confdir}/modules.defaults.d
 %dir %{pluginconfpath}
-%dir %{_sysconfdir}/%{name}/modules.d
-%dir %{_sysconfdir}/%{name}/modules.defaults.d
 %dir %{confdir}/protected.d
 %dir %{confdir}/vars
 %config(noreplace) %{confdir}/%{name}.conf
@@ -426,11 +429,20 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %{_bindir}/yum
 %{_mandir}/man8/yum.8*
 %{_sysconfdir}/yum.conf
+%{_sysconfdir}/yum/pluginconf.d
+%{_sysconfdir}/yum/protected.d
+%{_sysconfdir}/yum/vars
 %{_mandir}/man5/yum.conf.5.*
 %{_mandir}/man8/yum.8*
+%{_mandir}/man8/yum-shell.8*
+%else
+%exclude %{_mandir}/man8/yum-shell.8*
+%exclude %{_sysconfdir}/yum/pluginconf.d
+%exclude %{_sysconfdir}/yum/protected.d
+%exclude %{_sysconfdir}/yum/vars
 %endif
 
-%if "%{yum_subpackage_name}" == "yum4"
+%if "%{yum_subpackage_name}" == "nextgen-yum4"
 %{_bindir}/yum4
 %{_mandir}/man8/yum4.8*
 %exclude %{_sysconfdir}/yum.conf
@@ -439,10 +451,15 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %endif
 
 %if "%{yum_subpackage_name}" == "%{name}-yum"
-%{_sysconfdir}/yum.conf
 %{_bindir}/yum
-%{_mandir}/man5/yum.conf.5*
 %{_mandir}/man8/yum.8*
+%if 0%{?fedora} >= 30
+%{_sysconfdir}/yum.conf
+%{_mandir}/man5/yum.conf.5*
+%else
+%exclude %{_sysconfdir}/yum.conf
+%exclude %{_mandir}/man5/yum.conf.5*
+%endif
 %endif
 
 %if %{with python2}
@@ -481,6 +498,65 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %endif
 
 %changelog
+* Mon Nov 26 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 4.0.9-1.0.riscv64
+- Add a hack for RISC-V (riscv64) to avoid using audit related features
+
+* Thu Nov 22 2018 Jaroslav Mracek <jmracek@redhat.com> - 4.0.9-1
+- Added dnf.repo.Repo.get_http_headers
+- Added dnf.repo.Repo.set_http_headers
+- Added dnf.repo.Repo.add_metadata_type_to_download
+- Added dnf.repo.Repo.get_metadata_path
+- Added dnf.repo.Repo.get_metadata_content
+- Added --changelogs option for check-update command
+- [module] Add information about active modules
+- Hide messages created only for logging
+- Enhanced --setopt option
+- [module] Fix dnf remove @<module>
+- [transaction] Make transaction content available for plugins
+
+* Wed Nov 07 2018 Jaroslav Mracek <jmracek@redhat.com> - 4.0.4-2
+- Backport fixes for RHBZ#1642796 from upstream master
+
+* Mon Oct 15 2018 Jaroslav Mracek <jmracek@redhat.com> - 4.0.4-1
+- Update to 4.0.4
+- Add dnssec extension
+- Set termforce to AUTO to automatically detect if stdout is terminal
+- Repoquery command accepts --changelogs option (RhBug:1483458)
+- Calculate sack version from all installed packages (RhBug:1624291)
+- [module] Allow to enable module dependencies (RhBug:1622566)
+
+* Tue Oct 09 2018 Adam Williamson <awilliam@redhat.com> - 3.6.1-2
+- Backport fixes for RHBZ#1616118 from upstream master
+
+* Tue Sep 25 2018 Jaroslav Mracek <jmracek@redhat.com> - 3.6.1-1
+- [module] Improved module commands list, info
+- [module] Reports error from module solver
+- Fix: Error detected when calling 'RepoCB.fastestMirror' (RhBug:1628056)
+- Preserve packages from other installed mod profiles (RhBug:1629841)
+- [spec] Postpone conflict with yum to Fedora 30+ (RhBug:1600444)
+- [cli] Install command recommends alternative packages (RhBug:1625586)
+- [cli] Fix case insensitive hint (1628514)
+- Fix installed profiles for module info (RhBug:1629689)
+- Fix module provides not having consistent output (RhBug:1623866)
+- Enhance label for transaction table (RhBug:1609919)
+- Implement C_, the gettext function with a context (RhBug:1305340)
+- Actually disambiguate some messages using C_ (RhBug:1305340)
+- Restore 'strict' choice for group installs (#1461539)
+- [repoquery] More strict queryformat parsing (RhBug:1631458)
+- Redirect repo progress to std error (RhBug:1626011)
+- Unify behavior of remove and module remove (RhBug:1629848)
+- Change behavior of disabled module for module install (RhBug:1629711)
+- Allow enablement on disabled plugin (RhBug:1614539)
+
+* Mon Sep 10 2018 Jaroslav Mracek <jmracek@redhat.com> - 3.5.1-1
+- [module] Fixed list and info subcommands
+
+* Fri Sep 07 2018 Jaroslav Mracek <jmracek@redhat.com> - 3.5.0-1
+- New implementation of modularity
+
+* Tue Aug 28 2018 Daniel Mach <dmach@redhat.com> - 3.3.0-2
+- [history] Fix 'attempt to write a readonly database' error in addConsoleOutputLine().
+
 * Mon Aug 13 2018 Daniel Mach <dmach@redhat.com> - 3.3.0-1
 - [misc] Fallback to os.getuid() if /proc/self/loginuid can't be read (RhBug:1597005)
 - [translations] Update translations from zanata.

sources

@@ -1 +1 @@
-SHA512 (dnf-3.3.0.tar.gz) = 850e5783b96deb3d6c8fd16beb1f1ceccbca70fcf2efd139a4786b017eca45993ac86dfa1d6131729083519be0c22846b7d06b005cb7f006b35ba8460662f4de
+SHA512 (dnf-4.0.9.tar.gz) = c8c1e58a74befd5c27f64a3647a2b29c228db5238bab85cd2aa635c6b50e883c8da66c5c36f57dcc513d0dfd0888a1680a311a685bd35105415c5d642d1a7dc7