Skip to content

Commit

Permalink
cosmic-greeter: Unify patches for PAM refining
Browse files Browse the repository at this point in the history
Signed-off-by: Ikey Doherty <[email protected]>
  • Loading branch information
ikeycode committed Sep 10, 2024
1 parent 0b131cb commit ebee821
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 31 deletions.
Binary file modified c/cosmic-greeter/manifest.x86_64.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion c/cosmic-greeter/manifest.x86_64.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
}
},
"source-name": "cosmic-greeter",
"source-release": "8",
"source-release": "9",
"source-version": "1.0.0-alpha.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
From 0c4153e7f38b18fd0bac697f65a9e2cd06bc528f Mon Sep 17 00:00:00 2001
From: Ikey Doherty <[email protected]>
Date: Tue, 10 Sep 2024 23:49:21 +0000
Subject: [PATCH] debian: Port sample service/pam to Serpent OS

Signed-off-by: Ikey Doherty <[email protected]>
---
debian/cosmic-greeter.pam | 11 ++++++-----
debian/cosmic-greeter.service | 5 ++---
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/cosmic-greeter.pam b/debian/cosmic-greeter.pam
index 2a15d02..197fbde 100644
--- a/debian/cosmic-greeter.pam
+++ b/debian/cosmic-greeter.pam
@@ -1,9 +1,10 @@
#%PAM-1.0
auth requisite pam_nologin.so
auth required pam_succeed_if.so user != root quiet_success
-@include common-auth
+auth include system-local-login
+
auth optional pam_gnome_keyring.so
-@include common-account
+account include system-local-login
# SELinux needs to be the first session rule. This ensures that any
# lingering context has been cleared. Without this it is possible
# that a module could execute code in the wrong domain.
@@ -19,7 +20,7 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_
session optional pam_keyinit.so force revoke
session required pam_limits.so
session required pam_env.so readenv=1
-session required pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
-@include common-session
+session include system-local-login
session optional pam_gnome_keyring.so auto_start
-@include common-password
+password include system-local-login
+
diff --git a/debian/cosmic-greeter.service b/debian/cosmic-greeter.service
index 278e591..70dcad3 100644
--- a/debian/cosmic-greeter.service
+++ b/debian/cosmic-greeter.service
@@ -17,6 +17,5 @@ RestartSec=1
StartLimitBurst=5
StartLimitInterval=30

-# Managed by debconf
-#[Install]
-#Alias=display-manager.service
+[Install]
+Alias=display-manager.service
--
2.46.0

13 changes: 0 additions & 13 deletions c/cosmic-greeter/pkg/fix-service.patch

This file was deleted.

12 changes: 0 additions & 12 deletions c/cosmic-greeter/pkg/no-env-default-locale.patch

This file was deleted.

7 changes: 2 additions & 5 deletions c/cosmic-greeter/stone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
name : cosmic-greeter
version : "1.0.0-alpha.1"
release : 8
release : 9
summary : Cosmic Desktop Greeter
license : GPL-3.0
homepage : https://github.com/pop-os/cosmic-greeter
Expand All @@ -31,10 +31,7 @@ tuning :
- lto: thin
setup : |
%cargo_fetch
# display manager link
%patch %(pkgdir)/fix-service.patch
# debianism, /etc/default/locale
%patch %(pkgdir)/no-env-default-locale.patch
%patch %(pkgdir)/0001-debian-Port-sample-service-pam-to-Serpent-OS.patch
build : |
%cargo_build --all
install : |
Expand Down

0 comments on commit ebee821

Please sign in to comment.