Merge lp:~vagrantc/ltsp/ltsp-pam-examples into lp:~sbalneav/ltsp/ltsp-pam-examples

[Vagrant Cascadian]

debian packaging
support for sshfs homedirs
support for localapps

[lp:~vagrantc/ltsp/ltsp-pam-examples]

20. By Vagrant Cascadian on 2013-11-05

Add versioned dependency on ltsp-client-core >= 5.4.6~ to ensure needed
patches in ltsp-localappsd.

21. By Vagrant Cascadian on 2013-11-05

new uploaded version.

22. By Vagrant Cascadian on 2014-10-07

Write stdout/stderr to user's .xsession-errors file.

23. By Vagrant Cascadian on 2014-10-07

Remove cruft from debian/rules.

24. By Vagrant Cascadian on 2014-10-07

Reorganize dependency lines.

25. By Vagrant Cascadian on 2014-10-07

Add dependency on net-tools, as xsession uses netstat.

26. By Vagrant Cascadian on 2014-10-07

Workaround empty close_session dir, by creating in debian/rules.

27. By Vagrant Cascadian on 2014-10-07

ltsp-pam 0.1~20141007~1-1

[Alkis Georgopoulos (alkisg)]

I'm setting the state of old merge requests that have been stale for years, to rejected; if someone wants, he can do another merge request in git format, since now ltsp uses git.

review: Disapprove

Unmerged revisions

27. By Vagrant Cascadian on 2014-10-07

ltsp-pam 0.1~20141007~1-1

26. By Vagrant Cascadian on 2014-10-07

Workaround empty close_session dir, by creating in debian/rules.

25. By Vagrant Cascadian on 2014-10-07

Add dependency on net-tools, as xsession uses netstat.

24. By Vagrant Cascadian on 2014-10-07

Reorganize dependency lines.

23. By Vagrant Cascadian on 2014-10-07

Remove cruft from debian/rules.

22. By Vagrant Cascadian on 2014-10-07

Write stdout/stderr to user's .xsession-errors file.

21. By Vagrant Cascadian on 2013-11-05

new uploaded version.

20. By Vagrant Cascadian on 2013-11-05

Add versioned dependency on ltsp-client-core >= 5.4.6~ to ensure needed
patches in ltsp-localappsd.

19. By Vagrant Cascadian on 2013-11-04

remove debian patch to set the default xsession.

18. By Vagrant Cascadian on 2013-11-04

