update pam patch for openmamba [release 3.12.2-2mamba;Thu Jun 26 2014]

This commit is contained in:
Silvan Calarco 2024-01-05 22:39:48 +01:00
parent 346683ad78
commit 6e501aed45
3 changed files with 64 additions and 182 deletions

View File

@ -0,0 +1,41 @@
diff -Nru gdm-3.12.2.orig/data/pam-redhat/gdm-autologin.pam gdm-3.12.2/data/pam-redhat/gdm-autologin.pam
--- gdm-3.12.2.orig/data/pam-redhat/gdm-autologin.pam 2014-04-22 16:11:07.000000000 +0000
+++ gdm-3.12.2/data/pam-redhat/gdm-autologin.pam 2014-06-26 18:17:14.589941021 +0000
@@ -6,7 +6,7 @@
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
-session optional pam_console.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
diff -Nru gdm-3.12.2.orig/data/pam-redhat/gdm-password.pam gdm-3.12.2/data/pam-redhat/gdm-password.pam
--- gdm-3.12.2.orig/data/pam-redhat/gdm-password.pam 2014-04-22 16:11:07.000000000 +0000
+++ gdm-3.12.2/data/pam-redhat/gdm-password.pam 2014-06-26 18:18:08.883142740 +0000
@@ -1,19 +1,19 @@
-auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
-auth substack password-auth
+auth [success=done ignore=ignore default=bad] pam_sepermit.so
+auth substack system-auth
auth optional pam_gnome_keyring.so
account required pam_nologin.so
-account include password-auth
+account include system-auth
-password substack password-auth
+password substack system-auth
-password optional pam_gnome_keyring.so use_authtok
session required pam_selinux.so close
session required pam_loginuid.so
-session optional pam_console.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 password-auth
+session include system-auth
session optional pam_gnome_keyring.so auto_start

View File

@ -1,174 +0,0 @@
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-autologin.pam gdm-3.6.1/data/pam-redhat/gdm-autologin.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-autologin.pam 2012-10-04 23:06:33.000000000 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-autologin.pam 2012-10-21 21:26:33.583960945 +0200
@@ -1,16 +1,13 @@
#%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 -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-fingerprint.pam gdm-3.6.1/data/pam-redhat/gdm-fingerprint.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-fingerprint.pam 2012-10-04 00:03:41.000000000 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-fingerprint.pam 2012-10-21 21:27:16.159554238 +0200
@@ -1,5 +1,4 @@
auth substack fingerprint-auth
-auth include postlogin
account required pam_nologin.so
account include fingerprint-auth
@@ -8,10 +7,8 @@
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 fingerprint-auth
-session include postlogin
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm.pam gdm-3.6.1/data/pam-redhat/gdm.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm.pam 2012-10-04 00:03:41.000000000 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm.pam 2012-10-21 21:26:53.316772445 +0200
@@ -8,4 +8,3 @@
session optional pam_keyinit.so force revoke
session include system-auth
session required pam_loginuid.so
-session optional pam_console.so
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-password.pam gdm-3.6.1/data/pam-redhat/gdm-password.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-password.pam 2012-10-04 00:03:41.000000000 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-password.pam 2012-10-21 21:27:34.644377661 +0200
@@ -1,7 +1,6 @@
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth substack password-auth
auth optional pam_gnome_keyring.so
-auth include postlogin
account required pam_nologin.so
account include password-auth
@@ -10,11 +9,9 @@
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 password-auth
session optional pam_gnome_keyring.so auto_start
-session include postlogin
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-smartcard.pam gdm-3.6.1/data/pam-redhat/gdm-smartcard.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-smartcard.pam 2012-10-04 00:03:41.000000000 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-smartcard.pam 2012-10-21 21:27:59.605139221 +0200
@@ -1,5 +1,4 @@
auth substack smartcard-auth
-auth include postlogin
account required pam_nologin.so
account include smartcard-auth
@@ -8,10 +7,8 @@
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 smartcard-auth
-session include postlogin
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-fingerprint.pam gdm-3.6.1/data/pam-redhat/gdm-fingerprint.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-fingerprint.pam 2012-10-21 21:29:31.617260268 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-fingerprint.pam 2012-11-05 17:34:23.037735987 +0100
@@ -1,9 +1,9 @@
-auth substack fingerprint-auth
+auth substack system-auth
account required pam_nologin.so
-account include fingerprint-auth
+account include system-auth
-password include fingerprint-auth
+password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
@@ -11,4 +11,4 @@
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
-session include fingerprint-auth
+session include system-auth
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-password.pam gdm-3.6.1/data/pam-redhat/gdm-password.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-password.pam 2012-10-21 21:29:31.618260258 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-password.pam 2012-11-05 17:33:48.269148884 +0100
@@ -1,11 +1,10 @@
-auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
-auth substack password-auth
+auth substack system-auth
auth optional pam_gnome_keyring.so
account required pam_nologin.so
-account include password-auth
+account include system-auth
-password include password-auth
+password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
@@ -13,5 +12,5 @@
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
-session include password-auth
+session include system-auth
session optional pam_gnome_keyring.so auto_start
diff -Nru gdm-3.6.1.orig/data/pam-redhat/gdm-smartcard.pam gdm-3.6.1/data/pam-redhat/gdm-smartcard.pam
--- gdm-3.6.1.orig/data/pam-redhat/gdm-smartcard.pam 2012-10-21 21:29:31.618260258 +0200
+++ gdm-3.6.1/data/pam-redhat/gdm-smartcard.pam 2012-11-05 17:34:53.475374523 +0100
@@ -1,9 +1,9 @@
-auth substack smartcard-auth
+auth substack system-auth
account required pam_nologin.so
-account include smartcard-auth
+account include system-auth
-password include smartcard-auth
+password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
@@ -11,4 +11,4 @@
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
-session include smartcard-auth
+session include system-auth
diff -Nru gdm-3.8.0.orig/data/pam-redhat/gdm-launch-environment.pam gdm-3.8.0/data/pam-redhat/gdm-launch-environment.pam
--- gdm-3.8.0.orig/data/pam-redhat/gdm-launch-environment.pam 2013-02-08 16:26:57.000000000 +0100
+++ gdm-3.8.0/data/pam-redhat/gdm-launch-environment.pam 2013-03-28 09:54:56.132482591 +0100
@@ -1,10 +1,8 @@
#%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 optional pam_keyinit.so force revoke
session include system-auth
-session include postlogin

