diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index 8844609..1d51c0f 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ diff -up ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2010-03-22 09:14:49.758683763 +0100 -+++ ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2010-03-22 09:21:16.957387907 +0100 +--- ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2009-10-20 20:49:55.000000000 +0200 ++++ ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2010-07-26 16:00:32.940815978 +0200 @@ -86,7 +86,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -143,7 +143,7 @@ diff -up ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror e diff -up ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c --- ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c.werror 2009-10-20 20:49:55.000000000 +0200 -+++ ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c 2010-03-22 09:13:24.003425916 +0100 ++++ ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c 2010-07-26 16:00:32.940815978 +0200 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES @@ -155,7 +155,7 @@ diff -up ecryptfs-utils-83/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES diff -up ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c --- ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c.werror 2010-02-16 18:01:43.000000000 +0100 -+++ ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c 2010-03-22 09:13:24.003425916 +0100 ++++ ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c 2010-07-26 16:00:32.947753593 +0200 @@ -43,31 +43,6 @@ #define PRIVATE_DIR "Private" @@ -233,3 +233,15 @@ diff -up ecryptfs-utils-83/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils goto out; } saved_uid = geteuid(); +diff -up ecryptfs-utils-83/src/utils/test.c.werror ecryptfs-utils-83/src/utils/test.c +--- ecryptfs-utils-83/src/utils/test.c.werror 2010-07-26 16:03:39.171940344 +0200 ++++ ecryptfs-utils-83/src/utils/test.c 2010-07-26 16:03:39.227817822 +0200 +@@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache + struct inode *lower_inode; + struct ecryptfs_crypt_stat *crypt_stat; + int rc = 0; +- int lower_byte_offset; ++ int lower_byte_offset = 0; + int orig_byte_offset = 0; + int num_extents_per_page; + #define ECRYPTFS_PAGE_STATE_UNREAD 0 diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 29760c5..9c703c1 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -5,7 +5,7 @@ Name: ecryptfs-utils Version: 83 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Mon Jul 26 2010 Michal Hlavinka - 83-7 +- fix ftbfs for python mass rebuild + * Wed Jul 21 2010 David Malcolm - 83-6 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild