* debian/patches:

  - 05_debianize-pam-files updated, fix pam_env configuration and correctly
    load /etc/environment.                                    closes: #798967

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@9260 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index abd73570f732aec2650cdd2ff7b6ee7fbf31241a..b1dd6d4117f832ea1f526b62cf7c63de30a4a42a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.14.2-3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 05_debianize-pam-files updated, fix pam_env configuration and correctly
+      load /etc/environment.                                    closes: #798967
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Sep 2015 20:49:49 +0200
+
 lightdm (1.14.2-2) unstable; urgency=medium
 
   * debian/liblightdm-qt-3-0.symbols updated for symbols removed due to the

diff --git a/debian/patches/05_debianize-pam-files.patch b/debian/patches/05_debianize-pam-files.patch
index b2dd80648c6fb2f72c980a933a82ccfa4d5c1fb9..99922531c99c63f3141a9dbb581b605081776987 100644 (file)
--- a/debian/patches/05_debianize-pam-files.patch
+++ b/debian/patches/05_debianize-pam-files.patch
@@ -1,6 +1,6 @@
 --- a/data/pam/lightdm
 +++ b/data/pam/lightdm
-@@ -1,20 +1,35 @@
+@@ -1,20 +1,36 @@
  #%PAM-1.0
  
  # Block login if they are globally disabled
@@ -9,7 +9,8 @@
  
  # Load environment from /etc/environment and ~/.pam_environment
 -auth      required pam_env.so
-+auth      required pam_env.so envfile=/etc/default/locale
++session      required pam_env.so readenv=1
++session      required pam_env.so readenv=1 envfile=/etc/default/locale
  
 -# Use /etc/passwd and /etc/shadow for passwords
 -auth      required pam_unix.so
@@ -49,18 +50,19 @@
 +@include common-password
 --- a/data/pam/lightdm-greeter
 +++ b/data/pam/lightdm-greeter
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,8 @@
  #%PAM-1.0
  
  # Load environment from /etc/environment and ~/.pam_environment
 -auth      required pam_env.so
-+auth      required pam_env.so envfile=/etc/default/locale
++session      required pam_env.so readenv=1
++session      required pam_env.so readenv=1 envfile=/etc/default/locale
  
  # Always let the greeter start without authentication
  auth      required pam_permit.so
 --- a/data/pam/lightdm-autologin
 +++ b/data/pam/lightdm-autologin
-@@ -1,20 +1,35 @@
+@@ -1,20 +1,36 @@
  #%PAM-1.0
  
  # Block login if they are globally disabled
@@ -69,7 +71,8 @@
  
  # Load environment from /etc/environment and ~/.pam_environment
 -auth      required pam_env.so
-+auth      required pam_env.so envfile=/etc/default/locale
++session      required pam_env.so readenv=1
++session      required pam_env.so readenv=1 envfile=/etc/default/locale
  
  # Allow access without authentication
  auth      required pam_permit.so