[Pkg-xfce-commits] r7175 - in goodies/branches/experimental/lightdm/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Oct 6 03:32:31 UTC 2012
Author: corsac
Date: 2012-10-06 15:32:31 +0000 (Sat, 06 Oct 2012)
New Revision: 7175
Added:
goodies/branches/experimental/lightdm/debian/patches/05_debianize-pam-files.patch
Removed:
goodies/branches/experimental/lightdm/debian/lightdm.lightdm-autologin.pam
goodies/branches/experimental/lightdm/debian/lightdm.pam
Modified:
goodies/branches/experimental/lightdm/debian/changelog
goodies/branches/experimental/lightdm/debian/lightdm.install
goodies/branches/experimental/lightdm/debian/patches/series
goodies/branches/experimental/lightdm/debian/rules
Log:
- 05_debianize-pam-files added, Debianize the lightdm and
lightdm-autologin pam config files.
- install PAM files
* debian/rules:
- stop installing own PAM files.
* debian/*.pam: drop obsolete PAM files.
Modified: goodies/branches/experimental/lightdm/debian/changelog
===================================================================
--- goodies/branches/experimental/lightdm/debian/changelog 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/changelog 2012-10-06 15:32:31 UTC (rev 7175)
@@ -4,6 +4,8 @@
* debian/patches:
- 01_set-default-path, 02_default-config and
04_dont-add-pkglibexecdir-path refreshed for new release.
+ - 05_debianize-pam-files added, Debianize the lightdm and
+ lightdm-autologin pam config files.
* debian/control:
- suggests upower. closes: #679538
- make lightdm depends on lightdm-gtk-greeter | lightdm-greeter, thanks
@@ -12,6 +14,10 @@
* debian/lightdm.install:
- stop installing lightdm upstart script since it's broken. closes: #679409
- install /u/s/help.*
+ - install PAM files
+ * debian/rules:
+ - stop installing own PAM files.
+ * debian/*.pam: drop obsolete PAM files.
-- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Oct 2012 16:42:26 +0200
Modified: goodies/branches/experimental/lightdm/debian/lightdm.install
===================================================================
--- goodies/branches/experimental/lightdm/debian/lightdm.install 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/lightdm.install 2012-10-06 15:32:31 UTC (rev 7175)
@@ -8,6 +8,7 @@
etc/lightdm/lightdm.conf
etc/lightdm/keys.conf
etc/apparmor.d/lightdm-guest-session
+etc/pam.d
debian/lightdm-xsession.desktop /usr/share/xsessions
usr/lib/*/lightdm/lightdm-set-defaults
usr/lib/*/lightdm/lightdm-guest-session-wrapper
Deleted: goodies/branches/experimental/lightdm/debian/lightdm.lightdm-autologin.pam
===================================================================
--- goodies/branches/experimental/lightdm/debian/lightdm.lightdm-autologin.pam 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/lightdm.lightdm-autologin.pam 2012-10-06 15:32:31 UTC (rev 7175)
@@ -1,23 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so readenv=1
-auth required pam_env.so readenv=1 envfile=/etc/default/locale
-#auth sufficient pam_thinkfinger.so
-auth required pam_permit.so
- at include common-account
-# SELinux needs to be the first session rule. This ensures that any
-# lingering context has been cleared. Without out this it is possible
-# that a module could execute code in the wrong domain.
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required pam_limits.so
-session required pam_loginuid.so
- at include common-session
-# SELinux needs to intervene at login time to ensure that the process
-# starts in the proper default security context. Only sessions which are
-# intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
- at include common-password
Deleted: goodies/branches/experimental/lightdm/debian/lightdm.pam
===================================================================
--- goodies/branches/experimental/lightdm/debian/lightdm.pam 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/lightdm.pam 2012-10-06 15:32:31 UTC (rev 7175)
@@ -1,25 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so readenv=1
-auth required pam_env.so readenv=1 envfile=/etc/default/locale
-#auth sufficient pam_thinkfinger.so
- at include common-auth
-auth optional pam_gnome_keyring.so
- at include common-account
-# SELinux needs to be the first session rule. This ensures that any
-# lingering context has been cleared. Without out this it is possible
-# that a module could execute code in the wrong domain.
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required pam_limits.so
-session required pam_loginuid.so
- at include common-session
-# SELinux needs to intervene at login time to ensure that the process
-# starts in the proper default security context. Only sessions which are
-# intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session optional pam_gnome_keyring.so auto_start
- at include common-password
Added: goodies/branches/experimental/lightdm/debian/patches/05_debianize-pam-files.patch
===================================================================
--- goodies/branches/experimental/lightdm/debian/patches/05_debianize-pam-files.patch (rev 0)
+++ goodies/branches/experimental/lightdm/debian/patches/05_debianize-pam-files.patch 2012-10-06 15:32:31 UTC (rev 7175)
@@ -0,0 +1,93 @@
+--- a/data/pam/lightdm
++++ b/data/pam/lightdm
+@@ -1,19 +1,36 @@
+ #%PAM-1.0
+
+ # Block login if they are disabled
+-auth required pam_nologin.so
++auth requisite pam_nologin.so
+
+ # Load environment from /etc/environment and ~/.pam_environment
+ auth required pam_env.so
++auth required pam_env.so envfile=/etc/default/locale
+
+-# Use /etc/passwd and /etc/shadow for passwords
+-auth required pam_unix.so
++ at include common-auth
+
+-# Check account is active, change password if required
+-account required pam_unix.so
++auth optional pam_gnome_keyring.so
+
+-# Allow password to be changed
+-password required pam_unix.so
++ at include common-account
+
+-# Setup session
+-session required pam_unix.so
++# SELinux needs to be the first session rule. This ensures that any
++# lingering context has been cleared. Without out this it is possible
++# that a module could execute code in the wrong domain.
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
++
++session required pam_limits.so
++session required pam_loginuid.so
++ at include common-session
++
++# SELinux needs to intervene at login time to ensure that the process
++# starts in the proper default security context. Only sessions which are
++# intended to run in the user's context should be run after this.
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++
++session optional pam_gnome_keyring.so auto_start
++
++ at include common-password
+--- a/data/pam/lightdm-autologin
++++ b/data/pam/lightdm-autologin
+@@ -1,19 +1,34 @@
+ #%PAM-1.0
+
+ # Block login if they are globally disabled
+-auth required pam_nologin.so
++auth requisite pam_nologin.so
+
+ # Load environment from /etc/environment and ~/.pam_environment
+ auth required pam_env.so
++auth required pam_env.so envfile=/etc/default/locale
+
+-# Use /etc/passwd and /etc/shadow for passwords
+-auth required pam_unix.so
++auth required pam_permit.so
+
+-# Stop autologin if account requires action
+-account required pam_unix.so
++ at include common-account
++
++# SELinux needs to be the first session rule. This ensures that any
++# lingering context has been cleared. Without out this it is possible
++# that a module could execute code in the wrong domain.
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
++
++session required pam_limits.so
++session required pam_loginuid.so
++ at include common-session
++
++# SELinux needs to intervene at login time to ensure that the process
++# starts in the proper default security context. Only sessions which are
++# intended to run in the user's context should be run after this.
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
+
+ # Can't change password
+ password required pam_deny.so
+-
+-# Setup session
+-session required pam_unix.so
++ at include common-password
Modified: goodies/branches/experimental/lightdm/debian/patches/series
===================================================================
--- goodies/branches/experimental/lightdm/debian/patches/series 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/patches/series 2012-10-06 15:32:31 UTC (rev 7175)
@@ -2,3 +2,4 @@
02_default-config.patch
03_quit-plymouth.patch
04_dont-add-pkglibexecdir-path.patch
+05_debianize-pam-files.patch
Modified: goodies/branches/experimental/lightdm/debian/rules
===================================================================
--- goodies/branches/experimental/lightdm/debian/rules 2012-10-06 15:27:14 UTC (rev 7174)
+++ goodies/branches/experimental/lightdm/debian/rules 2012-10-06 15:32:31 UTC (rev 7175)
@@ -16,10 +16,6 @@
rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
dh_install --fail-missing -X etc/init/lightdm.conf
-override_dh_installpam:
- dh_installpam
- dh_installpam --name=lightdm-autologin
-
%:
dh $@ --parallel
More information about the Pkg-xfce-commits
mailing list