diff --git a/.gitignore b/.gitignore index 366e751..0da54ae 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-47.7.tar.xz /gnome-shell-47.8.tar.xz /gnome-shell-47.9.tar.xz +/gnome-shell-47.10.tar.xz diff --git a/disable-unlock-entry-until-question.patch b/disable-unlock-entry-until-question.patch index 28f1a9e..4c6e599 100644 --- a/disable-unlock-entry-until-question.patch +++ b/disable-unlock-entry-until-question.patch @@ -1,4 +1,4 @@ -From 8a4efef39a0f48371c632d449688f29d06b9eed7 Mon Sep 17 00:00:00 2001 +From 7a4f4400b2f10a813cf28bb7518c370482935c1f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Sep 2015 12:51:24 -0400 Subject: [PATCH 1/3] authPrompt: don't fade out auth messages if user types @@ -12,10 +12,10 @@ front, before a password is asked. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js -index 8a46559d90..9309f60886 100644 +index d264717238..c7354e2664 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js -@@ -211,7 +211,7 @@ export const AuthPrompt = GObject.registerClass({ +@@ -215,7 +215,7 @@ export const AuthPrompt = GObject.registerClass({ [this._textEntry, this._passwordEntry].forEach(entry => { entry.clutter_text.connect('text-changed', () => { @@ -25,10 +25,10 @@ index 8a46559d90..9309f60886 100644 }); -- -2.45.2 +2.51.0 -From 007bbb694d4f30175caecbc9ada91515634bfd0b Mon Sep 17 00:00:00 2001 +From 5b72139b23b5884aa118e7bc9510bc994a057a6e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Sep 2015 14:36:33 -0400 Subject: [PATCH 2/3] authPrompt: don't spin unless answering question @@ -38,10 +38,10 @@ Subject: [PATCH 2/3] authPrompt: don't spin unless answering question 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js -index 9309f60886..3e72668967 100644 +index c7354e2664..92ad4eff30 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js -@@ -275,13 +275,14 @@ export const AuthPrompt = GObject.registerClass({ +@@ -279,13 +279,14 @@ export const AuthPrompt = GObject.registerClass({ this.verificationStatus = AuthPromptStatus.VERIFICATION_IN_PROGRESS; this.updateSensitivity(false); @@ -61,10 +61,10 @@ index 9309f60886..3e72668967 100644 this.emit('next'); } -- -2.45.2 +2.51.0 -From 92f66a5ff91e47d46a48d7ee51c0808f7ce1eaf9 Mon Sep 17 00:00:00 2001 +From b5509ccdda2da8e43716f8810a27153a96fd5c7d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 5 Oct 2015 15:26:18 -0400 Subject: [PATCH 3/3] authPrompt: stop accepting preemptive answer if user @@ -82,10 +82,10 @@ all. 1 file changed, 36 insertions(+) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js -index 3e72668967..254b4dbb88 100644 +index 92ad4eff30..0fbfb6800e 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js -@@ -70,6 +70,8 @@ export const AuthPrompt = GObject.registerClass({ +@@ -69,6 +69,8 @@ export const AuthPrompt = GObject.registerClass({ this._defaultButtonWellActor = null; this._cancelledRetries = 0; @@ -94,7 +94,7 @@ index 3e72668967..254b4dbb88 100644 let reauthenticationOnly; if (this._mode === AuthPromptMode.UNLOCK_ONLY) reauthenticationOnly = true; -@@ -127,8 +129,14 @@ export const AuthPrompt = GObject.registerClass({ +@@ -130,8 +132,14 @@ export const AuthPrompt = GObject.registerClass({ } _onDestroy() { @@ -108,8 +108,8 @@ index 3e72668967..254b4dbb88 100644 + this._userVerifier.destroy(); this._userVerifier = null; - } -@@ -282,6 +290,11 @@ export const AuthPrompt = GObject.registerClass({ + this._entry = null; +@@ -286,6 +294,11 @@ export const AuthPrompt = GObject.registerClass({ this._userVerifier.answerQuery(this._queryingService, this._entry.text); } else { this._preemptiveAnswer = this._entry.text; @@ -121,7 +121,7 @@ index 3e72668967..254b4dbb88 100644 } this.emit('next'); -@@ -493,6 +506,11 @@ export const AuthPrompt = GObject.registerClass({ +@@ -508,6 +521,11 @@ export const AuthPrompt = GObject.registerClass({ } setQuestion(question) { @@ -133,7 +133,7 @@ index 3e72668967..254b4dbb88 100644 this._entry.hint_text = question; this._authList.hide(); -@@ -614,6 +632,19 @@ export const AuthPrompt = GObject.registerClass({ +@@ -630,6 +648,19 @@ export const AuthPrompt = GObject.registerClass({ this._updateEntry(false); } @@ -153,7 +153,7 @@ index 3e72668967..254b4dbb88 100644 reset() { let oldStatus = this.verificationStatus; this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; -@@ -621,6 +652,11 @@ export const AuthPrompt = GObject.registerClass({ +@@ -637,6 +668,11 @@ export const AuthPrompt = GObject.registerClass({ this.cancelButton.can_focus = this._hasCancelButton; this._preemptiveAnswer = null; @@ -166,5 +166,5 @@ index 3e72668967..254b4dbb88 100644 this._userVerifier.cancel(); -- -2.45.2 +2.51.0 diff --git a/enforce-smartcard-at-unlock.patch b/enforce-smartcard-at-unlock.patch index 289bf3c..037104f 100644 --- a/enforce-smartcard-at-unlock.patch +++ b/enforce-smartcard-at-unlock.patch @@ -1,4 +1,4 @@ -From eaa7217db15a28e88ce0b5a84827c306148561ca Mon Sep 17 00:00:00 2001 +From 2ee01f8104aeca3ae5f404e83159670a0792db26 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 28 Sep 2015 10:57:02 -0400 Subject: [PATCH 1/3] smartcardManager: add way to detect if user logged using @@ -16,10 +16,10 @@ This commit adds the necessary api to detect that case. 1 file changed, 7 insertions(+) diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js -index 32573cd384..6c48c80a19 100644 +index b886110d91..51471e51d4 100644 --- a/js/misc/smartcardManager.js +++ b/js/misc/smartcardManager.js -@@ -118,4 +118,11 @@ class SmartcardManager extends Signals.EventEmitter { +@@ -116,4 +116,11 @@ class SmartcardManager extends Signals.EventEmitter { return true; } @@ -32,10 +32,10 @@ index 32573cd384..6c48c80a19 100644 + } } -- -2.45.2 +2.51.0 -From d7ef26d7b9d352232c9e0a24a04bcfcf6eee7d9a Mon Sep 17 00:00:00 2001 +From 368cc7d44849824933c3b9ddf7fd363bbb13c03e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 28 Sep 2015 19:56:53 -0400 Subject: [PATCH 2/3] gdm: only unlock with smartcard, if smartcard used for @@ -48,10 +48,10 @@ gets used for unlock, too. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/gdm/util.js b/js/gdm/util.js -index c9c040beb7..c0d8852880 100644 +index 395bce5e67..668cf51979 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js -@@ -465,6 +465,8 @@ export class ShellUserVerifier extends Signals.EventEmitter { +@@ -463,6 +463,8 @@ export class ShellUserVerifier extends Signals.EventEmitter { this.smartcardDetected = false; this._checkForSmartcard(); @@ -60,7 +60,7 @@ index c9c040beb7..c0d8852880 100644 this._smartcardManager.connectObject( 'smartcard-inserted', () => this._checkForSmartcard(), 'smartcard-removed', () => this._checkForSmartcard(), this); -@@ -643,7 +645,9 @@ export class ShellUserVerifier extends Signals.EventEmitter { +@@ -641,7 +643,9 @@ export class ShellUserVerifier extends Signals.EventEmitter { } _getDetectedDefaultService() { @@ -72,10 +72,10 @@ index c9c040beb7..c0d8852880 100644 else if (this._smartcardManager) return SMARTCARD_SERVICE_NAME; -- -2.45.2 +2.51.0 -From 9bff98c2757e4591035e408aa9cee703cec74bdf Mon Sep 17 00:00:00 2001 +From 5745d60258729b67c972488e7a889ca356b1902e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 28 Sep 2015 19:57:36 -0400 Subject: [PATCH 3/3] gdm: update default service when smartcard inserted @@ -88,10 +88,10 @@ after we get a smartcard insertion event. 1 file changed, 2 insertions(+) diff --git a/js/gdm/util.js b/js/gdm/util.js -index c0d8852880..430af4d8ef 100644 +index 668cf51979..97f1bfccb2 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js -@@ -490,6 +490,8 @@ export class ShellUserVerifier extends Signals.EventEmitter { +@@ -488,6 +488,8 @@ export class ShellUserVerifier extends Signals.EventEmitter { else if (this._preemptingService === SMARTCARD_SERVICE_NAME) this._preemptingService = null; @@ -101,5 +101,5 @@ index c0d8852880..430af4d8ef 100644 } } -- -2.45.2 +2.51.0 diff --git a/gnome-shell.spec b/gnome-shell.spec index b1e268c..b035737 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -8,7 +8,7 @@ %endif Name: gnome-shell -Version: 47.9 +Version: 47.10 Release: %autorelease Summary: Window management and application launching for GNOME @@ -113,7 +113,6 @@ BuildRequires: gtk-doc %ifnarch s390 s390x Recommends: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} %endif -Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} %if 0%{?rhel} != 7 # Disabled on RHEL 7 to allow logging into KDE session by default Recommends: gnome-session-xsession diff --git a/sources b/sources index f32e091..7d6c4b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-47.9.tar.xz) = b97aa93a332b37f2f5c5a9a2aa2f66cb25a63d518bf023932f12d581f84e7259fa22577ab7da0e8d7517bbd0b6bb40a85a21c8d83b6a22d435c0d32894b77c2f +SHA512 (gnome-shell-47.10.tar.xz) = ba8c15b0215da18c1a702ba5c9e59a042fba24099af896b45dcb02abbb67d0582af9f4f6e0f00b6e3de22d60472ec055780e3c034c6503512d6a246e38ebdcbd