r40260 - in /desktop/experimental/gdm3/debian: changelog gdm-launch-environment.pam gdm3.postinst gdm3.postrm gdm3.preinst rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Nov  9 13:20:02 2013
New Revision: 40260

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40260
Log:
debian/gdm-launch-environment.pam: Drop the symlink to gdm3-autologin and
install a real pam service. The differences with gdm3-autologin service
are that gdm-launch-environment should not transition out of the xdm_t
SELinux domain and not set a loginuid (as it's daemon's internal and not
a real user)

Added:
    desktop/experimental/gdm3/debian/gdm-launch-environment.pam
    desktop/experimental/gdm3/debian/gdm3.preinst
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/gdm3.postinst
    desktop/experimental/gdm3/debian/gdm3.postrm
    desktop/experimental/gdm3/debian/rules

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=40260&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Sat Nov  9 13:20:02 2013
@@ -1,3 +1,13 @@
+gdm3 (3.10.0.1-3) UNRELEASED; urgency=low
+
+  * debian/gdm-launch-environment.pam: Drop the symlink to gdm3-autologin and
+    install a real pam service. The differences with gdm3-autologin service
+    are that gdm-launch-environment should not transition out of the xdm_t
+    SELinux domain and not set a loginuid (as it's daemon's internal and not
+    a real user)
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 09 Nov 2013 14:01:16 +0100
+
 gdm3 (3.10.0.1-2) experimental; urgency=low
 
   * Update dependency on gnome-shell and gnome-session to >= 3.10. Otherwise

Added: desktop/experimental/gdm3/debian/gdm-launch-environment.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm-launch-environment.pam?rev=40260&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/gdm-launch-environment.pam	(added)
+++ desktop/experimental/gdm3/debian/gdm-launch-environment.pam	[utf-8] Sat Nov  9 13:20:02 2013
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth    required        pam_permit.so
+ at include common-account
+session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 envfile=/etc/default/locale
+ at include common-session
+ at include common-password

Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=40260&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst	[utf-8] Sat Nov  9 13:20:02 2013
@@ -61,10 +61,6 @@
 
 chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
 
-if [ ! -f /etc/pam.d/gdm-launch-environment ]; then
-    ln -s gdm3-autologin /etc/pam.d/gdm-launch-environment
-fi
-
 if [ -L /etc/pam.d/gdm-welcome ]; then
     rm -f /etc/pam.d/gdm-welcome
 fi

Modified: desktop/experimental/gdm3/debian/gdm3.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postrm?rev=40260&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postrm	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postrm	[utf-8] Sat Nov  9 13:20:02 2013
@@ -22,7 +22,6 @@
 	rm -rf /var/run/gdm3
 	rm -rf /var/log/gdm3
 	rm -rf /var/cache/gdm
-	rm -f /etc/pam.d/gdm-launch-environment
         if getent passwd Debian-gdm >/dev/null; then
                 if [ -x /usr/sbin/deluser ]; then
                         deluser --system Debian-gdm || echo "Could not remove Debian-gdm user."

Added: desktop/experimental/gdm3/debian/gdm3.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.preinst?rev=40260&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.preinst	(added)
+++ desktop/experimental/gdm3/debian/gdm3.preinst	[utf-8] Sat Nov  9 13:20:02 2013
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "install" -o "$1" = "upgrade" ] && [ -n "$2" ] &&
+    dpkg --compare-versions "$2" le-nl "3.10.0.1-3~"; then
+    if [ -L /etc/pam.d/gdm-launch-environment ]; then
+        rm -f /etc/pam.d/gdm-launch-environment
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40260&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules	[utf-8] Sat Nov  9 13:20:02 2013
@@ -66,6 +66,7 @@
 	chmod 755 debian/gdm3/etc/gdm3/Xsession
 	rm -f debian/gdm3/etc/pam.d/gdm-*
 	dh_installpam -pgdm3 --name=gdm3-autologin
+	dh_installpam -pgdm3 --name=gdm-launch-environment
 	rm -rf debian/gdm3/var/lib/gdm3/.[cgl]*
 	rm -rf debian/gdm3/var/run
 	cd debian/gdm3 && \