From cac1ea80d3594e8a3051a29baa902e95ce5aae16 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Jan 30 2013 12:31:04 +0000 Subject: ecryptfs-utils updated to 103 --- diff --git a/.gitignore b/.gitignore index 3e7058d..ad65236 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ ecryptfs-mount-private.png /ecryptfs-utils_99.orig.tar.gz /ecryptfs-utils_100.orig.tar.gz /ecryptfs-utils_101.orig.tar.gz +/ecryptfs-utils_103.orig.tar.gz diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index 036609f..ce9fd8c 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2012-10-29 17:18:53.063121595 +0100 -+++ ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2012-10-29 17:18:53.077121720 +0100 +diff -up ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c +--- ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2013-01-28 17:34:48.159138688 +0100 ++++ ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2013-01-28 17:34:48.173138799 +0100 @@ -99,7 +99,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -150,9 +150,9 @@ diff -up ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo); -diff -up ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c ---- ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c 2012-10-29 17:18:53.077121720 +0100 +diff -up ecryptfs-utils-103/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-103/src/libecryptfs/ecryptfs-stat.c +--- ecryptfs-utils-103/src/libecryptfs/ecryptfs-stat.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/src/libecryptfs/ecryptfs-stat.c 2013-01-28 17:34:48.173138799 +0100 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES @@ -162,9 +162,9 @@ diff -up ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-util "bytes; there are only [%zu] bytes\n", __FUNCTION__, (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES -diff -up ecryptfs-utils-101/src/libecryptfs/key_management.c.werror ecryptfs-utils-101/src/libecryptfs/key_management.c ---- ecryptfs-utils-101/src/libecryptfs/key_management.c.werror 2012-10-29 17:18:53.059121560 +0100 -+++ ecryptfs-utils-101/src/libecryptfs/key_management.c 2012-10-29 17:18:53.077121720 +0100 +diff -up ecryptfs-utils-103/src/libecryptfs/key_management.c.werror ecryptfs-utils-103/src/libecryptfs/key_management.c +--- ecryptfs-utils-103/src/libecryptfs/key_management.c.werror 2013-01-28 17:34:48.155138657 +0100 ++++ ecryptfs-utils-103/src/libecryptfs/key_management.c 2013-01-28 17:34:48.173138799 +0100 @@ -228,7 +228,6 @@ int ecryptfs_wrap_passphrase_file(char * int rc = 0; ssize_t size; @@ -173,9 +173,9 @@ diff -up ecryptfs-utils-101/src/libecryptfs/key_management.c.werror ecryptfs-uti char *p = NULL; char decrypted_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + 1]; -diff -up ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c.werror 2012-08-02 15:20:17.000000000 +0200 -+++ ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c 2012-10-29 17:18:53.078121728 +0100 +diff -up ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.werror 2012-08-02 15:20:17.000000000 +0200 ++++ ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c 2013-01-28 17:34:48.174138807 +0100 @@ -47,31 +47,6 @@ #define PRIVATE_DIR "Private" @@ -298,9 +298,9 @@ diff -up ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-util outnouid: return rc; -diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-101/src/utils/mount.ecryptfs.c ---- ecryptfs-utils-101/src/utils/mount.ecryptfs.c.werror 2012-10-29 17:18:53.074121695 +0100 -+++ ecryptfs-utils-101/src/utils/mount.ecryptfs.c 2012-10-29 17:18:53.078121728 +0100 +diff -up ecryptfs-utils-103/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-103/src/utils/mount.ecryptfs.c +--- ecryptfs-utils-103/src/utils/mount.ecryptfs.c.werror 2013-01-28 17:34:48.170138776 +0100 ++++ ecryptfs-utils-103/src/utils/mount.ecryptfs.c 2013-01-28 17:34:48.174138807 +0100 @@ -34,6 +34,7 @@ #include #include @@ -309,9 +309,9 @@ diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-101 #include "config.h" #include "ecryptfs.h" #include "decision_graph.h" -diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror 2012-10-29 17:18:53.069121651 +0100 -+++ ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c 2012-10-29 17:19:12.958287311 +0100 +diff -up ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.werror 2013-01-28 17:34:48.165138736 +0100 ++++ ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c 2013-01-28 17:34:48.175138815 +0100 @@ -42,6 +42,7 @@ #include #include @@ -320,7 +320,7 @@ diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u #include "../include/ecryptfs.h" /* Perhaps a future version of this program will allow these to be configurable -@@ -95,7 +96,7 @@ int read_config(char *pw_dir, int uid, c +@@ -93,7 +94,7 @@ int read_config(char *pw_dir, int uid, c *s = strdup(e->mnt_fsname); if (!*s) return -2; @@ -329,7 +329,7 @@ diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u return 0; } -@@ -692,8 +693,8 @@ int main(int argc, char *argv[]) { +@@ -702,8 +703,8 @@ int main(int argc, char *argv[]) { * update mtab for us, and replace the current process. * Do not use the umount.ecryptfs helper (-i). */ @@ -340,9 +340,9 @@ diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u clearenv(); /* Since we're doing a lazy unmount anyway, just unmount the current -diff -up ecryptfs-utils-101/src/utils/test.c.werror ecryptfs-utils-101/src/utils/test.c ---- ecryptfs-utils-101/src/utils/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/src/utils/test.c 2012-10-29 17:18:53.079121737 +0100 +diff -up ecryptfs-utils-103/src/utils/test.c.werror ecryptfs-utils-103/src/utils/test.c +--- ecryptfs-utils-103/src/utils/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/src/utils/test.c 2013-01-28 17:34:48.175138815 +0100 @@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache struct inode *lower_inode; struct ecryptfs_crypt_stat *crypt_stat; @@ -352,9 +352,9 @@ diff -up ecryptfs-utils-101/src/utils/test.c.werror ecryptfs-utils-101/src/utils int orig_byte_offset = 0; int num_extents_per_page; #define ECRYPTFS_PAGE_STATE_UNREAD 0 -diff -up ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c.werror ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c ---- ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c 2012-10-29 17:18:53.079121737 +0100 +diff -up ecryptfs-utils-103/tests/kernel/directory-concurrent/test.c.werror ecryptfs-utils-103/tests/kernel/directory-concurrent/test.c +--- ecryptfs-utils-103/tests/kernel/directory-concurrent/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/directory-concurrent/test.c 2013-01-28 17:34:48.175138815 +0100 @@ -149,7 +149,7 @@ int hang_check(int option, const char *f int test_dirs(const char *path, const int max_dirs) @@ -364,9 +364,9 @@ diff -up ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c.werror ecry char *filename; size_t len = strlen(path) + 32; int ret = TEST_PASSED; -diff -up ecryptfs-utils-101/tests/kernel/enospc/test.c.werror ecryptfs-utils-101/tests/kernel/enospc/test.c ---- ecryptfs-utils-101/tests/kernel/enospc/test.c.werror 2012-08-02 15:20:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/enospc/test.c 2012-10-29 17:18:53.080121747 +0100 +diff -up ecryptfs-utils-103/tests/kernel/enospc/test.c.werror ecryptfs-utils-103/tests/kernel/enospc/test.c +--- ecryptfs-utils-103/tests/kernel/enospc/test.c.werror 2012-08-02 15:20:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/enospc/test.c 2013-01-28 17:34:48.175138815 +0100 @@ -37,9 +37,6 @@ int test_exercise(char *filename, ssize_t size) { @@ -377,9 +377,9 @@ diff -up ecryptfs-utils-101/tests/kernel/enospc/test.c.werror ecryptfs-utils-101 ssize_t nbytes = size; int ret = TEST_FAILED; -diff -up ecryptfs-utils-101/tests/kernel/extend-file-random/test.c.werror ecryptfs-utils-101/tests/kernel/extend-file-random/test.c ---- ecryptfs-utils-101/tests/kernel/extend-file-random/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/extend-file-random/test.c 2012-10-29 17:18:53.080121747 +0100 +diff -up ecryptfs-utils-103/tests/kernel/extend-file-random/test.c.werror ecryptfs-utils-103/tests/kernel/extend-file-random/test.c +--- ecryptfs-utils-103/tests/kernel/extend-file-random/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/extend-file-random/test.c 2013-01-28 17:34:48.176138823 +0100 @@ -48,7 +48,7 @@ int test_write(int fd, char *buffer, siz } @@ -405,9 +405,9 @@ diff -up ecryptfs-utils-101/tests/kernel/extend-file-random/test.c.werror ecrypt len, offset, strerror(errno)); return TEST_FAILED; } -diff -up ecryptfs-utils-101/tests/kernel/file-concurrent/test.c.werror ecryptfs-utils-101/tests/kernel/file-concurrent/test.c ---- ecryptfs-utils-101/tests/kernel/file-concurrent/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/file-concurrent/test.c 2012-10-29 17:18:53.080121747 +0100 +diff -up ecryptfs-utils-103/tests/kernel/file-concurrent/test.c.werror ecryptfs-utils-103/tests/kernel/file-concurrent/test.c +--- ecryptfs-utils-103/tests/kernel/file-concurrent/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/file-concurrent/test.c 2013-01-28 17:34:48.176138823 +0100 @@ -177,7 +177,7 @@ int hang_check(int option, const char *f int test_files(const char *path, const int max_files) @@ -417,9 +417,9 @@ diff -up ecryptfs-utils-101/tests/kernel/file-concurrent/test.c.werror ecryptfs- char *filename; size_t len = strlen(path) + 32; int ret = TEST_PASSED; -diff -up ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c ---- ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c.werror 2012-08-02 15:20:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c 2012-10-29 17:18:53.081121757 +0100 +diff -up ecryptfs-utils-103/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-103/tests/kernel/inode-race-stat/test.c +--- ecryptfs-utils-103/tests/kernel/inode-race-stat/test.c.werror 2012-08-02 15:20:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/inode-race-stat/test.c 2013-01-28 17:34:48.176138823 +0100 @@ -106,7 +106,6 @@ static void do_test(const int fdin, cons { for (;;) { @@ -454,9 +454,9 @@ diff -up ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c.werror ecryptfs- (void)waitpid(pids[i], &status, 0); (void)close(pipe_to[i][1]); -diff -up ecryptfs-utils-101/tests/kernel/lp-509180/test.c.werror ecryptfs-utils-101/tests/kernel/lp-509180/test.c ---- ecryptfs-utils-101/tests/kernel/lp-509180/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/lp-509180/test.c 2012-10-29 17:18:53.081121757 +0100 +diff -up ecryptfs-utils-103/tests/kernel/lp-509180/test.c.werror ecryptfs-utils-103/tests/kernel/lp-509180/test.c +--- ecryptfs-utils-103/tests/kernel/lp-509180/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/lp-509180/test.c 2013-01-28 17:34:48.177138831 +0100 @@ -48,7 +48,6 @@ int main(int argc, char **argv) int fd; int opt, flags = 0; @@ -465,9 +465,9 @@ diff -up ecryptfs-utils-101/tests/kernel/lp-509180/test.c.werror ecryptfs-utils- char *file; unsigned char buffer[1]; -diff -up ecryptfs-utils-101/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-101/tests/kernel/trunc-file/test.c ---- ecryptfs-utils-101/tests/kernel/trunc-file/test.c.werror 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/tests/kernel/trunc-file/test.c 2012-10-29 17:18:53.081121757 +0100 +diff -up ecryptfs-utils-103/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-103/tests/kernel/trunc-file/test.c +--- ecryptfs-utils-103/tests/kernel/trunc-file/test.c.werror 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/tests/kernel/trunc-file/test.c 2013-01-28 17:34:48.177138831 +0100 @@ -39,7 +39,7 @@ int write_buff(int fd, unsigned char *data, ssize_t size) @@ -522,3 +522,15 @@ diff -up ecryptfs-utils-101/tests/kernel/trunc-file/test.c.werror ecryptfs-utils exit(TEST_ERROR); } +diff -up ecryptfs-utils-103/tests/userspace/wrap-unwrap/test.c.werror ecryptfs-utils-103/tests/userspace/wrap-unwrap/test.c +--- ecryptfs-utils-103/tests/userspace/wrap-unwrap/test.c.werror 2012-11-30 16:41:02.000000000 +0100 ++++ ecryptfs-utils-103/tests/userspace/wrap-unwrap/test.c 2013-01-28 17:35:13.503339943 +0100 +@@ -101,7 +101,7 @@ int main(int argc, char *argv[]) + passphrase_size = strlen(passphrase); + if ((rc = ecryptfs_wrap_passphrase(path, "testwrappw", salt, + passphrase)) == 0) { +- fprintf(stderr, "ecryptfs_wrap_passphrase() returned rc = 0; " ++ fprintf(stderr, "ecryptfs_wrap_passphrase() returned rc = %d; " + "expected error result instead\n", rc); + rc = 1; + goto out; diff --git a/ecryptfs-utils-83-splitnss.patch b/ecryptfs-utils-83-splitnss.patch index 5041d3a..421c972 100644 --- a/ecryptfs-utils-83-splitnss.patch +++ b/ecryptfs-utils-83-splitnss.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.c ---- ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss 2010-02-16 17:59:21.000000000 +0100 -+++ ecryptfs-utils-83/src/libecryptfs/key_management.c 2010-05-04 11:08:19.875872481 +0200 -@@ -133,28 +133,8 @@ out: +diff -up ecryptfs-utils-103/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-103/src/libecryptfs/key_management.c +--- ecryptfs-utils-103/src/libecryptfs/key_management.c.splitnss 2012-10-03 21:56:16.000000000 +0200 ++++ ecryptfs-utils-103/src/libecryptfs/key_management.c 2013-01-28 17:21:57.036011421 +0100 +@@ -135,28 +135,8 @@ out: } @@ -31,9 +31,9 @@ diff -up ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss ecryptfs-ut int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok, char *auth_tok_sig) { -diff -up ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.inc.c ---- ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss 2010-05-04 11:08:19.875872481 +0200 -+++ ecryptfs-utils-83/src/libecryptfs/key_management.inc.c 2010-05-04 11:08:19.875872481 +0200 +diff -up ecryptfs-utils-103/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-103/src/libecryptfs/key_management.inc.c +--- ecryptfs-utils-103/src/libecryptfs/key_management.inc.c.splitnss 2013-01-28 17:21:57.036011421 +0100 ++++ ecryptfs-utils-103/src/libecryptfs/key_management.inc.c 2013-01-28 17:21:57.036011421 +0100 @@ -0,0 +1,22 @@ +int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig) +{ @@ -57,10 +57,10 @@ diff -up ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss ecryptf +out: + return rc; +} -diff -up ecryptfs-utils-83/src/utils/Makefile.am.splitnss ecryptfs-utils-83/src/utils/Makefile.am ---- ecryptfs-utils-83/src/utils/Makefile.am.splitnss 2010-05-04 11:09:05.176554494 +0200 -+++ ecryptfs-utils-83/src/utils/Makefile.am 2010-05-04 11:09:05.200991500 +0200 -@@ -36,7 +36,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K +diff -up ecryptfs-utils-103/src/utils/Makefile.am.splitnss ecryptfs-utils-103/src/utils/Makefile.am +--- ecryptfs-utils-103/src/utils/Makefile.am.splitnss 2013-01-25 19:09:31.000000000 +0100 ++++ ecryptfs-utils-103/src/utils/Makefile.am 2013-01-28 17:21:57.036011421 +0100 +@@ -39,7 +39,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) umount_ecryptfs_SOURCES = umount.ecryptfs.c umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) @@ -69,9 +69,9 @@ diff -up ecryptfs-utils-83/src/utils/Makefile.am.splitnss ecryptfs-utils-83/src/ ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) -diff -up ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-83/src/utils/umount.ecryptfs.c ---- ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss 2009-10-20 20:49:55.000000000 +0200 -+++ ecryptfs-utils-83/src/utils/umount.ecryptfs.c 2010-05-04 11:08:19.893867192 +0200 +diff -up ecryptfs-utils-103/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-103/src/utils/umount.ecryptfs.c +--- ecryptfs-utils-103/src/utils/umount.ecryptfs.c.splitnss 2012-09-25 22:57:16.000000000 +0200 ++++ ecryptfs-utils-103/src/utils/umount.ecryptfs.c 2013-01-28 17:21:57.037011429 +0100 @@ -24,7 +24,10 @@ #include #include diff --git a/ecryptfs-utils-84-fixsigness.patch b/ecryptfs-utils-84-fixsigness.patch index 5a07520..1e5ff27 100644 --- a/ecryptfs-utils-84-fixsigness.patch +++ b/ecryptfs-utils-84-fixsigness.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness 2011-01-04 14:15:58.711761181 +0100 -+++ ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2011-01-04 14:15:58.744761153 +0100 -@@ -1144,7 +1144,7 @@ static int tf_pkcs11h_key_x509file(struc +diff -up ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c +--- ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness 2012-09-25 22:57:16.000000000 +0200 ++++ ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2013-01-28 17:22:18.711183767 +0100 +@@ -1158,7 +1158,7 @@ static int tf_pkcs11h_key_x509file(struc goto out; } @@ -10,7 +10,7 @@ diff -up ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigne syslog(LOG_ERR, "PKCS#11: Cannot read decode certificate"); rc = -EIO; goto out; -@@ -1165,7 +1165,7 @@ static int tf_pkcs11h_key_x509file(struc +@@ -1179,7 +1179,7 @@ static int tf_pkcs11h_key_x509file(struc */ p = subgraph_key_ctx->pkcs11h_data.certificate_blob; diff --git a/ecryptfs-utils-87-autoload.patch b/ecryptfs-utils-87-autoload.patch index ad7e0ba..bd0413a 100644 --- a/ecryptfs-utils-87-autoload.patch +++ b/ecryptfs-utils-87-autoload.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-101/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-101/src/utils/ecryptfs-mount-private ---- ecryptfs-utils-101/src/utils/ecryptfs-mount-private.autoload 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/src/utils/ecryptfs-mount-private 2012-10-29 17:04:41.989524805 +0100 +diff -up ecryptfs-utils-103/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-103/src/utils/ecryptfs-mount-private +--- ecryptfs-utils-103/src/utils/ecryptfs-mount-private.autoload 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/src/utils/ecryptfs-mount-private 2013-01-28 16:41:59.164861848 +0100 @@ -33,6 +33,9 @@ if /sbin/mount.ecryptfs_private >/dev/nu exit 0 fi @@ -11,9 +11,9 @@ diff -up ecryptfs-utils-101/src/utils/ecryptfs-mount-private.autoload ecryptfs-u # Otherwise, interactively prompt for the user's password if [ -f "$WRAPPED_PASSPHRASE_FILE" -a -f "$MOUNT_PASSPHRASE_SIG_FILE" ]; then tries=0 -diff -up ecryptfs-utils-101/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-101/src/utils/ecryptfs-setup-private ---- ecryptfs-utils-101/src/utils/ecryptfs-setup-private.autoload 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-101/src/utils/ecryptfs-setup-private 2012-10-29 17:04:41.989524805 +0100 +diff -up ecryptfs-utils-103/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-103/src/utils/ecryptfs-setup-private +--- ecryptfs-utils-103/src/utils/ecryptfs-setup-private.autoload 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/src/utils/ecryptfs-setup-private 2013-01-28 16:41:59.164861848 +0100 @@ -101,6 +101,7 @@ random_passphrase () { } @@ -22,11 +22,11 @@ diff -up ecryptfs-utils-101/src/utils/ecryptfs-setup-private.autoload ecryptfs-u version=$(cat /sys/fs/ecryptfs/version 2>/dev/null) [ -z "$version" ] && error "$(gettext 'Cannot get ecryptfs version, ecryptfs kernel module not loaded?')" [ $(($version & 0x100)) -eq 0 ] && return 1 -diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.autoload 2012-10-08 20:27:17.000000000 +0200 -+++ ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c 2012-10-29 17:17:24.284378216 +0100 -@@ -503,6 +503,13 @@ int main(int argc, char *argv[]) { - char **sig; +diff -up ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.autoload 2012-12-12 23:13:43.000000000 +0100 ++++ ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c 2013-01-28 17:17:26.714859379 +0100 +@@ -509,6 +509,13 @@ int main(int argc, char *argv[]) { + char **sigs; FILE *fh_counter = NULL; + if (argc == 2 && !strcmp(argv[1],"--loadmodule")) diff --git a/ecryptfs-utils-87-fixconst.patch b/ecryptfs-utils-87-fixconst.patch index 1417a92..e68a989 100644 --- a/ecryptfs-utils-87-fixconst.patch +++ b/ecryptfs-utils-87-fixconst.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-100/src/include/ecryptfs.h.fixconst ecryptfs-utils-100/src/include/ecryptfs.h ---- ecryptfs-utils-100/src/include/ecryptfs.h.fixconst 2012-08-03 10:48:37.774342929 +0200 -+++ ecryptfs-utils-100/src/include/ecryptfs.h 2012-08-03 10:48:37.781342982 +0200 -@@ -487,8 +487,8 @@ int ecryptfs_eval_decision_graph(struct +diff -up ecryptfs-utils-103/src/include/ecryptfs.h.fixconst ecryptfs-utils-103/src/include/ecryptfs.h +--- ecryptfs-utils-103/src/include/ecryptfs.h.fixconst 2013-01-28 17:24:34.165260633 +0100 ++++ ecryptfs-utils-103/src/include/ecryptfs.h 2013-01-28 17:24:34.172260689 +0100 +@@ -479,8 +479,8 @@ int ecryptfs_eval_decision_graph(struct struct val_node **head, struct param_node *root_node, struct ecryptfs_name_val_pair *nvp_head); @@ -12,7 +12,7 @@ diff -up ecryptfs-utils-100/src/include/ecryptfs.h.fixconst ecryptfs-utils-100/s int ecryptfs_add_key_module_key_to_keyring(char *auth_tok_sig, struct ecryptfs_key_mod *key_mod); int ecryptfs_read_salt_hex_from_rc(char *salt_hex); -@@ -502,11 +502,11 @@ int parse_packet(struct ecryptfs_ctx *ct +@@ -494,11 +494,11 @@ int parse_packet(struct ecryptfs_ctx *ct struct ecryptfs_message **reply); int ecryptfs_find_key_mod(struct ecryptfs_key_mod **key_mod, struct ecryptfs_ctx *ctx, char *key_mod_alias); @@ -27,7 +27,7 @@ diff -up ecryptfs-utils-100/src/include/ecryptfs.h.fixconst ecryptfs-utils-100/s int ecryptfs_generate_key_payload(struct ecryptfs_auth_tok *auth_tok, struct ecryptfs_key_mod *key_mod, char *sig, -@@ -530,15 +530,15 @@ int ecryptfs_read_salt_hex_from_rc(char +@@ -515,15 +515,15 @@ int ecryptfs_read_salt_hex_from_rc(char int ecryptfs_check_sig(char *auth_tok_sig, char *sig_cache_filename, int *flags); int ecryptfs_append_sig(char *auth_tok_sig, char *sig_cache_filename); @@ -51,7 +51,7 @@ diff -up ecryptfs-utils-100/src/include/ecryptfs.h.fixconst ecryptfs-utils-100/s char *ecryptfs_get_wrapped_passphrase_filename(); struct ecryptfs_key_mod_ops *passphrase_get_key_mod_ops(void); int ecryptfs_validate_keyring(void); -@@ -586,7 +586,7 @@ char *ecryptfs_get_passphrase(char *prom +@@ -571,7 +571,7 @@ char *ecryptfs_get_passphrase(char *prom int ecryptfs_run_daemon(struct ecryptfs_messaging_ctx *mctx); #define ECRYPTFS_PRIVATE_DIR "Private" @@ -60,9 +60,9 @@ diff -up ecryptfs-utils-100/src/include/ecryptfs.h.fixconst ecryptfs-utils-100/s int ecryptfs_private_is_mounted(char *dev, char *mnt, char *sig, int mounting); #endif -diff -up ecryptfs-utils-100/src/libecryptfs/key_management.c.fixconst ecryptfs-utils-100/src/libecryptfs/key_management.c ---- ecryptfs-utils-100/src/libecryptfs/key_management.c.fixconst 2012-08-03 10:48:37.737342651 +0200 -+++ ecryptfs-utils-100/src/libecryptfs/key_management.c 2012-08-03 10:49:29.412732323 +0200 +diff -up ecryptfs-utils-103/src/libecryptfs/key_management.c.fixconst ecryptfs-utils-103/src/libecryptfs/key_management.c +--- ecryptfs-utils-103/src/libecryptfs/key_management.c.fixconst 2013-01-28 17:24:34.129260347 +0100 ++++ ecryptfs-utils-103/src/libecryptfs/key_management.c 2013-01-28 17:24:34.172260689 +0100 @@ -55,7 +55,7 @@ */ int ecryptfs_generate_passphrase_auth_tok(struct ecryptfs_auth_tok **auth_tok, @@ -127,9 +127,9 @@ diff -up ecryptfs-utils-100/src/libecryptfs/key_management.c.fixconst ecryptfs-u { char decrypted_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + 1] ; int rc = 0; -diff -up ecryptfs-utils-100/src/libecryptfs/main.c.fixconst ecryptfs-utils-100/src/libecryptfs/main.c ---- ecryptfs-utils-100/src/libecryptfs/main.c.fixconst 2012-08-03 10:48:37.775342936 +0200 -+++ ecryptfs-utils-100/src/libecryptfs/main.c 2012-08-03 10:48:37.783342997 +0200 +diff -up ecryptfs-utils-103/src/libecryptfs/main.c.fixconst ecryptfs-utils-103/src/libecryptfs/main.c +--- ecryptfs-utils-103/src/libecryptfs/main.c.fixconst 2013-01-28 17:24:34.166260641 +0100 ++++ ecryptfs-utils-103/src/libecryptfs/main.c 2013-01-28 17:24:34.173260697 +0100 @@ -93,7 +93,7 @@ out: /* Read ecryptfs private mount from file * Allocate and return a string diff --git a/ecryptfs-utils-87-fixexecgid.patch b/ecryptfs-utils-87-fixexecgid.patch index 613fcd6..d5cd0c2 100644 --- a/ecryptfs-utils-87-fixexecgid.patch +++ b/ecryptfs-utils-87-fixexecgid.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid 2012-07-24 13:20:58.456297563 +0200 -+++ ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c 2012-07-24 13:21:53.250786224 +0200 -@@ -337,8 +337,10 @@ static int private_dir(pam_handle_t *pam +diff -up ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid 2013-01-28 17:23:15.389634398 +0100 ++++ ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c 2013-01-28 17:23:15.392634422 +0100 +@@ -330,8 +330,10 @@ static int private_dir(pam_handle_t *pam _exit(0); } clearenv(); @@ -13,7 +13,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid ecryptfs-u /* run mount.ecryptfs_private as the user */ if (setresuid(pwd->pw_uid, pwd->pw_uid, pwd->pw_uid) < 0) _exit(255); -@@ -352,8 +354,10 @@ static int private_dir(pam_handle_t *pam +@@ -345,8 +347,10 @@ static int private_dir(pam_handle_t *pam _exit(0); } clearenv(); diff --git a/ecryptfs-utils-87-fixpamfork.patch b/ecryptfs-utils-87-fixpamfork.patch index 820a885..966c397 100644 --- a/ecryptfs-utils-87-fixpamfork.patch +++ b/ecryptfs-utils-87-fixpamfork.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork 2012-07-24 13:19:34.168544970 +0200 -+++ ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c 2012-07-24 13:20:20.600959698 +0200 -@@ -228,7 +228,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h +diff -up ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork 2013-01-28 17:23:47.372888664 +0100 ++++ ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c 2013-01-28 17:23:47.418889029 +0100 +@@ -221,7 +221,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h } out_child: free(auth_tok_sig); @@ -10,7 +10,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-u } tmp_pid = waitpid(child_pid, NULL, 0); if (tmp_pid == -1) -@@ -322,7 +322,7 @@ static int private_dir(pam_handle_t *pam +@@ -315,7 +315,7 @@ static int private_dir(pam_handle_t *pam "%s/.ecryptfs/.wrapped-passphrase.recorded", pwd->pw_dir) < 0) || recorded == NULL) { syslog(LOG_ERR, "pam_ecryptfs: Error allocating memory for recorded name"); @@ -19,7 +19,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-u } if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) { /* User has not recorded their passphrase */ -@@ -334,33 +334,35 @@ static int private_dir(pam_handle_t *pam +@@ -327,33 +327,35 @@ static int private_dir(pam_handle_t *pam if (stat(autofile, &s) != 0) { /* User does not want to auto-mount */ syslog(LOG_DEBUG, "pam_ecryptfs: Skipping automatic eCryptfs mount"); @@ -63,7 +63,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-u } else { waitpid(pid, &rc, 0); } -@@ -505,7 +507,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand +@@ -501,7 +503,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand goto out_child; } out_child: diff --git a/ecryptfs-utils-87-memcpyfix.patch b/ecryptfs-utils-87-memcpyfix.patch index d9dc5da..638bdbb 100644 --- a/ecryptfs-utils-87-memcpyfix.patch +++ b/ecryptfs-utils-87-memcpyfix.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-87/src/utils/mount.ecryptfs.c.memcpyfix ecryptfs-utils-87/src/utils/mount.ecryptfs.c ---- ecryptfs-utils-87/src/utils/mount.ecryptfs.c.memcpyfix 2011-07-11 15:04:00.742821125 +0200 -+++ ecryptfs-utils-87/src/utils/mount.ecryptfs.c 2011-07-11 15:04:15.590926517 +0200 -@@ -416,7 +416,7 @@ static int opts_str_contains_option(char +diff -up ecryptfs-utils-103/src/utils/mount.ecryptfs.c.memcpyfix ecryptfs-utils-103/src/utils/mount.ecryptfs.c +--- ecryptfs-utils-103/src/utils/mount.ecryptfs.c.memcpyfix 2012-07-13 16:50:29.000000000 +0200 ++++ ecryptfs-utils-103/src/utils/mount.ecryptfs.c 2013-01-28 17:22:53.769462509 +0100 +@@ -355,7 +355,7 @@ static int opts_str_contains_option(char *end = '\0'; break; } diff --git a/ecryptfs-utils-87-nozombies.patch b/ecryptfs-utils-87-nozombies.patch index 94f1c6c..61d316e 100644 --- a/ecryptfs-utils-87-nozombies.patch +++ b/ecryptfs-utils-87-nozombies.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-93/src/include/ecryptfs.h.nozombies ecryptfs-utils-93/src/include/ecryptfs.h ---- ecryptfs-utils-93/src/include/ecryptfs.h.nozombies 2011-10-27 17:53:07.000000000 +0200 -+++ ecryptfs-utils-93/src/include/ecryptfs.h 2011-10-31 13:47:05.151296631 +0100 -@@ -588,10 +588,6 @@ int ecryptfs_validate_keyring(void); +diff -up ecryptfs-utils-103/src/include/ecryptfs.h.nozombies ecryptfs-utils-103/src/include/ecryptfs.h +--- ecryptfs-utils-103/src/include/ecryptfs.h.nozombies 2012-11-30 16:41:02.000000000 +0100 ++++ ecryptfs-utils-103/src/include/ecryptfs.h 2013-01-28 17:24:14.407103573 +0100 +@@ -530,10 +530,6 @@ int ecryptfs_validate_keyring(void); #define ECRYPTFS_SHM_KEY 0x3c81b7f5 #define ECRYPTFS_SEM_KEY 0x3c81b7f6 #define ECRYPTFS_SHM_SIZE 4096 @@ -12,10 +12,10 @@ diff -up ecryptfs-utils-93/src/include/ecryptfs.h.nozombies ecryptfs-utils-93/sr int ecryptfs_build_linear_subgraph_from_nvp(struct transition_node **trans_node, struct ecryptfs_key_mod *key_mod); int ecryptfs_build_linear_subgraph(struct transition_node **trans_node, -diff -up ecryptfs-utils-93/src/libecryptfs/main.c.nozombies ecryptfs-utils-93/src/libecryptfs/main.c ---- ecryptfs-utils-93/src/libecryptfs/main.c.nozombies 2011-10-31 13:47:05.098296169 +0100 -+++ ecryptfs-utils-93/src/libecryptfs/main.c 2011-10-31 13:47:05.151296631 +0100 -@@ -484,487 +484,6 @@ out: +diff -up ecryptfs-utils-103/src/libecryptfs/main.c.nozombies ecryptfs-utils-103/src/libecryptfs/main.c +--- ecryptfs-utils-103/src/libecryptfs/main.c.nozombies 2012-05-18 21:06:17.000000000 +0200 ++++ ecryptfs-utils-103/src/libecryptfs/main.c 2013-01-28 17:24:14.407103573 +0100 +@@ -380,487 +380,6 @@ out: return rc; } @@ -503,10 +503,10 @@ diff -up ecryptfs-utils-93/src/libecryptfs/main.c.nozombies ecryptfs-utils-93/sr static struct ecryptfs_ctx_ops ctx_ops; struct ecryptfs_ctx_ops *cryptfs_get_ctx_opts (void) -diff -up ecryptfs-utils-93/src/pam_ecryptfs/pam_ecryptfs.c.nozombies ecryptfs-utils-93/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-93/src/pam_ecryptfs/pam_ecryptfs.c.nozombies 2011-10-31 13:47:05.000000000 +0100 -+++ ecryptfs-utils-93/src/pam_ecryptfs/pam_ecryptfs.c 2011-10-31 13:47:30.931521410 +0100 -@@ -201,11 +201,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h +diff -up ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.nozombies ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.nozombies 2013-01-28 17:24:14.400103517 +0100 ++++ ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c 2013-01-28 17:24:14.408103580 +0100 +@@ -214,11 +214,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h syslog(LOG_ERR, "pam_ecryptfs: Error adding passphrase key token to user session keyring; rc = [%ld]\n", rc); goto out_child; } diff --git a/ecryptfs-utils-87-syslog.patch b/ecryptfs-utils-87-syslog.patch index 5024953..4d6c42b 100644 --- a/ecryptfs-utils-87-syslog.patch +++ b/ecryptfs-utils-87-syslog.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-100/src/include/ecryptfs.h.syslog ecryptfs-utils-100/src/include/ecryptfs.h ---- ecryptfs-utils-100/src/include/ecryptfs.h.syslog 2012-09-27 15:04:15.639901578 +0200 -+++ ecryptfs-utils-100/src/include/ecryptfs.h 2012-09-27 15:04:15.659901767 +0200 -@@ -143,7 +143,7 @@ +diff -up ecryptfs-utils-103/src/include/ecryptfs.h.syslog ecryptfs-utils-103/src/include/ecryptfs.h +--- ecryptfs-utils-103/src/include/ecryptfs.h.syslog 2013-01-28 17:24:50.811392951 +0100 ++++ ecryptfs-utils-103/src/include/ecryptfs.h 2013-01-28 17:24:50.814392975 +0100 +@@ -137,7 +137,7 @@ #define ECRYPTFS_TAG_67_PACKET 0x43 #define ecryptfs_syslog(type, fmt, arg...) \ @@ -10,9 +10,9 @@ diff -up ecryptfs-utils-100/src/include/ecryptfs.h.syslog ecryptfs-utils-100/src #define ECRYPTFS_MAX_NUM_CIPHERS 64 #define ECRYPTFS_ECHO_ON 1 -diff -up ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.syslog 2012-09-27 15:04:15.626901456 +0200 -+++ ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c 2012-09-27 15:04:59.003302383 +0200 +diff -up ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c.syslog 2013-01-28 17:24:50.808392927 +0100 ++++ ecryptfs-utils-103/src/pam_ecryptfs/pam_ecryptfs.c 2013-01-28 17:24:50.815392983 +0100 @@ -94,7 +94,7 @@ static int wrap_passphrase_if_necessary( rc = asprintf(&unwrapped_pw_filename, "/dev/shm/.ecryptfs-%s", username); diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index d7895c6..4d87d35 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,7 +4,7 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 101 +Version: 103 Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base @@ -121,7 +121,7 @@ the interface supplied by the ecryptfs-utils library. %patch23 -p1 -b .sudokeyring %build -export CFLAGS="$RPM_OPT_FLAGS -Werror -Wtype-limits" +export CFLAGS="$RPM_OPT_FLAGS -Werror -Wtype-limits -Wno-unused" #we're modifing Makefile.am autoreconf -fiv %configure --disable-rpath --enable-tspi --enable-nss --enable-pkcs11-helper --enable-tests @@ -199,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT %attr(4750,root,ecryptfs) %{_sbindir}/mount.ecryptfs_private %{_sbindir}/umount.ecryptfs_private %{_bindir}/ecryptfs-add-passphrase +%{_bindir}/ecryptfs-find %{_bindir}/ecryptfs-generate-tpm-key %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring %{_bindir}/ecryptfs-manager @@ -224,8 +225,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/ecryptfs-mount-private.desktop %{_datadir}/%{name}/ecryptfs-mount-private.png %{_datadir}/%{name}/ecryptfs-setup-private.desktop -%{_datadir}/%{name}/ecryptfs-find %{_mandir}/man1/ecryptfs-add-passphrase.1.gz +%{_mandir}/man1/ecryptfs-find.1* %{_mandir}/man1/ecryptfs-generate-tpm-key.1.gz %{_mandir}/man1/ecryptfs-insert-wrapped-passphrase-into-keyring.1.gz %{_mandir}/man1/ecryptfs-mount-private.1.gz @@ -237,11 +238,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ecryptfs-stat.1.gz %{_mandir}/man1/ecryptfs-umount-private.1.gz %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz +%{_mandir}/man1/ecryptfs-verify.1* %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz %{_mandir}/man1/mount.ecryptfs_private.1.gz %{_mandir}/man1/umount.ecryptfs_private.1.gz %{_mandir}/man7/ecryptfs.7.gz %{_mandir}/man8/ecryptfs-manager.8.gz +%{_mandir}/man8/ecryptfs-migrate-home.8* %{_mandir}/man8/ecryptfsd.8.gz %{_mandir}/man8/mount.ecryptfs.8.gz %{_mandir}/man8/pam_ecryptfs.8.gz @@ -265,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Wed Jan 30 2013 Michal Hlavinka - 103-1 +- ecryptfs-utils updated to 103 + * Mon Oct 29 2012 Michal Hlavinka - 101-1 - ecryptfs-utils updated to 101 diff --git a/sources b/sources index 9b88153..51c4d39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -7a17714b2e4555a79d464e260b179f4f ecryptfs-utils_101.orig.tar.gz +39929d850edd24b175ff0c82722e0de1 ecryptfs-utils_103.orig.tar.gz