From 105f6898695a283f26466e092f2ed4324023f0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 3 Oct 2021 11:22:31 +0200 Subject: [PATCH] RPM: add support for Fedora 35 in tdebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- .../main/tdebase/pamd.kcheckpass-trinity.fc35 | 5 ++++ redhat/main/tdebase/pamd.kdm-trinity-np.fc35 | 16 +++++++++++++ redhat/main/tdebase/pamd.kdm-trinity.fc35 | 23 +++++++++++++++++++ .../tdebase/pamd.kscreensaver-trinity.fc35 | 5 ++++ redhat/main/tdebase/tdebase.spec | 10 +++++++- redhat/main/tdebase/tdm.fc35.te | 11 +++++++++ redhat/main/tdebase/tdm.service.fc35 | 12 ++++++++++ 7 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc35 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc35 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 create mode 100644 redhat/main/tdebase/tdm.fc35.te create mode 100644 redhat/main/tdebase/tdm.service.fc35 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc35 b/redhat/main/tdebase/pamd.kdm-trinity.fc35 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc35 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 59f582fbb..90d145f45 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -282,6 +282,14 @@ Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif +# Fedora 35 Theme +%if 0%{?fedora} == 35 +Requires: f35-backgrounds-base +%define tde_bg /usr/share/backgrounds/f34/default/standard/f35.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -1899,7 +1907,7 @@ Requires: psmisc %if 0%{?with_hal} Requires: hal >= 0.5 %endif -#%if 0%{?rhel} == 4 || 0%{?suse_version} +#%if 0%{?rhel} == 4 || 0%{?suse_version} || 0%{?fedora} >= 35 #Requires: cryptsetup #%else #Requires: cryptsetup-luks diff --git a/redhat/main/tdebase/tdm.fc35.te b/redhat/main/tdebase/tdm.fc35.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/main/tdebase/tdm.fc35.te @@ -0,0 +1,11 @@ + +module tdm 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.service.fc35 b/redhat/main/tdebase/tdm.service.fc35 new file mode 100644 index 000000000..9ef7e07ff --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc35 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/tdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service