From 58fe0d785ccc376c0326d0a55672e5cb8bc71042 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Jan 26 2016 15:12:39 +0000 Subject: ecryptfs-utils updated to 109 --- diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index ee321dc..04d469c 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2015-08-11 14:43:57.574827367 +0200 -+++ ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2015-08-11 14:43:57.585827338 +0200 +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 @@ -98,7 +98,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -150,9 +150,9 @@ diff -up ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo); -diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.werror 2015-08-05 23:37:17.000000000 +0200 -+++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:43:57.585827338 +0200 +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 @@ -84,9 +84,7 @@ static int wrap_passphrase_if_necessary( stat(wrapped_pw_filename, &s) != 0 && passphrase != NULL && *passphrase != '\0' && @@ -198,9 +198,9 @@ diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-util outnouid: return rc; -diff -up ecryptfs-utils-108/src/utils/ecryptfs_generate_tpm_key.c.werror ecryptfs-utils-108/src/utils/ecryptfs_generate_tpm_key.c ---- ecryptfs-utils-108/src/utils/ecryptfs_generate_tpm_key.c.werror 2015-02-10 17:59:34.000000000 +0100 -+++ ecryptfs-utils-108/src/utils/ecryptfs_generate_tpm_key.c 2015-08-11 14:43:57.585827338 +0200 +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 @@ -89,7 +89,7 @@ int main(int argc, char **argv) int i, c, *pcrsSelected = NULL, numPcrsSelected = 0; TSS_UUID *uuid; @@ -210,10 +210,19 @@ diff -up ecryptfs-utils-108/src/utils/ecryptfs_generate_tpm_key.c.werror ecryptf while (1) { c = getopt(argc, argv, "p:"); -diff -up ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c.werror 2015-08-11 14:43:57.580827351 +0200 -+++ ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c 2015-08-11 14:43:57.586827336 +0200 -@@ -765,8 +765,8 @@ int main(int argc, char *argv[]) { +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 +@@ -232,7 +232,7 @@ static int check_cwd_f_type() + * + * This whitelist is to prevent malicious mount.ecryptfs_private users + * from mounting over filesystem types such as PROC_SUPER_MAGIC to +- * deceive other programs with a crafted /proc/self/*. See ++ * deceive other programs with a crafted /proc/self/ *. See + * https://launchpad.net/bugs/1530566 for more details. + */ + __SWORD_TYPE f_type_whitelist[] = { +@@ -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). */ @@ -224,9 +233,9 @@ diff -up ecryptfs-utils-108/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-108/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-108/tests/kernel/inode-race-stat/test.c ---- ecryptfs-utils-108/tests/kernel/inode-race-stat/test.c.werror 2015-02-10 17:59:34.000000000 +0100 -+++ ecryptfs-utils-108/tests/kernel/inode-race-stat/test.c 2015-08-11 14:43:57.586827336 +0200 +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 @@ -364,6 +364,7 @@ abort: if (write(pipe_to[i][1], cmd, 1) != 1) diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 3734d63..633589a 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,7 +4,7 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 108 +Version: 109 Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Tue Jan 26 2016 Michal Hlavinka - 109-1 +- ecryptfs-utils updated to 109 + * Tue Aug 11 2015 Michal Hlavinka - 108-1 - ecryptfs-utils updated to 108