diff -Nru ecryptfs-utils-92/debian/changelog ecryptfs-utils-92/debian/changelog --- ecryptfs-utils-92/debian/changelog 2011-09-01 16:32:41.000000000 -0500 +++ ecryptfs-utils-92/debian/changelog 2011-11-08 11:06:24.000000000 -0600 @@ -1,3 +1,10 @@ +ecryptfs-utils (92-0ubuntu1.1) oneiric-proposed; urgency=low + + * fix infinite loop on arm: fgetc returns an int, and -1 at end of + options. Arm makes char unsigned. (LP: #884407) + + -- Serge Hallyn Tue, 08 Nov 2011 11:01:19 -0600 + ecryptfs-utils (92-0ubuntu1) oneiric; urgency=low * src/libecryptfs/key_management.c: LP: #725862 diff -Nru ecryptfs-utils-92/debian/patches/fgets-returns-int.patch ecryptfs-utils-92/debian/patches/fgets-returns-int.patch --- ecryptfs-utils-92/debian/patches/fgets-returns-int.patch 1969-12-31 18:00:00.000000000 -0600 +++ ecryptfs-utils-92/debian/patches/fgets-returns-int.patch 2011-11-08 11:01:06.000000000 -0600 @@ -0,0 +1,29 @@ +Description: on arm, char is unsigned by default, so comparing it to EOF + (-1) never succeeds. This leads to an infinite loop in fetch_sig. Fix + it by using an int for the fgetc return. +Author: Serge Hallyn +Forwarded: yes + +Index: ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c +=================================================================== +--- ecryptfs-utils-93.orig/src/utils/mount.ecryptfs_private.c 2011-11-08 10:46:20.121425895 -0600 ++++ ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c 2011-11-08 10:46:25.601426071 -0600 +@@ -134,7 +134,8 @@ + /* Read ecryptfs signature from file and validate + * Return signature as a string, or NULL on failure + */ +- char *sig_file, c; ++ char *sig_file; ++ int c; + FILE *fh; + char *sig; + int i; +@@ -168,7 +169,7 @@ + while ((c = fgetc(fh)) != EOF && i < KEY_BYTES) { + if ((c>='0' && c<='9') || (c>='a' && c<='f') || + (c>='A' && c<='F')) { +- sig[i] = c; ++ sig[i] = (char)c; + i++; + } else { + fputs("Invalid hex signature\n", stderr); diff -Nru ecryptfs-utils-92/debian/patches/series ecryptfs-utils-92/debian/patches/series --- ecryptfs-utils-92/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ ecryptfs-utils-92/debian/patches/series 2011-11-08 11:00:58.000000000 -0600 @@ -0,0 +1 @@ +fgets-returns-int.patch