merge: epoch-1.10.0 d'upstream

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,10 @@
-- [ ] I have disclosed use of any AI generated code in my commit messages.
-  - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR.
-  - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment.
-- [ ] I understand these changes in full and will be able to respond to review comments.
-- [ ] My change is accurately described in the commit message.
-- [ ] My contribution is tested and working as described.
-- [ ] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
+Replace this text with a description of your changes, and why these changes are important. Read and acknowledge the list below. PRs without a completed checkbox will be closed.
 
+---
+
+- I have not included any LLM (also known as AI) generated content in this PR, including code, comments, and descriptions.
+- I understand these changes in full and will be able to respond to review comments.
+- My change is accurately described in the commit message.
+- My contribution is tested and working as described.
+- I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
+- [ ] I have read and followed all of the above requirements. For more information, see our [contributor guide](https://github.com/pop-os/pop/blob/master/CONTRIBUTING.md).

.github/workflows/require-checklist.yml

@@ -0,0 +1,14 @@
+# From https://github.com/mheap/require-checklist-action, license MIT
+name: Require Checklist
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/require-checklist-action@v2
+        with:
+          requireChecklist: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-greeter"
-version = "0.1.0"
+version = "1.10.0"
 edition = "2024"
 
 [build-dependencies]

cargo.just

@@ -0,0 +1,70 @@
+cargo-target-dir := env('CARGO_TARGET_DIR', 'target')
+
+# Compile with debug profile
+[no-cd]
+build-debug *args:
+    cargo build {{args}}
+
+# Compile with release profile
+[no-cd]
+build-release *args: (build-debug '--release' args)
+
+# Compile with a vendored tarball
+[no-cd]
+build-vendored *args: vendor-extract (build-release '--frozen --offline' args)
+
+# Check for errors and linter warnings
+[no-cd]
+check *args:
+    cargo clippy --all-features {{args}} -- -W clippy::pedantic
+
+# Runs a check with JSON message format for IDE integration
+[no-cd]
+check-json: (check '--message-format=json')
+
+# Remove Cargo build artifacts
+[no-cd]
+clean:
+    cargo clean
+
+# Also remove .cargo and vendored dependencies
+[no-cd]
+clean-dist: clean
+    rm -rf .cargo vendor vendor.tar target
+
+# Run the application for testing purposes
+[no-cd]
+run *args:
+    cargo run {{args}}
+
+# Run `cargo test`
+[no-cd]
+test *args:
+    cargo test {{args}}
+
+# Vendor Cargo dependencies locally
+[no-cd]
+vendor:
+    #!/usr/bin/env bash
+    mkdir -p .cargo
+    cargo vendor --locked | head -n -1 > .cargo/config.toml
+    echo 'directory = "vendor"' >> .cargo/config.toml
+    echo >> .cargo/config.toml
+    echo '[env]' >> .cargo/config.toml
+    if [ -n "${SOURCE_DATE_EPOCH}" ]
+    then
+        source_date="$(date -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%d")"
+        echo "VERGEN_GIT_COMMIT_DATE = \"${source_date}\"" >> .cargo/config.toml
+    fi
+    if [ -n "${SOURCE_GIT_HASH}" ]
+    then
+        echo "VERGEN_GIT_SHA = \"${SOURCE_GIT_HASH}\"" >> .cargo/config.toml
+    fi
+    tar pcf vendor.tar .cargo vendor
+    rm -rf .cargo vendor
+
+# Extracts vendored dependencies
+[no-cd]
+vendor-extract:
+    rm -rf vendor
+    tar pxf vendor.tar

cosmic-greeter-config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-greeter-config"
-version = "0.1.0"
+version = "1.10.0"
 edition = "2024"
 description = "Configuration for COSMIC Greeter"
 repository = "https://github.com/pop-os/cosmic-greeter"

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-greeter-daemon"
-version = "0.1.0"
+version = "1.10.0"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

debian/changelog

@@ -1,3 +1,9 @@
+cosmic-greeter (1.10.0) noble; urgency=medium
+
+  * Epoch 1.10.0 version update
+
+ -- Michael Murphy <michael@mmurphy.dev>  Mon, 05 Oct 2026 21:20:24 +0200
+
 cosmic-greeter (0.1.0) jammy; urgency=medium
 
   * Initial release.

debian/cosmic-greeter.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=COSMIC Greeter
 After=systemd-user-sessions.service plymouth-quit-wait.service cosmic-greeter-daemon.service
-After=getty@tty1.service
-Conflicts=getty@tty1.service
+After=getty@tty1.service ksmcon@tty1.service
+Conflicts=getty@tty1.service kmscon@tty1.service
 Wants=cosmic-greeter-daemon.service
 
 [Service]

debian/source/options

@@ -1,4 +1,6 @@
 tar-ignore=.github
-tar-ignore=.vscode
+tar-ignore=target/.rustc_info.json
+tar-ignore=target/CACHEDIR.TAG
+tar-ignore=target/debug
+tar-ignore=target/release
 tar-ignore=vendor
-tar-ignore=target

src/greeter.rs

@@ -604,7 +604,11 @@ impl App {
                 widget::container(
                     widget::button::custom(
                         widget::text(
-                            self.common.active_layouts[self.common.current_keyboard_layout].name(),
+                            self.common
+                                .active_layouts
+                                .get(self.common.current_keyboard_layout)
+                                .map(|x| x.name())
+                                .unwrap_or_default(),
                         )
                         .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
                         .height(16)
@@ -1552,11 +1556,16 @@ impl cosmic::Application for App {
                 self.send_request(Request::PostAuthMessageResponse { response });
             }
             Message::AuthError(error) => {
-                // The conversation continues, so acknowledge like any other
-                // non-interactive auth message rather than cancelling the session.
                 self.common.error_opt = Some(error);
-                self.authenticating = false;
-                self.send_request(Request::PostAuthMessageResponse { response: None });
+                if self.authenticating {
+                    // Cancel failed password session so pam_faillock records the attempt.
+                    self.authenticating = false;
+                    self.send_request(Request::CancelSession);
+                } else {
+                    // The conversation continues, so acknowledge like any other
+                    // non-interactive auth message rather than cancelling the session.
+                    self.send_request(Request::PostAuthMessageResponse { response: None });
+                }
             }
             Message::Login => {
                 self.common.prompt_opt = None;

src/locker.rs

@@ -421,7 +421,11 @@ impl App {
                 widget::container(
                     widget::button::custom(
                         widget::text(
-                            self.common.active_layouts[self.common.current_keyboard_layout].name(),
+                            self.common
+                                .active_layouts
+                                .get(self.common.current_keyboard_layout)
+                                .map(|x| x.name())
+                                .unwrap_or_default(),
                         )
                         .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
                         .height(16)