Update to 42.0.1

This commit is contained in:
David King 2022-03-24 11:38:58 +00:00
parent a9c0f7db6f
commit 732ac368b5
4 changed files with 7 additions and 50 deletions

1
.gitignore vendored
View File

@ -98,3 +98,4 @@
/gnome-initial-setup-42.beta.tar.xz /gnome-initial-setup-42.beta.tar.xz
/gnome-initial-setup-42.rc.tar.xz /gnome-initial-setup-42.rc.tar.xz
/gnome-initial-setup-42.0.tar.xz /gnome-initial-setup-42.0.tar.xz
/gnome-initial-setup-42.0.1.tar.xz

View File

@ -1,41 +0,0 @@
From bf5502df3e1d12a7a28ced86752c94baf509dbe0 Mon Sep 17 00:00:00 2001
From: Will Thompson <wjt@endlessos.org>
Date: Wed, 23 Mar 2022 16:08:31 +0000
Subject: [PATCH] Tell libhandy not to use Settings portal
By default, libhandy reads settings from the Settings portal, which causes
the portal to be started, which causes gnome-keyring to be started. This
interferes with our attempt to manually start gnome-keyring and set the
login keyring password to a well-known value, which we overwrite with
the user's password once they choose one.
To avoid this problem, set an environment variable to tell libhandy not
to use the portal.
Fixes: https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/141
---
gnome-initial-setup/gnome-initial-setup.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 245a1334..fe9a88db 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -276,6 +276,14 @@ main (int argc, char *argv[])
g_unsetenv ("GIO_USE_VFS");
+ /* By default, libhandy reads settings from the Settings portal, which causes
+ * the portal to be started, which causes gnome-keyring to be started. This
+ * interferes with our attempt below to manually start gnome-keyring and set
+ * the login keyring password to a well-known value, which we overwrite with
+ * the user's password once they choose one.
+ */
+ g_setenv ("HDY_DISABLE_PORTAL", "1", /* overwrite */ TRUE);
+
context = g_option_context_new (_("— GNOME initial setup"));
g_option_context_add_main_entries (context, entries, NULL);
--
GitLab

View File

@ -8,20 +8,14 @@
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-initial-setup Name: gnome-initial-setup
Version: 42.0 Version: 42.0.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: Bootstrapping your OS Summary: Bootstrapping your OS
License: GPLv2+ License: GPLv2+
URL: https://wiki.gnome.org/Design/OS/InitialSetup URL: https://wiki.gnome.org/Design/OS/InitialSetup
Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz
Source1: vendor.conf Source1: vendor.conf
# Tell libhandy not to use Settings portal
# Fixes setting new user keyring password
# https://bugzilla.redhat.com/show_bug.cgi?id=2066424
# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/141
# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/144
Patch0: 144.patch
BuildRequires: meson BuildRequires: meson
BuildRequires: gcc BuildRequires: gcc
@ -113,6 +107,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/gnome-initial-setup/vendor.conf %{_datadir}/gnome-initial-setup/vendor.conf
%changelog %changelog
* Thu Mar 24 2022 David King <amigadave@amigadave.com> - 42.0.1-1
- Update to 42.0.1
* Wed Mar 23 2022 Adam Williamson <awilliam@redhat.com> - 42.0-3 * Wed Mar 23 2022 Adam Williamson <awilliam@redhat.com> - 42.0-3
- Backport proposed upstream fix for keyring issue (#2066424) - Backport proposed upstream fix for keyring issue (#2066424)

View File

@ -1 +1 @@
SHA512 (gnome-initial-setup-42.0.tar.xz) = c4c2ac0e9315865dc64dbebafafc46abba8ca9664b43a9cfd1e737a547c3be913aa1143183b51e7fd25f39a8e8954887170faa062ae0946026fb67c0906e7571 SHA512 (gnome-initial-setup-42.0.1.tar.xz) = f2ee8deb5622064ebea9961185d4bebf13500c21e49bfae9eb463e98db7f43ea8d7c83e84744b83dc04819a7b7950d1664fa46068587f075846b506765c79588