diff -u ecryptfs-utils-68/debian/changelog ecryptfs-utils-68/debian/changelog --- ecryptfs-utils-68/debian/changelog +++ ecryptfs-utils-68/debian/changelog @@ -1,3 +1,9 @@ +ecryptfs-utils (68-1ubuntu2) jaunty; urgency=low + + * debian/patches/05-mount_opts.dpatch: Clean up mount options, LP: #277723 + + -- Dustin Kirkland Mon, 05 Jan 2009 15:34:05 -0600 + ecryptfs-utils (68-1ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #311193), remaining changes: only in patch2: unchanged: --- ecryptfs-utils-68.orig/debian/patches/05-mount_opts.dpatch +++ ecryptfs-utils-68/debian/patches/05-mount_opts.dpatch @@ -0,0 +1,40 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +# 05-mount_opts.dpatch +# by Dustin Kirkland +# Fix for LP: #277723 +# Committed to upstream git: 818b5930c8cfc7935099a7a2b2ad21255602b9dd +# 34cf8dffd3a33c97fcacc49242633bd145079198 + +@DPATCH@ + +diff -upr ../../1/ecryptfs-utils-68/src/utils/mount.ecryptfs_private.c ../../2/ecryptfs-utils-68/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-68/src/utils/mount.ecryptfs_private.c 2008-12-22 15:34:45.000000000 -0600 ++++ ecryptfs-utils-68/src/utils/mount.ecryptfs_private.c 2009-01-05 17:47:49.000000000 -0600 +@@ -339,6 +339,7 @@ int bump_counter(FILE *fh, int delta) { + /* Write the count to file */ + rewind(fh); + fprintf(fh, "%d\n", count); ++ fflush(fh); + return count; + } + +@@ -355,7 +356,7 @@ int decrement(FILE *fh) { + } + + int zero(FILE *fh) { +-/* Remove the counter file */ ++/* Zero the counter file */ + return bump_counter(fh, -MAXINT+1); + } + +@@ -461,8 +462,8 @@ int main(int argc, char *argv[]) { + goto fail; + } + if ((asprintf(&opt, +- "rw,ecryptfs_sig=%s,ecryptfs_cipher=%s,ecryptfs_key_bytes=%d,user=%s", +- sig, KEY_CIPHER, KEY_BYTES, pwd->pw_name) < 0) || ++ "ecryptfs_sig=%s,ecryptfs_cipher=%s,ecryptfs_key_bytes=%d", ++ sig, KEY_CIPHER, KEY_BYTES) < 0) || + opt == NULL) { + perror("asprintf (opt)"); + goto fail; only in patch2: unchanged: --- ecryptfs-utils-68.orig/debian/patches/00list +++ ecryptfs-utils-68/debian/patches/00list @@ -0,0 +1 @@ +05-mount_opts.dpatch