From d980452d0f329ca498e9269e514281e4f5a6bf49 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Jan 26 2016 16:16:00 +0000 Subject: werror fixes --- diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index 04d469c..b55dbff 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ diff -up ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2016-01-26 16:00:55.718289254 +0100 -+++ ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2016-01-26 16:00:55.725289240 +0100 +--- ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2016-01-26 17:01:19.803230193 +0100 ++++ ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2016-01-26 17:01:19.810230176 +0100 @@ -98,7 +98,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -152,7 +152,7 @@ diff -up ecryptfs-utils-109/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror diff -up ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c --- ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c.werror 2015-12-21 21:38:59.000000000 +0100 -+++ ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c 2016-01-26 16:00:55.725289240 +0100 ++++ ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c 2016-01-26 17:01:19.810230176 +0100 @@ -84,9 +84,7 @@ static int wrap_passphrase_if_necessary( stat(wrapped_pw_filename, &s) != 0 && passphrase != NULL && *passphrase != '\0' && @@ -200,7 +200,7 @@ diff -up ecryptfs-utils-109/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-util return rc; diff -up ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c.werror ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c --- ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c.werror 2015-12-21 21:38:59.000000000 +0100 -+++ ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c 2016-01-26 16:00:55.726289238 +0100 ++++ ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c 2016-01-26 17:01:19.810230176 +0100 @@ -89,7 +89,7 @@ int main(int argc, char **argv) int i, c, *pcrsSelected = NULL, numPcrsSelected = 0; TSS_UUID *uuid; @@ -211,8 +211,8 @@ diff -up ecryptfs-utils-109/src/utils/ecryptfs_generate_tpm_key.c.werror ecryptf while (1) { c = getopt(argc, argv, "p:"); diff -up ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c.werror 2016-01-26 16:00:55.723289244 +0100 -+++ ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c 2016-01-26 16:02:03.487148717 +0100 +--- ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c.werror 2016-01-26 17:01:19.807230183 +0100 ++++ ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c 2016-01-26 17:01:30.262205251 +0100 @@ -232,7 +232,7 @@ static int check_cwd_f_type() * * This whitelist is to prevent malicious mount.ecryptfs_private users @@ -222,6 +222,15 @@ diff -up ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u * https://launchpad.net/bugs/1530566 for more details. */ __SWORD_TYPE f_type_whitelist[] = { +@@ -276,7 +276,7 @@ static int check_cwd_f_type() + + fprintf(stderr, + "Refusing to mount over an unapproved filesystem type: %#lx\n", +- buf.f_type); ++ (long unsigned int)buf.f_type); + return 1; + } + @@ -829,8 +829,8 @@ int main(int argc, char *argv[]) { * update mtab for us, and replace the current process. * Do not use the umount.ecryptfs helper (-i). @@ -235,7 +244,7 @@ diff -up ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u /* Since we're doing a lazy unmount anyway, just unmount the current diff -up ecryptfs-utils-109/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-109/tests/kernel/inode-race-stat/test.c --- ecryptfs-utils-109/tests/kernel/inode-race-stat/test.c.werror 2015-12-21 21:38:59.000000000 +0100 -+++ ecryptfs-utils-109/tests/kernel/inode-race-stat/test.c 2016-01-26 16:00:55.726289238 +0100 ++++ ecryptfs-utils-109/tests/kernel/inode-race-stat/test.c 2016-01-26 17:01:19.811230174 +0100 @@ -364,6 +364,7 @@ abort: if (write(pipe_to[i][1], cmd, 1) != 1)