Update to 40.2

Resolves: #1971432
2021-06-15 00:25:12 +02:00 · 2021-06-15 00:25:12 +02:00 · 911f654e52
parent 36815d409d
commit 911f654e52
5 changed files with 265 additions and 60 deletions
--- a/.gitignore
+++ b/.gitignore
@ -192,3 +192,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-40.rc.tar.xz
 /gnome-shell-40.0.tar.xz
 /gnome-shell-40.1.tar.xz
+/gnome-shell-40.2.tar.xz
--- a/0001-Update-generated-stylesheets.patch
+++ b/0001-Update-generated-stylesheets.patch
@ -1,49 +1,27 @@
-From e2b6a33ee85260a1aad1597fab116349dbc84101 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 27 May 2021 19:00:18 +0200
+From 678cdd9e0da851da78527fa827d71a80273510b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@redhat.com>
+Date: Tue, 15 Jun 2021 00:41:59 +0200
 Subject: [PATCH] Update generated stylesheets

 ---
- data/theme/gnome-shell-high-contrast.css | 17 ++++++++++++-----
- data/theme/gnome-shell.css               | 17 ++++++++++++-----
- 2 files changed, 24 insertions(+), 10 deletions(-)
+ data/theme/gnome-shell-high-contrast.css | 7 +++++++
+ data/theme/gnome-shell.css               | 7 +++++++
+ 2 files changed, 14 insertions(+)

 diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
-index c91099f..1d3e917 100644
+index 64ff440..1d3e917 100644
 --- a/data/theme/gnome-shell-high-contrast.css
 +++ b/data/theme/gnome-shell-high-contrast.css
-@@ -1230,9 +1230,9 @@ StScrollBar {
-       border-radius: 99px; }
-     #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-       box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
-      #panel .panel-button:hover.clock-display, #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
-+      #panel .panel-button.clock-display:hover, #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
-         box-shadow: none; }
-        #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-+        #panel .panel-button.clock-display:hover .clock, #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
-           box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
-     #panel .panel-button .system-status-icon {
-       icon-size: 1.09em;
-@@ -1243,13 +1243,16 @@ StScrollBar {
+@@ -1243,6 +1243,9 @@ StScrollBar {
       margin: 0; }
     #panel .panel-button .app-menu-icon {
       -st-icon-style: symbolic; }
-    #panel .panel-button#panelActivities {
 +    #panel .panel-button .panel-logo-icon {
 +      padding-right: .4em;
 +      icon-size: 1em; }
-+    #panel #panelActivities.panel-button {
+     #panel #panelActivities.panel-button {
       -natural-hpadding: 18px; }
   #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-     box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
-    #panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-+    #panel.unlock-screen .panel-button.clock-display:hover, #panel.unlock-screen .panel-button.clock-display:active, #panel.unlock-screen .panel-button.clock-display:overview, #panel.unlock-screen .panel-button.clock-display:focus, #panel.unlock-screen .panel-button.clock-display:checked, #panel.login-screen .panel-button.clock-display:hover, #panel.login-screen .panel-button.clock-display:active, #panel.login-screen .panel-button.clock-display:overview, #panel.login-screen .panel-button.clock-display:focus, #panel.login-screen .panel-button.clock-display:checked, #panel:overview .panel-button.clock-display:hover, #panel:overview .panel-button.clock-display:active, #panel:overview .panel-button.clock-display:overview, #panel:overview .panel-button.clock-display:focus, #panel:overview .panel-button.clock-display:checked {
-       box-shadow: none; }
-      #panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-+      #panel.unlock-screen .panel-button.clock-display:hover .clock, #panel.unlock-screen .panel-button.clock-display:active .clock, #panel.unlock-screen .panel-button.clock-display:overview .clock, #panel.unlock-screen .panel-button.clock-display:focus .clock, #panel.unlock-screen .panel-button.clock-display:checked .clock, #panel.login-screen .panel-button.clock-display:hover .clock, #panel.login-screen .panel-button.clock-display:active .clock, #panel.login-screen .panel-button.clock-display:overview .clock, #panel.login-screen .panel-button.clock-display:focus .clock, #panel.login-screen .panel-button.clock-display:checked .clock, #panel:overview .panel-button.clock-display:hover .clock, #panel:overview .panel-button.clock-display:active .clock, #panel:overview .panel-button.clock-display:overview .clock, #panel:overview .panel-button.clock-display:focus .clock, #panel:overview .panel-button.clock-display:checked .clock {
-         box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
-   #panel .panel-status-indicators-box,
-   #panel .panel-status-menu-box {
@@ -2060,6 +2063,10 @@ StScrollBar {
 .login-dialog-message {
   text-align: center; }
@ -56,41 +34,19 @@ index c91099f..1d3e917 100644
   padding: 100px 0px; }
 
 diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 15b5100..7320fc5 100644
