From 8813d2378347c21fb788741a84d489acd9a497ad Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Feb 25 2011 16:16:57 +0000 Subject: updated to v. 86 --- diff --git a/.gitignore b/.gitignore index 3ca9303..d13ef7b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ecryptfs-mount-private.png /ecryptfs-mount-private.png /ecryptfs-utils_84.orig.tar.gz /ecryptfs-utils_85.orig.tar.gz +/ecryptfs-utils_86.orig.tar.gz diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index 54fb587..f02992b 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2010-12-17 18:34:04.000000000 +0100 -+++ ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2011-02-01 11:12:14.813646937 +0100 +diff -up ecryptfs-utils-86/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-86/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c +--- ecryptfs-utils-86/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2011-02-25 17:04:05.760026778 +0100 ++++ ecryptfs-utils-86/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2011-02-25 17:04:05.841024970 +0100 @@ -86,7 +86,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -150,9 +150,9 @@ diff -up ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror e subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo); -diff -up ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c ---- ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror 2010-12-17 18:34:04.000000000 +0100 -+++ ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c 2011-02-01 11:12:14.813646937 +0100 +diff -up ecryptfs-utils-86/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-86/src/libecryptfs/ecryptfs-stat.c +--- ecryptfs-utils-86/src/libecryptfs/ecryptfs-stat.c.werror 2010-12-17 18:34:04.000000000 +0100 ++++ ecryptfs-utils-86/src/libecryptfs/ecryptfs-stat.c 2011-02-25 17:04:05.843024925 +0100 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES @@ -162,10 +162,15 @@ diff -up ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils "bytes; there are only [%zu] bytes\n", __FUNCTION__, (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES -diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror 2010-12-17 18:34:04.000000000 +0100 -+++ ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c 2011-02-01 11:12:18.061664154 +0100 -@@ -43,31 +43,6 @@ +diff -up ecryptfs-utils-86/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-86/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-86/src/pam_ecryptfs/pam_ecryptfs.c.werror 2011-02-06 03:44:30.000000000 +0100 ++++ ecryptfs-utils-86/src/pam_ecryptfs/pam_ecryptfs.c 2011-02-25 17:10:08.898668231 +0100 +@@ -39,35 +39,11 @@ + #include + #include + #include ++#include + #include "../include/ecryptfs.h" #define PRIVATE_DIR "Private" @@ -194,10 +199,10 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils - } -} - - /* returns: 0 for pam automounting not set, 1 for set, <0 for error */ - static int ecryptfs_pam_automount_set(const char *homedir) + /* returns: 0 if file does not exist, 1 if it exists, <0 for error */ + static int file_exists_dotecryptfs(const char *homedir, char *filename) { -@@ -87,7 +62,7 @@ out: +@@ -87,7 +63,7 @@ out: return rc; } @@ -206,7 +211,7 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils { char *unwrapped_pw_filename = NULL; struct stat s; -@@ -198,8 +173,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h +@@ -201,8 +177,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h if ((argc == 1) && (memcmp(argv[0], "unwrap\0", 7) == 0)) { char *wrapped_pw_filename; @@ -215,7 +220,7 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils rc = asprintf( &wrapped_pw_filename, "%s/.ecryptfs/%s", -@@ -291,8 +264,6 @@ static int private_dir(pam_handle_t *pam +@@ -294,8 +268,6 @@ static int private_dir(pam_handle_t *pam char *autoumount = "auto-umount"; struct stat s; pid_t pid; @@ -224,7 +229,7 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils if ((pwd = fetch_pwd(pamh)) == NULL) { /* fetch_pwd() logged a message */ -@@ -339,7 +310,7 @@ static int private_dir(pam_handle_t *pam +@@ -342,7 +314,7 @@ static int private_dir(pam_handle_t *pam if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) { /* User has not recorded their passphrase */ unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); @@ -233,7 +238,7 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666); close(fd); } -@@ -410,7 +381,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand +@@ -413,7 +385,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand char *old_passphrase = NULL; char *new_passphrase = NULL; char *wrapped_pw_filename; @@ -242,7 +247,7 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils char salt[ECRYPTFS_SALT_SIZE]; char salt_hex[ECRYPTFS_SALT_SIZE_HEX]; pid_t child_pid, tmp_pid; -@@ -424,11 +395,11 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand +@@ -427,11 +399,11 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand if (pwd) { uid = pwd->pw_uid; homedir = pwd->pw_dir; @@ -256,9 +261,9 @@ diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils goto out; } saved_uid = geteuid(); -diff -up ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-85/src/utils/mount.ecryptfs.c ---- ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror 2010-12-17 18:34:04.000000000 +0100 -+++ ecryptfs-utils-85/src/utils/mount.ecryptfs.c 2011-02-01 11:12:14.818646964 +0100 +diff -up ecryptfs-utils-86/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-86/src/utils/mount.ecryptfs.c +--- ecryptfs-utils-86/src/utils/mount.ecryptfs.c.werror 2010-12-17 18:34:04.000000000 +0100 ++++ ecryptfs-utils-86/src/utils/mount.ecryptfs.c 2011-02-25 17:04:05.857024613 +0100 @@ -461,7 +461,7 @@ static int ecryptfs_do_mount(int argc, c { int rc; @@ -277,9 +282,20 @@ diff -up ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-85/s if (!(temp = strdup("ecryptfs_unlink_sigs"))) { rc = -ENOMEM; goto out; -diff -up ecryptfs-utils-85/src/utils/test.c.werror ecryptfs-utils-85/src/utils/test.c ---- ecryptfs-utils-85/src/utils/test.c.werror 2010-12-17 18:34:04.000000000 +0100 -+++ ecryptfs-utils-85/src/utils/test.c 2011-02-01 11:12:14.818646964 +0100 +diff -up ecryptfs-utils-86/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-86/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-86/src/utils/mount.ecryptfs_private.c.werror 2011-02-25 17:04:05.802025842 +0100 ++++ ecryptfs-utils-86/src/utils/mount.ecryptfs_private.c 2011-02-25 17:04:05.859024569 +0100 +@@ -95,7 +95,6 @@ int read_config(char *pw_dir, int uid, c + *s = strdup(e->mnt_fsname); + if (!*s) + return -2; +-out: + return 0; + } + +diff -up ecryptfs-utils-86/src/utils/test.c.werror ecryptfs-utils-86/src/utils/test.c +--- ecryptfs-utils-86/src/utils/test.c.werror 2010-12-17 18:34:04.000000000 +0100 ++++ ecryptfs-utils-86/src/utils/test.c 2011-02-25 17:04:05.860024547 +0100 @@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache struct inode *lower_inode; struct ecryptfs_crypt_stat *crypt_stat; diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 4809db1..61a5f76 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,8 +4,8 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 85 -Release: 2%{?dist} +Version: 86 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -13,10 +13,6 @@ URL: https://launchpad.net/ecryptfs Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz Source1: ecryptfs-mount-private.png -# allow building with -Werror -# required for ecryptfs-utils <= 81 -Patch1: ecryptfs-utils-75-werror.patch - # rhbz#500829, do not use ubuntu/debian only service Patch2: ecryptfs-utils-75-nocryptdisks.patch @@ -33,6 +29,9 @@ Patch5: ecryptfs-utils-84-fixsigness.patch # also fixes this issue: char c; while((c = fgetc(fh)) != EOF) Patch6: ecryptfs-utils-84-fgetc.patch +# allow building with -Werror +Patch999: ecryptfs-utils-75-werror.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils, cryptsetup-luks, util-linux-ng, gettext BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel @@ -70,12 +69,12 @@ the interface supplied by the ecryptfs-utils library. %prep %setup -q -%patch1 -p1 -b .werror %patch2 -p1 -b .nocryptdisks %patch3 -p1 -b .fixsalt %patch4 -p1 -b .splitnss %patch5 -p1 -b .fixsigness %patch6 -p1 -b .fgetc +%patch999 -p1 -b .werror %build export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror -Wtype-limits" @@ -203,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Fri Feb 25 2011 Michal Hlavinka - 86-1 +- updated to v. 86 + * Tue Feb 08 2011 Fedora Release Engineering - 85-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index c8f264e..f4d61d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -eacf9488681d99651da544a4c261f784 ecryptfs-utils_85.orig.tar.gz +0df44811d9adf2c3dfd5a775e86f6452 ecryptfs-utils_86.orig.tar.gz