diff -u pam-0.99.7.1/debian/changelog pam-0.99.7.1/debian/changelog --- pam-0.99.7.1/debian/changelog +++ pam-0.99.7.1/debian/changelog @@ -1,3 +1,10 @@ +pam (0.99.7.1-6ubuntu2) intrepid; urgency=low + + * debian/libpam-modules.postinst: Append ~/bin to existing PATH in + /etc/environment, if it's not already there (LP: #64064) + + -- Dustin Kirkland Sun, 22 Jun 2008 22:31:29 -0500 + pam (0.99.7.1-6ubuntu1) intrepid; urgency=low * Merge from debian unstable diff -u pam-0.99.7.1/debian/libpam-modules.postinst pam-0.99.7.1/debian/libpam-modules.postinst --- pam-0.99.7.1/debian/libpam-modules.postinst +++ pam-0.99.7.1/debian/libpam-modules.postinst @@ -14,10 +14,14 @@ # Add PATH to /etc/environment if it's not present there or in # /etc/security/pam_env.conf -if [ "$1" = "configure" ] && (dpkg --compare-versions 0.79-3ubuntu6 ge "$2" || [ "$2" = "" ]); then +if [ "$1" = "configure" ] && (dpkg --compare-versions 0.99.7.1-6ubuntu2 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:~/bin"' >> /etc/environment + else + if ! grep -qs "^PATH=\".*[:\"]~/bin[:\"]" /etc/environment; then + sed -i -e 's/^PATH="\(.*\)"/PATH="\1:~\/bin"/' /etc/environment + fi fi fi fi