+index 81e42ac..7320fc5 100644
 --- a/data/theme/gnome-shell.css
 +++ b/data/theme/gnome-shell.css
-@@ -1230,9 +1230,9 @@ StScrollBar {
-       border-radius: 99px; }
-     #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-       box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
-      #panel .panel-button:hover.clock-display, #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
-+      #panel .panel-button.clock-display:hover, #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
-         box-shadow: none; }
-        #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-+        #panel .panel-button.clock-display:hover .clock, #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
-           box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
-     #panel .panel-button .system-status-icon {
-       icon-size: 1.09em;
-@@ -1243,13 +1243,16 @@ StScrollBar {
+@@ -1243,6 +1243,9 @@ StScrollBar {
       margin: 0; }
     #panel .panel-button .app-menu-icon {
       -st-icon-style: symbolic; }
-    #panel .panel-button#panelActivities {
 +    #panel .panel-button .panel-logo-icon {
 +      padding-right: .4em;
 +      icon-size: 1em; }
-+    #panel #panelActivities.panel-button {
+     #panel #panelActivities.panel-button {
       -natural-hpadding: 18px; }
   #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-     box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
-    #panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-+    #panel.unlock-screen .panel-button.clock-display:hover, #panel.unlock-screen .panel-button.clock-display:active, #panel.unlock-screen .panel-button.clock-display:overview, #panel.unlock-screen .panel-button.clock-display:focus, #panel.unlock-screen .panel-button.clock-display:checked, #panel.login-screen .panel-button.clock-display:hover, #panel.login-screen .panel-button.clock-display:active, #panel.login-screen .panel-button.clock-display:overview, #panel.login-screen .panel-button.clock-display:focus, #panel.login-screen .panel-button.clock-display:checked, #panel:overview .panel-button.clock-display:hover, #panel:overview .panel-button.clock-display:active, #panel:overview .panel-button.clock-display:overview, #panel:overview .panel-button.clock-display:focus, #panel:overview .panel-button.clock-display:checked {
-       box-shadow: none; }
-      #panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-+      #panel.unlock-screen .panel-button.clock-display:hover .clock, #panel.unlock-screen .panel-button.clock-display:active .clock, #panel.unlock-screen .panel-button.clock-display:overview .clock, #panel.unlock-screen .panel-button.clock-display:focus .clock, #panel.unlock-screen .panel-button.clock-display:checked .clock, #panel.login-screen .panel-button.clock-display:hover .clock, #panel.login-screen .panel-button.clock-display:active .clock, #panel.login-screen .panel-button.clock-display:overview .clock, #panel.login-screen .panel-button.clock-display:focus .clock, #panel.login-screen .panel-button.clock-display:checked .clock, #panel:overview .panel-button.clock-display:hover .clock, #panel:overview .panel-button.clock-display:active .clock, #panel:overview .panel-button.clock-display:overview .clock, #panel:overview .panel-button.clock-display:focus .clock, #panel:overview .panel-button.clock-display:checked .clock {
-         box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
-   #panel .panel-status-indicators-box,
-   #panel .panel-status-menu-box {
@@ -2060,6 +2063,10 @@ StScrollBar {
 .login-dialog-message {
   text-align: center; }
--- a/gdm-networking.patch
+++ b/gdm-networking.patch
@ -0,0 +1,244 @@
+From 1eb9fef5e18d56bbe7a6422303ff8e31fe677759 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Mon, 7 Jun 2021 17:49:57 +0200
+Subject: [PATCH 1/5] status/network: Disable modem connection when windows
+ aren't allowed
+
+The item launches the corresponding Settings panel when activated, which
+doesn't work when windows are disabled by the session mode. Rather than
+failing silently, turn the item insensitive.
+---
+ js/ui/status/network.js | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 5487fde40..6e7878d20 100644
+--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
+@@ -563,6 +563,10 @@ var NMDeviceModem = class extends NMConnectionDevice {
+                 this._iconChanged();
+             });
+         }
+
+        this._sessionUpdatedId =
+            Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
+        this._sessionUpdated();
+     }
+ 
+     get category() {
+@@ -573,6 +577,10 @@ var NMDeviceModem = class extends NMConnectionDevice {
+         launchSettingsPanel('network', 'connect-3g', this._device.get_path());
+     }
+ 
+    _sessionUpdated() {
+        this._autoConnectItem.sensitive = Main.sessionMode.hasWindows;
+    }
+
+     destroy() {
+         if (this._operatorNameId) {
+             this._mobileDevice.disconnect(this._operatorNameId);
+@@ -582,6 +590,10 @@ var NMDeviceModem = class extends NMConnectionDevice {
+             this._mobileDevice.disconnect(this._signalQualityId);
+             this._signalQualityId = 0;
+         }
+        if (this._sessionUpdatedId) {
+            Main.sessionMode.disconnect(this._sessionUpdatedId);
+            this._sessionUpdatedId = 0;
+        }
+ 
+         super.destroy();
+     }
+-- 
+2.31.1
+
+
+From 0288558940c0090dca0873daeaa33e8d20cdbb0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Mon, 7 Jun 2021 18:28:32 +0200
+Subject: [PATCH 2/5] status/network: Only list wifi networks that can be
+ activated
+
+Setting up a connection for an Enterprise WPA(2) encrypted wireless
+network requires Settings. That's not available when windows are
+disabled via the session mode, so filter out affected entries.
+---
+ js/ui/status/network.js | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 6e7878d20..36915dbc1 100644
+--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ /* exported NMApplet */
+-const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, NM, St } = imports.gi;
+ const Signals = imports.signals;
+ 
+ const Animation = imports.ui.animation;
+@@ -816,6 +816,11 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
+             GLib.source_remove(this._scanTimeoutId);
+             this._scanTimeoutId = 0;
+         }
+
+        if (this._syncVisibilityId) {
+            Meta.later_remove(this._syncVisibilityId);
+            this._syncVisibilityId = 0;
+        }
+     }
+ 
+     _onScanTimeout() {
+@@ -1149,9 +1154,32 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
+             this._itemBox.insert_child_at_index(network.item, newPos);
+         }
+ 
+        this._queueSyncItemVisibility();
+         this._syncView();
+     }
+ 
+    _queueSyncItemVisibility() {
+        if (this._syncVisibilityId)
+            return;
+
+        this._syncVisibilityId = Meta.later_add(
+            Meta.LaterType.BEFORE_REDRAW,
+            () => {
+                const { hasWindows } = Main.sessionMode;
+                const { WPA2_ENT, WPA_ENT } = NMAccessPointSecurity;
+
+                for (const network of this._networks) {
+                    const [firstAp] = network.accessPoints;
+                    network.item.visible =
+                        hasWindows ||
+                        network.connections.length > 0 ||
+                        (firstAp._secType !== WPA2_ENT && firstAp._secType !== WPA_ENT);
+                }
+                this._syncVisibilityId = 0;
+                return GLib.SOURCE_REMOVE;
+            });
+    }
+
+     _accessPointRemoved(device, accessPoint) {
+         let res = this._findExistingNetwork(accessPoint);
+ 
+-- 
+2.31.1
+
+
+From eb9620bc134ef8e7732f5e64b93ac9ea5bba2092 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 8 Jun 2021 00:17:48 +0200
+Subject: [PATCH 3/5] status/network: Consider network-control action
+
+NetworkManager installs a `network-control` polkit action that can
+be used to disallow network configuration, except that we happily
+ignore it. Add it to the conditions that turn a network section
+insensitive.
+---
+ js/ui/status/network.js | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 36915dbc1..e238fdfe7 100644
+--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ /* exported NMApplet */
+-const { Clutter, Gio, GLib, GObject, Meta, NM, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, NM, Polkit, St } = imports.gi;
+ const Signals = imports.signals;
+ 
+ const Animation = imports.ui.animation;
+@@ -1750,11 +1750,21 @@ class Indicator extends PanelMenu.SystemIndicator {
+         this._client.connect('connection-removed', this._connectionRemoved.bind(this));
+ 
+         Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
+        try {
+            this._configPermission = await Polkit.Permission.new(
+                'org.freedesktop.NetworkManager.network-control', null, null);
+        } catch (e) {
+            log('No permission to control network connections: %s'.format(e.toString()));
+            this._configPermission = null;
+        }
+         this._sessionUpdated();
+     }
+ 
+     _sessionUpdated() {
+-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+        const sensitive =
+            !Main.sessionMode.isLocked &&
+            !Main.sessionMode.isGreeter &&
+            this._configPermission && this._configPermission.allowed;
+         this.menu.setSensitive(sensitive);
+     }
+ 
+-- 
+2.31.1
+
+
+From 2392810bb7e3d48fb33c4d6de39f5be2eca58988 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 10 Jun 2021 23:12:27 +0200
+Subject: [PATCH 4/5] sessionMode: Enable networkAgent on login screen
+
+We will soon enable the network sections in the status menu on the
+login screen, so enable the network agent to handle authentication
+requests (like wifi/VPN passwords).
+---
+ js/ui/sessionMode.js | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
+index aa69fd115..4d4fb2444 100644
+--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
+@@ -47,7 +47,9 @@ const _modes = {
+         isGreeter: true,
+         isPrimary: true,
+         unlockDialog: imports.gdm.loginDialog.LoginDialog,
+-        components: ['polkitAgent'],
+        components: Config.HAVE_NETWORKMANAGER
+            ? ['networkAgent', 'polkitAgent']
+            : ['polkitAgent'],
+         panel: {
+             left: [],
+             center: ['dateMenu'],
+-- 
+2.31.1
+
+
+From b5fedfd846f271bf28be02ce5cd8517af7a3bc0a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 8 Jun 2021 00:19:26 +0200
+Subject: [PATCH 5/5] status/network: Do not disable on login screen
+
+We currently disable all network items on both the lock- and login
+screen. While it makes sense to be very restrictive on the lock screen,
+there are some (fringe) use cases for being more permissive on the
+login screen (like remote home directories only accessible via VPN).
+
+There's precedence with the power-off/restart actions to be less
+restrictive on the login screen, and since we started respecting
+the `network-control` polkit action, it's possible to restore the
+old behavior if desired.
+---
+ js/ui/status/network.js | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index e238fdfe7..f510f90ae 100644
+--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
+@@ -1763,7 +1763,6 @@ class Indicator extends PanelMenu.SystemIndicator {
+     _sessionUpdated() {
+         const sensitive =
+             !Main.sessionMode.isLocked &&
+-            !Main.sessionMode.isGreeter &&
+             this._configPermission && this._configPermission.allowed;
+         this.menu.setSensitive(sensitive);
+     }
+-- 
+2.31.1
+
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@ -1,8 +1,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')

 Name:           gnome-shell
-Version:        40.1
-Release:        5%{?dist}
+Version:        40.2
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME

 License:        GPLv2+
@ -20,6 +20,7 @@ Patch11: enforce-smartcard-at-unlock.patch
 Patch12: disable-unlock-entry-until-question.patch
 Patch13: 0001-loginDialog-make-info-messages-themed.patch
 Patch14: support-choicelist-extension.patch
+Patch15: gdm-networking.patch

 # Misc.
 Patch30: 0001-panel-add-an-icon-to-the-ActivitiesButton.patch
@ -246,6 +247,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*

 %changelog
+* Tue Jun 15 2021 Florian Müllner <fmuellner@redhat.com> - 40.2-1
+- Update to 40.2-1
+  Resolves: #1971432
+
 * Fri Jun 04 2021 Florian Müllner <fmuellner@redhat.com> - 40.1-5
 - Don't set CAP_SYS_NICE
  Resolves: #1967973
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (gnome-shell-40.0.tar.xz) = fc4ca3fbd3dafd4a81f97a765e53b74fa4902018721e25a767c0d353d127b0cdc69c64171188272e3f5b48f11d6ad52064cc237e35210f5e09dfcd763ceb00c4
-SHA512 (gnome-shell-40.1.tar.xz) = 48b2800ef500b5a5102c974d8ab718946406653803942b063100c813bd4bda9ae3e1b3492872fd8158c0e44c95f6582174101fb852613ff047602efed83b6d37
+SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87