Merge lp:~dpolehn-gmail/ubuntu/precise/pam/fix-110287 into lp:~ubuntu-core-dev/pam/ubuntu

[Daniel Polehn]

[Steve Langasek (vorlon)]

+ DESIRED_PATH='PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"'
+ if ! grep -qs "$DESIRED_PATH" /etc/environment ; then
+ echo $DESIRED_PATH > /etc/environment

This will unconditionally add a new PATH line to /etc/environment unless that exact path is already present. A little bit more finessing is wanted here. We want to:

 - add the PATH variable on new installs
 - on upgrades from versions of the package earlier than 1.1.3-7ubuntu2, *insert* /usr/local/games into the path - don't clobber the path, because if the local admin has modified the path, we don't want to override that setting.

I think the command to use for inserting the added path would be something like:

  sed -i -e'/^PATH / s,\(:/usr/games\),:/usr/local/games\1,' /etc/environment

And then the version number check needs to be fixed up as well, since currently the code only runs on new installs or when upgrading from a very, very ancient version of libpam-modules.

review: Needs Fixing

Unmerged revisions

887. By Daniel Polehn on 2012-02-10

Add /usr/local/games to default $PATH LP: #110287

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-09 01:15:41 +0000
+++ debian/changelog	2012-02-11 00:18:28 +0000
@@ -1,3 +1,9 @@
+pam (1.1.3-7ubuntu3) precise; urgency=low
+
+  * Add /usr/local/games to default $PATH LP: #110287 
+
+ -- Daniel Polehn <[e-mail]>  Fri, 10 Feb 2012 09:45:11 -0800
+
 pam (1.1.3-7ubuntu2) precise; urgency=low
 
   * No-change rebuild with gzip 1.4-1ubuntu2 to get multiarch-clean

=== modified file 'debian/libpam-modules.postinst'
--- debian/libpam-modules.postinst	2011-02-18 00:15:43 +0000
+++ debian/libpam-modules.postinst	2012-02-11 00:18:28 +0000
@@ -21,8 +21,9 @@
 # /etc/security/pam_env.conf
 if [ "$1" = "configure" ] && (dpkg --compare-versions 0.79-3ubuntu6 ge "$2" || [ "$2" = "" ]); then
 	if ! grep -qs ^PATH /etc/security/pam_env.conf; then
-		if ! grep -qs ^PATH /etc/environment; then
-			echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"' >> /etc/environment
+		DESIRED_PATH='PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"'
+		if ! grep -qs "$DESIRED_PATH" /etc/environment ; then
+			echo $DESIRED_PATH > /etc/environment
 		fi
 	fi
 fi