diff --git a/.gitignore b/.gitignore index 7a2fa13..04231ec 100644 --- a/.gitignore +++ b/.gitignore @@ -159,3 +159,4 @@ /anaconda-30.1.tar.bz2 /anaconda-30.2.tar.bz2 /anaconda-30.3.tar.bz2 +/anaconda-30.4.tar.bz2 diff --git a/0001-Drop-attempt-to-add-nocrypto-to-tsflags.patch b/0001-Drop-attempt-to-add-nocrypto-to-tsflags.patch deleted file mode 100644 index 9539973..0000000 --- a/0001-Drop-attempt-to-add-nocrypto-to-tsflags.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 18883ab79be8186363e48418feb34c7890e1c30d Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 26 Sep 2018 18:45:41 -0700 -Subject: [PATCH] Drop attempt to add 'nocrypto' to tsflags - -This has not actually *worked* since DNF 3.0, due to -https://bugzilla.redhat.com/show_bug.cgi?id=1595917 . You can -check this for yourself quite easily, with DNF 3.0 to 3.5.1: - ->>> import dnf.base ->>> base = dnf.base.Base() ->>> base.conf.tsflags -[] ->>> base.conf.tsflags.append('nocrypto') ->>> base.conf.tsflags -[] ->>> - -If you try this on DNF 3.6, you will notice that it errors out, -because in DNF 3.6, these types of config options are presented -as tuples rather than lists, as a way to try and spot now-broken -usages like this. - -I suggest we just drop this entirely, because if it was actually -*necessary* any more, we would've been running into the problem -this was supposed to work around - #1006280 - ever since DNF 3.0 -landed and it became a no-op. As we have *not* been (AFAIK) -running into any such problems, let's just drop it. - -Signed-off-by: Adam Williamson ---- - pyanaconda/payload/dnfpayload.py | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/pyanaconda/payload/dnfpayload.py b/pyanaconda/payload/dnfpayload.py -index 15f4ca997..82abd388f 100644 ---- a/pyanaconda/payload/dnfpayload.py -+++ b/pyanaconda/payload/dnfpayload.py -@@ -670,10 +670,6 @@ class DNFPayload(payload.PackagePayload): - - self._base.conf.substitutions.update_from_etc(conf.installroot) - -- # NSS won't survive the forking we do to shield out chroot during -- # transaction, disable it in RPM: -- conf.tsflags.append('nocrypto') -- - if self.data.packages.multiLib: - conf.multilib_policy = "all" - --- -2.19.0 - diff --git a/anaconda.spec b/anaconda.spec index 2bd3a15..f8d76fc 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -6,8 +6,8 @@ Summary: Graphical system installer Name: anaconda -Version: 30.3 -Release: 2%{?dist} +Version: 30.4 +Release: 1%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -18,10 +18,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 -# Fix DNF 3.6 compat -# https://github.com/rhinstaller/anaconda/pull/1627 -# https://bugzilla.redhat.com/show_bug.cgi?id=1595917 -Patch0: 0001-Drop-attempt-to-add-nocrypto-to-tsflags.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -255,7 +251,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch0 -p1 %build # use actual build-time release number, not tarball creation time release number @@ -353,8 +348,34 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Sep 26 2018 Adam Williamson - 30.3-2 -- Backport #1627 to fix DNF 3.6 compat (#1595917) +* Wed Oct 03 2018 Martin Kolman - 30.4-1 +- Fix strings not marked for translation (jkonecny) +- Drop attempt to add 'nocrypto' to tsflags (awilliam) +- Fix librepo logging with new DNF (jkonecny) +- Revert "Remove librepo imports from Anaconda (#1626609)" (jkonecny) +- Set the VNC password directly (#1592686) (vponcova) +- Update the spoke for unsupported hardware in TUI (#1601545) (vponcova) +- Update the dialog for unsupported hardware in GUI (#1601545) (vponcova) +- Support detection of kernel taints (vponcova) +- Fix the rescue mode (#1631749) (vponcova) +- Fix the sanity check verify_gpt_biosboot (#1593446) (vponcova) +- Flags shouldn't process the kernel options (vponcova) +- Fully support the inst.gpt option (vponcova) +- Don't set Anaconda-specific flags in Blivet (vponcova) +- Remove the class for kernel arguments from pyanaconda.flags (vponcova) +- Remove unused false positives (vponcova) +- Don't connect to signals of the Network Manager DBus objects (#1582233) + (vponcova) +- Fix documentation for setting Pykickstart command version (mkolman) +- Don't try to get hostnamed proxy in non-installer-image environments + (#1616214) (rvykydal) +- Use realm data in UI (vponcova) +- Use realm data in the DBus module (vponcova) +- Create a DBus structure for realm data (vponcova) +- Add support for DBus structures (vponcova) +- docs/commit-log.rst: Don't wrap example firstlines (ferdnyc) +- Detect that there is not enough space on a device (#1613232) (vponcova) +- Add Silverblue InstallClass (jkonecny) * Tue Sep 11 2018 Martin Kolman - 30.3-1 - Save lsblk output to the Anaconda traceback file (vtrefny) diff --git a/sources b/sources index d98e2ee..592ea0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-30.3.tar.bz2) = 5c440a82f50bea26fdd77e86f0f24e4ac2799cd5663662334a5858fb133c1cdfe9cb48f01b7dfd0f723b0b6c202a342f8db5aa52477d7a23730e3e4fbf54a474 +SHA512 (anaconda-30.4.tar.bz2) = e3889b6e5afffb8d89ef21c1ebc86756d7735f1cc1b8a12c881d48fce216ee4247d61209d7a6e1dde265f14f9991f349821f2fdb4fb27aeea63e3bc5519bec40