View File

@ -2,8 +2,8 @@
%define gdm_gid 53 %define gdm_gid 53
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
Name: gdm Name: gdm
Version: 3.10.0.1 Version: 3.12.2
Release: 1mamba Release: 2mamba
Summary: The GNOME Display Manager, a graphical login program Summary: The GNOME Display Manager, a graphical login program
Group: Graphical Desktop/Applications/Other Group: Graphical Desktop/Applications/Other
Vendor: openmamba Vendor: openmamba
@ -14,7 +14,7 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/gdm/%{majver}/gdm-%{version
Patch0: %{name}-2.32.1-remove-pam_console.patch Patch0: %{name}-2.32.1-remove-pam_console.patch
Patch1: %{name}-3.4.1-save-root-window.patch Patch1: %{name}-3.4.1-save-root-window.patch
Patch2: %{name}-3.4.1-plymouth.patch Patch2: %{name}-3.4.1-plymouth.patch
Patch3: gdm-3.8.0-pam-openmamba.patch Patch3: gdm-3.12.2-pam-openmamba.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -54,6 +54,7 @@ BuildRequires: pam-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: upower-devel BuildRequires: upower-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: dconf
Requires: ConsoleKit Requires: ConsoleKit
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -133,11 +134,11 @@ exit 0
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_sysconfdir}/dconf/db/gdm.d #%dir %{_sysconfdir}/dconf/db/gdm.d
%dir %{_sysconfdir}/dconf/db/gdm.d/locks #%dir %{_sysconfdir}/dconf/db/gdm.d/locks
%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings #%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks #%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
%{_sysconfdir}/dconf/profile/gdm #%{_sysconfdir}/dconf/profile/gdm
%{_sysconfdir}/dbus-1/system.d/gdm.conf %{_sysconfdir}/dbus-1/system.d/gdm.conf
#%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas #%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
%config(noreplace) %{_sysconfdir}/gdm/Init/Default %config(noreplace) %{_sysconfdir}/gdm/Init/Default
@ -174,7 +175,9 @@ exit 0
%{_datadir}/gdm/gdb-cmd %{_datadir}/gdm/gdb-cmd
#%{_datadir}/gdm/gdm-greeter-login-window.ui #%{_datadir}/gdm/gdm-greeter-login-window.ui
%{_datadir}/gdm/gdm.schemas %{_datadir}/gdm/gdm.schemas
%{_datadir}/gdm/greeter-dconf-defaults
%{_datadir}/gdm/locale.alias %{_datadir}/gdm/locale.alias
%{_datadir}/dconf/profile/gdm
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
#%{_datadir}/gnome-session/sessions/gdm-fallback.session #%{_datadir}/gnome-session/sessions/gdm-fallback.session
%{_datadir}/gnome-session/sessions/gdm-shell.session %{_datadir}/gnome-session/sessions/gdm-shell.session
@ -227,6 +230,18 @@ exit 0
#%doc ChangeLog NEWS README #%doc ChangeLog NEWS README
%changelog %changelog
* Thu Jun 26 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.12.2-2mamba
- update pam patch for openmamba
* Fri May 16 2014 Automatic Build System <autodist@mambasoft.it> 3.12.2-1mamba
- automatic version update by autodist
* Mon Apr 21 2014 Automatic Build System <autodist@mambasoft.it> 3.12.1-1mamba
- automatic version update by autodist
* Thu Apr 10 2014 Automatic Build System <autodist@mambasoft.it> 3.12.0-1mamba
- automatic version update by autodist
* Wed Oct 16 2013 Automatic Build System <autodist@mambasoft.it> 3.10.0.1-1mamba * Wed Oct 16 2013 Automatic Build System <autodist@mambasoft.it> 3.10.0.1-1mamba
- automatic version update by autodist - automatic version update by autodist