Switch xsession to use x-session-manager alternative instead of mate-session.

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-10-07 19:11:26 +0000
@@ -0,0 +1,42 @@
+ltsp-pam (0.1~20141007~1-1) UNRELEASED; urgency=medium
+
+  * Workaround empty close_session dir, by creating in debian/rules.
+  * Write stdout/stderr to user's .xsession-errors file.
+  * Remove cruft from debian/rules.
+  * Reorganize dependency lines.
+  * Add dependency on net-tools, as xsession uses netstat.
+  * Workaround empty close_session dir, by creating in debian/rules.
+
+ -- Vagrant Cascadian <[e-mail]>  Tue, 07 Oct 2014 10:36:08 -0700
+
+ltsp-pam (0.1~20131105~1-1) UNRELEASED; urgency=low
+
+  * Remove debian patch to set the default xsession, applied upstream.
+  * Start ltsp-localappsd from xsession wrapper.
+    - Add versioned dependency on ltsp-client-core >= 5.4.6~
+  * Add hook to open_session to mount homedir over sshfs.
+
+ -- Vagrant Cascadian <[e-mail]>  Tue, 05 Nov 2013 16:46:06 -0500
+
+ltsp-pam (0.1~20130325~1-1) UNRELEASED; urgency=low
+
+  * New upstream version:
+    - Changed lightdm hooks to be more display manager independent.
+  * Allow gdm3 or any package providing x-display-manager in dependencies.
+
+ -- Vagrant Cascadian <[e-mail]>  Mon, 25 Mar 2013 14:37:12 -0700
+
+ltsp-pam (0.1~20130324~1-3) unreleased; urgency=low
+
+  * Install xsession script in the correct place.
+  * Patch xsession script to use x-session-manager instead of harding MATE.
+  * Install ltsp-cleanup.sh in examples dir, since it's meant to be run from
+    the server. 
+
+ -- Vagrant Cascadian <[e-mail]>  Sun, 24 Mar 2013 11:28:58 -0700
+
+ltsp-pam (0.1~20130324~1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Vagrant Cascadian <[e-mail]>  Sun, 24 Mar 2013 08:01:44 -0700

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
+8

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-10-07 19:11:26 +0000
@@ -0,0 +1,22 @@
+Source: ltsp-pam
+Section: misc
+Priority: extra
+Maintainer: Vagrant Cascadian <[e-mail]>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.3
+Homepage: https://code.launchpad.net/~sbalneav/ltsp/ltsp-pam-examples
+#Vcs-Git: git://git.debian.org/collab-maint/ltsp-pam.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/ltsp-pam.git;a=summary
+
+Package: ltsp-pam
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ daemon,
+ libnss-extrausers,
+ libpam-sshauth (>= 0.3),
+ lightdm | gdm3 | x-display-manager,
+ ltsp-client-core (>= 5.4.6~),
+ net-tools,
+Description: proof of concept scripts to enable LTSP pam support
+ Proof of concept support for using libpam-sshauth and lightdm to replace the
+ core functionality of LDM.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-10-07 19:11:26 +0000
@@ -0,0 +1,27 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ltsp-pam
+Source: https://code.launchpad.net/~sbalneav/ltsp/ltsp-pam-examples
+
+Files: *
+Copyright: 2013 Scott Balneaves <[e-mail]>
+License: sbalneav
+ Scotty is usually pretty permissive.
+
+Files: debian/*
+Copyright: 2013 Vagrant Cascadian <[e-mail]>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

=== added file 'debian/ltsp-pam.install'
--- debian/ltsp-pam.install	1970-01-01 00:00:00 +0000
+++ debian/ltsp-pam.install	2014-10-07 19:11:26 +0000
@@ -0,0 +1,12 @@
+ltsp-pam/auth /usr/share/ltsp-pam/
+ltsp-pam/cleanup /usr/share/ltsp-pam/
+ltsp-pam/close_session /usr/share/ltsp-pam/
+ltsp-pam/ltsp.desktop /usr/share/xsessions/
+ltsp-pam/ltsp-session /usr/share/ltsp-pam/
+ltsp-pam/open_session /usr/share/ltsp-pam/
+ltsp-pam/50-display-manager-pam /usr/share/ltsp/init-ltsp.d/
+ltsp-pam/50-update-nss /usr/share/ltsp/init-ltsp.d/
+ltsp-pam/ltsp-cleanup.sh /usr/share/doc/ltsp-pam/examples/
+ltsp-pam/ltsp_config.d/ /usr/share/ltsp/
+ltsp-pam/screen.d/ /usr/share/ltsp/
+ltsp-pam/xsession /etc/ltsp-pam/

=== added file 'debian/ltsp-pam.links'
--- debian/ltsp-pam.links	1970-01-01 00:00:00 +0000
+++ debian/ltsp-pam.links	2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
+/etc/ltsp-pam/xsession /usr/share/ltsp-pam/xsession

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-10-07 19:11:26 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+%:
+	dh $@ 
+
+override_dh_install:
+	# workaround empty close_session dir.
+	mkdir -p debian/tmp/ltsp-pam/close_session
+	dh_install

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== renamed file 'ltsp-pam/50-lightdm-pam' => 'ltsp-pam/50-display-manager-pam'
--- ltsp-pam/50-lightdm-pam	2013-03-13 00:43:40 +0000
+++ ltsp-pam/50-display-manager-pam	2014-10-07 19:11:26 +0000
@@ -1,8 +1,9 @@
-echo "auth     required pam_sshauth.so debug host=server nostrict shm_askpass" > /etc/pam.d/lightdm
-echo "auth     required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> /etc/pam.d/lightdm
-echo "account	 required pam_permit.so" >> /etc/pam.d/lightdm
-echo "session  required pam_sshauth.so debug host=server nostrict shm_askpass" >> /etc/pam.d/lightdm
-echo "session  required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> /etc/pam.d/lightdm
-echo "session  required pam_mkhomedir.so" >> /etc/pam.d/lightdm
-echo "session	 optional pam_ck_connector.so nox11" >> /etc/pam.d/lightdm
-echo "password required pam_permit.so" >> /etc/pam.d/lightdm
+pamdm=/etc/pam.d/$(basename ${DEFAULT_DISPLAY_MANAGER:-"lightdm"})
+echo "auth     required pam_sshauth.so debug host=server nostrict shm_askpass" > "$pamdm"
+echo "auth     required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> "$pamdm"
+echo "account	 required pam_permit.so" >> "$pamdm"
+echo "session  required pam_sshauth.so debug host=server nostrict shm_askpass" >> "$pamdm"
+echo "session  required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> "$pamdm"
+echo "session  required pam_mkhomedir.so" >> "$pamdm"
+echo "session	 optional pam_ck_connector.so nox11" >> "$pamdm"
+echo "password required pam_permit.so" >> "$pamdm"

=== added directory 'ltsp-pam/ltsp_config.d'
=== added file 'ltsp-pam/ltsp_config.d/50-display-manager-pam'
--- ltsp-pam/ltsp_config.d/50-display-manager-pam	1970-01-01 00:00:00 +0000
+++ ltsp-pam/ltsp_config.d/50-display-manager-pam	2014-10-07 19:11:26 +0000
@@ -0,0 +1,4 @@
+if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+    # Override removal of display manager init script
+    set_lts_var KEEP_SYSTEM_SERVICES "$KEEP_SYSTEM_SERVICES $(basename $DEFAULT_DISPLAY_MANAGER)"
+fi

=== added file 'ltsp-pam/open_session/00-sshfs'
--- ltsp-pam/open_session/00-sshfs	1970-01-01 00:00:00 +0000
+++ ltsp-pam/open_session/00-sshfs	2014-10-07 19:11:26 +0000
@@ -0,0 +1,5 @@
+# mount homedir with sshfs.
+# requires user_allow_other in fuse.conf
+rm -rf /home/${PAM_USER}
+mkdir -p /home/${PAM_USER}
+sshfs -o "allow_other,ControlPath=${SOCKET}" ${PAM_SSHAUTH_HOST}:/home/${PAM_USER} /home/${PAM_USER}

=== added directory 'ltsp-pam/screen.d'
=== added file 'ltsp-pam/screen.d/null'
--- ltsp-pam/screen.d/null	1970-01-01 00:00:00 +0000
+++ ltsp-pam/screen.d/null	2014-10-07 19:11:26 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Do nothing but sleep *all* day.
+exec sleep $((60*60*24))

=== modified file 'ltsp-pam/xsession'
--- ltsp-pam/xsession	2013-03-13 00:00:27 +0000
+++ ltsp-pam/xsession	2014-10-07 19:11:26 +0000
@@ -30,5 +30,8 @@
         "while read K; do xauth add \${SSH_CLIENT%% *}:0 . \$K; done"
     ssh -S ${SKT} -Y ${HST} "DISPLAY=\${SSH_CLIENT%% *}:0 twm"
 else
-    ssh -S ${SKT} -Y ${HST} "mate-session;ltsp-cleanup.sh"
+    # start localapps daemon, which requires ltsp-localappsd to not use su,
+    # since it's already running as the user.
+    LDM_USERNAME=${USER} ltsp-localappsd &
+    ssh -S ${SKT} -Y ${HST} "x-session-manager >> .xsession-errors 2>&1 ; ltsp-cleanup.sh"
 fi