diff -u ecryptfs-utils-53/debian/ecryptfs-utils.install ecryptfs-utils-53/debian/ecryptfs-utils.install --- ecryptfs-utils-53/debian/ecryptfs-utils.install +++ ecryptfs-utils-53/debian/ecryptfs-utils.install @@ -7 +7 @@ -/etc/auth-client-config +/usr/share/pam-configs/ecryptfs-utils diff -u ecryptfs-utils-53/debian/rules ecryptfs-utils-53/debian/rules --- ecryptfs-utils-53/debian/rules +++ ecryptfs-utils-53/debian/rules @@ -54,7 +54,7 @@ dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - install -D $(CURDIR)/debian/ecryptfs.acc $(CURDIR)/debian/tmp/etc/auth-client-config/profile.d/ecryptfs + install -D $(CURDIR)/debian/ecryptfs-utils.pam-auth-update $(CURDIR)/debian/tmp/usr/share/pam-configs/ecryptfs-utils chmod 4755 debian/tmp/sbin/mount.ecryptfs_private diff -u ecryptfs-utils-53/debian/control ecryptfs-utils-53/debian/control --- ecryptfs-utils-53/debian/control +++ ecryptfs-utils-53/debian/control @@ -12,8 +12,8 @@ Package: ecryptfs-utils Section: misc Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: opencryptoki, auth-client-config +Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-2ubuntu1) +Suggests: opencryptoki Description: ecryptfs cryptographic filesystem (utilities) eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem for Linux. 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,19 @@ +ecryptfs-utils (53-1ubuntu6) intrepid; urgency=low + + * Fixes (LP: #259915). + * debian/control: drop suggests of auth-client-config, add depends on + libpam-runtime. + * debian/ecryptfs-utils.postinst: initial creation, use pam-auth-update, + be sure to 'force' if pam_ecryptfs is missing from the stacks. + * debian/ecryptfs-utils.postrm: remove pam-auth-update config on uninstall + * debian/ecryptfs-utils.pam-auth-update: initial creation of pam-auth-update + configuration. + * debian/ecryptfs.acc: drop auth-client-config profile. + * debian/rules, debian/ecryptfs-utils.install, deiban/ecryptfs-utils.dirs: + remove auth-client-config installation, add pam-auth-update. + + -- Dustin Kirkland Thu, 21 Aug 2008 16:52:42 +0100 + ecryptfs-utils (53-1ubuntu5) intrepid; urgency=low * debian/patches/00list: add 25-ecryptfs-setup-private_fix-pw-echo.dpatch reverted: --- ecryptfs-utils-53/debian/ecryptfs.acc +++ ecryptfs-utils-53.orig/debian/ecryptfs.acc @@ -1,10 +0,0 @@ -[ecryptfs_standard] -pam_auth=auth requisite pam_unix.so nullok_secure - auth optional pam_smbpass.so migrate missingok - auth optional pam_ecryptfs.so unwrap -pam_session=session required pam_unix.so - session optional pam_ecryptfs.so unwrap -pam_password=password requisite pam_unix.so nullok obscure md5 - password optional pam_smbpass.so nullok use_authtok use_first_pass missingok - password optional pam_ecryptfs.so - diff -u ecryptfs-utils-53/debian/ecryptfs-utils.dirs ecryptfs-utils-53/debian/ecryptfs-utils.dirs --- ecryptfs-utils-53/debian/ecryptfs-utils.dirs +++ ecryptfs-utils-53/debian/ecryptfs-utils.dirs @@ -1 +1 @@ -etc/auth-client-config/profile.d +usr/share/pam-configs only in patch2: unchanged: --- ecryptfs-utils-53.orig/debian/ecryptfs-utils.pam-auth-update +++ ecryptfs-utils-53/debian/ecryptfs-utils.pam-auth-update @@ -0,0 +1,12 @@ +Name: eCryptfs Key/Mount Management +Default: yes +Priority: 0 +Auth-Type: Additional +Auth-Final: + optional pam_ecryptfs.so unwrap +Session-Type: Additional +Session-Final: + optional pam_ecryptfs.so unwrap +Password-Type: Additional +Password-Final: + optional pam_ecryptfs.so only in patch2: unchanged: --- ecryptfs-utils-53.orig/debian/ecryptfs-utils.postrm +++ ecryptfs-utils-53/debian/ecryptfs-utils.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +pam-auth-update --package + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- ecryptfs-utils-53.orig/debian/ecryptfs-utils.postinst +++ ecryptfs-utils-53/debian/ecryptfs-utils.postinst @@ -0,0 +1,22 @@ +#!/bin/sh -e + +case "$1" in + configure|reconfigure) + force= + # If we're installing ecryptfs-utils, and the pam_ecryptfs + # module is missing from any of auth|password|session stacks, + # we need to be sure and force the pam-auth-update + for i in "common-auth" "common-password" "common-session"; do + if ! sed "s/\#.*//" /etc/pam.d/$i 2>/dev/null |\ + grep -qs "pam_ecryptfs"; then + force="--force" + break + fi + done + pam-auth-update --package $force + ;; +esac + +#DEBHELPER# + +exit 0