diff options
author | albator <albator@arcadia.vtf> | 2011-10-31 19:18:15 +0100 |
---|---|---|
committer | albator <albator@arcadia.vtf> | 2011-10-31 19:18:15 +0100 |
commit | 8695886e97b271cba9f587a94d5ee8368a11a6db (patch) | |
tree | a4bae11ff42a768b991d898b3ceff641f70bb346 /redhat/kdebase | |
parent | 22f1373d3e0c69b54532e118571e46a3e2c9b7a6 (diff) | |
download | tde-packaging-8695886e97b271cba9f587a94d5ee8368a11a6db.tar.gz tde-packaging-8695886e97b271cba9f587a94d5ee8368a11a6db.zip |
TDE 3.5.13 final more small fixes before release (RHEL/Fedora)
Diffstat (limited to 'redhat/kdebase')
-rw-r--r-- | redhat/kdebase/pamd.kcheckpass-trinity.el5 | 9 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kcheckpass-trinity.el6 | 5 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kcheckpass-trinity.fc15 | 5 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity-np.el5 | 11 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity-np.el6 | 13 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity-np.fc15 | 15 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity.el5 | 10 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity.el6 | 16 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kdm-trinity.fc15 | 18 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kscreensaver-trinity.el5 | 9 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kscreensaver-trinity.el6 | 5 | ||||
-rw-r--r-- | redhat/kdebase/pamd.kscreensaver-trinity.fc15 | 5 | ||||
-rwxr-xr-x | redhat/kdebase/trinity-kdebase-3.5.13.spec | 20 |
13 files changed, 141 insertions, 0 deletions
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el5 b/redhat/kdebase/pamd.kcheckpass-trinity.el5 new file mode 100644 index 000000000..56939d5a9 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.el5 @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el6 b/redhat/kdebase/pamd.kcheckpass-trinity.el6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.el6 @@ -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/kdebase/pamd.kcheckpass-trinity.fc15 b/redhat/kdebase/pamd.kcheckpass-trinity.fc15 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc15 @@ -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/kdebase/pamd.kdm-trinity-np.el5 b/redhat/kdebase/pamd.kdm-trinity-np.el5 new file mode 100644 index 000000000..8dc8ef34d --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.el5 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_nologin.so +auth required pam_permit.so +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el6 b/redhat/kdebase/pamd.kdm-trinity-np.el6 new file mode 100644 index 000000000..c3f7172de --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.el6 @@ -0,0 +1,13 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +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 required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc15 b/redhat/kdebase/pamd.kdm-trinity-np.fc15 new file mode 100644 index 000000000..96fcfe378 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.fc15 @@ -0,0 +1,15 @@ + #%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 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/kdebase/pamd.kdm-trinity.el5 b/redhat/kdebase/pamd.kdm-trinity.el5 new file mode 100644 index 000000000..30a26ae99 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.el5 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth include system-auth +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 required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kdm-trinity.el6 b/redhat/kdebase/pamd.kdm-trinity.el6 new file mode 100644 index 000000000..14f4aa748 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.el6 @@ -0,0 +1,16 @@ +#%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 +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 required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session optional pam_gnome_keyring.so auto_start +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity.fc15 b/redhat/kdebase/pamd.kdm-trinity.fc15 new file mode 100644 index 000000000..f1d90f7f3 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.fc15 @@ -0,0 +1,18 @@ +#%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 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 required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session optional pam_gnome_keyring.so auto_start +session include system-auth +session include postlogin diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el5 b/redhat/kdebase/pamd.kscreensaver-trinity.el5 new file mode 100644 index 000000000..56939d5a9 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.el5 @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el6 b/redhat/kdebase/pamd.kscreensaver-trinity.el6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.el6 @@ -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/kdebase/pamd.kscreensaver-trinity.fc15 b/redhat/kdebase/pamd.kscreensaver-trinity.fc15 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc15 @@ -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/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index fa2c9bf38..64b3dffc0 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -41,6 +41,13 @@ Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop +# Pam configuration files for RHEL / Fedora +Source2: pamd.kdm-trinity%{?dist} +Source3: pamd.kdm-trinity-np%{?dist} +Source4: pamd.kcheckpass-trinity%{?dist} +Source5: pamd.kscreensaver-trinity%{?dist} + + # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -196,6 +203,9 @@ cd build -DWITH_I8K=OFF \ -DWITH_HAL=ON \ -DBUILD_ALL=ON \ + -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ + -DKDM_PAM_SERVICE="kdm-trinity" \ + -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \ .. %__make %{?_smp_mflags} @@ -222,6 +232,13 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg %__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" %endif +# PAM configuration files +%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d" +%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity" +%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np" +%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" +%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" + %clean %__rm -rf %{?buildroot} @@ -309,6 +326,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/applnk/Utilities/kpager.desktop %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png +# Pam configuration +%{_sysconfdir}/pam.d/* + %doc AUTHORS COPYING README %{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde |