diff -u ecryptfs-utils-53/debian/changelog ecryptfs-utils-53/debian/changelog --- ecryptfs-utils-53/debian/changelog +++ ecryptfs-utils-53/debian/changelog @@ -1,3 +1,11 @@ +ecryptfs-utils (53-1ubuntu3) intrepid; urgency=low + + * debian/patches/00list: add 15-pam_ecryptfs-auth_fork_exit.dpatch. + * debian/patches/15-pam_ecryptfs-auth_fork_exit.dpatch: fix broken + exit condition causing screensaver unlocking to fail (LP: #255795). + + -- Dustin Kirkland Mon, 11 Aug 2008 13:50:59 -0500 + ecryptfs-utils (53-1ubuntu2) intrepid; urgency=low * debian/control: add build dependency on dpatch. diff -u ecryptfs-utils-53/debian/patches/00list ecryptfs-utils-53/debian/patches/00list --- ecryptfs-utils-53/debian/patches/00list +++ ecryptfs-utils-53/debian/patches/00list @@ -1,0 +2 @@ +15-pam_ecryptfs-auth_fork_exit.dpatch only in patch2: unchanged: --- ecryptfs-utils-53.orig/debian/patches/15-pam_ecryptfs-auth_fork_exit.dpatch +++ ecryptfs-utils-53/debian/patches/15-pam_ecryptfs-auth_fork_exit.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +# 15-pam_ecryptfs-auth_fork_exit.dpatch by Dustin Kirkland +# +# Fix missing exit condition, fixes screensaver unlocking + +@DPATCH@ + +diff -upr ecryptfs-utils-53.orig/src/pam_ecryptfs/pam_ecryptfs.c ecryptfs-utils-53/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-53.orig/src/pam_ecryptfs/pam_ecryptfs.c 2008-07-21 16:56:18.000000000 -0500 ++++ ecryptfs-utils-53/src/pam_ecryptfs/pam_ecryptfs.c 2008-08-11 13:47:52.677954407 -0500 +@@ -157,7 +157,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h + syslog(LOG_WARNING, "There is already a key in the " + "user session keyring for the given " + "passphrase.\n"); +- rc = 0; ++ goto out_child; + } + if (rc) { + syslog(LOG_ERR, "Error adding passphrase key token to "