[ecryptfs-utils/f17] ecryptfs-utils updated to 100
Michal Hlavinka
mhlavink at fedoraproject.org
Fri Aug 3 09:43:47 UTC 2012
commit b76db5f713141c3c68b84523140327adf0571d3c
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri Aug 3 11:43:07 2012 +0200
ecryptfs-utils updated to 100
.gitignore | 1 +
ecryptfs-utils-75-werror.patch | 13 +++++++++++++
ecryptfs-utils-87-fixconst.patch | 36 ++++++++++++++++++------------------
ecryptfs-utils-87-pamdata.patch | 9 ++++-----
ecryptfs-utils-87-syslog.patch | 10 +---------
ecryptfs-utils.spec | 5 ++++-
sources | 2 +-
7 files changed, 42 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de51268..7c2cdea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ ecryptfs-mount-private.png
/ecryptfs-utils_96.orig.tar.gz
/ecryptfs-utils_97.orig.tar.gz
/ecryptfs-utils_99.orig.tar.gz
+/ecryptfs-utils_100.orig.tar.gz
diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch
index 60cc559..e60f5b4 100644
--- a/ecryptfs-utils-75-werror.patch
+++ b/ecryptfs-utils-75-werror.patch
@@ -454,3 +454,16 @@ diff -up ecryptfs-utils-99/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-
exit(TEST_ERROR);
}
+diff -up ecryptfs-utils-100/tests/kernel/enospc/test.c.newfix ecryptfs-utils-100/tests/kernel/enospc/test.c
+--- ecryptfs-utils-100/tests/kernel/enospc/test.c.newfix 2012-08-03 11:08:28.121411674 +0200
++++ ecryptfs-utils-100/tests/kernel/enospc/test.c 2012-08-03 11:08:28.139411811 +0200
+@@ -37,9 +37,6 @@
+ int test_exercise(char *filename, ssize_t size)
+ {
+ int fd;
+- ssize_t i;
+- ssize_t n;
+- struct stat statbuf;
+ ssize_t nbytes = size;
+ int ret = TEST_FAILED;
+
diff --git a/ecryptfs-utils-87-fixconst.patch b/ecryptfs-utils-87-fixconst.patch
index af01752..1417a92 100644
--- a/ecryptfs-utils-87-fixconst.patch
+++ b/ecryptfs-utils-87-fixconst.patch
@@ -1,7 +1,7 @@
-diff -up ecryptfs-utils-87/src/include/ecryptfs.h.fixconst ecryptfs-utils-87/src/include/ecryptfs.h
---- ecryptfs-utils-87/src/include/ecryptfs.h.fixconst 2011-08-03 15:35:28.552079157 +0200
-+++ ecryptfs-utils-87/src/include/ecryptfs.h 2011-08-03 15:39:40.654497299 +0200
-@@ -528,8 +528,8 @@ int ecryptfs_eval_decision_graph(struct
+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
struct val_node **head,
struct param_node *root_node,
struct ecryptfs_name_val_pair *nvp_head);
@@ -12,7 +12,7 @@ diff -up ecryptfs-utils-87/src/include/ecryptfs.h.fixconst ecryptfs-utils-87/src
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);
-@@ -545,11 +545,11 @@ int parse_packet(struct ecryptfs_ctx *ct
+@@ -502,11 +502,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-87/src/include/ecryptfs.h.fixconst ecryptfs-utils-87/src
int
ecryptfs_generate_key_payload(struct ecryptfs_auth_tok *auth_tok,
struct ecryptfs_key_mod *key_mod, char *sig,
-@@ -573,15 +573,15 @@ int ecryptfs_read_salt_hex_from_rc(char
+@@ -530,15 +530,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-87/src/include/ecryptfs.h.fixconst ecryptfs-utils-87/src
char *ecryptfs_get_wrapped_passphrase_filename();
struct ecryptfs_key_mod_ops *passphrase_get_key_mod_ops(void);
int ecryptfs_validate_keyring(void);
-@@ -629,7 +629,7 @@ char *ecryptfs_get_passphrase(char *prom
+@@ -586,7 +586,7 @@ char *ecryptfs_get_passphrase(char *prom
int ecryptfs_run_daemon(struct ecryptfs_messaging_ctx *mctx);
#define ECRYPTFS_PRIVATE_DIR "Private"
@@ -60,10 +60,10 @@ diff -up ecryptfs-utils-87/src/include/ecryptfs.h.fixconst ecryptfs-utils-87/src
int ecryptfs_private_is_mounted(char *dev, char *mnt, char *sig, int mounting);
#endif
-diff -up ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst ecryptfs-utils-87/src/libecryptfs/key_management.c
---- ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst 2011-08-03 15:35:28.434082255 +0200
-+++ ecryptfs-utils-87/src/libecryptfs/key_management.c 2011-08-03 15:39:26.382868090 +0200
-@@ -53,7 +53,7 @@
+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
+@@ -55,7 +55,7 @@
*/
int ecryptfs_generate_passphrase_auth_tok(struct ecryptfs_auth_tok **auth_tok,
char *auth_tok_sig, char *fekek,
@@ -72,7 +72,7 @@ diff -up ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst ecryptfs-ut
{
int rc;
-@@ -190,8 +190,8 @@ int ecryptfs_add_blob_to_keyring(char *b
+@@ -192,8 +192,8 @@ int ecryptfs_add_blob_to_keyring(char *b
*
* Returns 0 on add, 1 on pre-existed, negative on failure.
*/
@@ -83,7 +83,7 @@ diff -up ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst ecryptfs-ut
{
int rc;
char fekek[ECRYPTFS_MAX_KEY_BYTES];
-@@ -220,8 +220,8 @@ out:
+@@ -222,8 +222,8 @@ out:
return rc;
}
@@ -116,7 +116,7 @@ diff -up ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst ecryptfs-ut
{
char wrapping_auth_tok_sig[ECRYPTFS_SIG_SIZE_HEX + 1];
char wrapping_auth_tok_sig_from_file[ECRYPTFS_SIG_SIZE_HEX + 1];
-@@ -546,8 +546,8 @@ out:
+@@ -549,8 +549,8 @@ out:
* into the user session keyring.
*/
int ecryptfs_insert_wrapped_passphrase_into_keyring(
@@ -126,10 +126,10 @@ diff -up ecryptfs-utils-87/src/libecryptfs/key_management.c.fixconst ecryptfs-ut
+ const char *salt)
{
char decrypted_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + 1] ;
- uint32_t version;
-diff -up ecryptfs-utils-87/src/libecryptfs/main.c.fixconst ecryptfs-utils-87/src/libecryptfs/main.c
---- ecryptfs-utils-87/src/libecryptfs/main.c.fixconst 2011-08-03 15:35:28.553079131 +0200
-+++ ecryptfs-utils-87/src/libecryptfs/main.c 2011-08-03 15:35:28.577078501 +0200
+ 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
@@ -93,7 +93,7 @@ out:
/* Read ecryptfs private mount from file
* Allocate and return a string
diff --git a/ecryptfs-utils-87-pamdata.patch b/ecryptfs-utils-87-pamdata.patch
index 2df6359..8a46a85 100644
--- a/ecryptfs-utils-87-pamdata.patch
+++ b/ecryptfs-utils-87-pamdata.patch
@@ -37,7 +37,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.pamdata ecryptfs-util
{
char *unwrapped_pw_filename = NULL;
struct stat s;
-@@ -98,52 +118,38 @@ static int wrap_passphrase_if_necessary(
+@@ -98,51 +118,37 @@ static int wrap_passphrase_if_necessary(
PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
const char **argv)
{
@@ -54,7 +54,6 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.pamdata ecryptfs-util
char *private_mnt = NULL;
- pid_t child_pid, tmp_pid;
long rc;
- uint32_t version;
+ struct ecryptfs_pam_data *epd = {0,};
- rc = pam_get_user(pamh, &username, NULL);
@@ -107,9 +106,9 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.pamdata ecryptfs-util
costly loading of keys */
goto out;
@@ -152,89 +158,28 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
- load ecryptfs module if not loaded already */
- if (ecryptfs_get_version(&version) != 0)
- syslog(LOG_WARNING, "pam_ecryptfs: Can't check if kernel supports ecryptfs\n");
+ costly loading of keys */
+ goto out;
+ }
- if(file_exists_dotecryptfs(homedir, "wrapping-independent") == 1)
- rc = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &passphrase, "Encryption passphrase: ");
+ if(file_exists_dotecryptfs(epd->homedir, "wrapping-independent") == 1)
diff --git a/ecryptfs-utils-87-syslog.patch b/ecryptfs-utils-87-syslog.patch
index 56c68ba..91438c6 100644
--- a/ecryptfs-utils-87-syslog.patch
+++ b/ecryptfs-utils-87-syslog.patch
@@ -58,15 +58,7 @@ diff -up ecryptfs-utils-99/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-utils
/* If private/home is already mounted, then we can skip
costly loading of keys */
goto out;
-@@ -157,14 +157,14 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
- /* we need side effect of this check:
- load ecryptfs module if not loaded already */
- if (ecryptfs_get_version(&version) != 0)
-- syslog(LOG_WARNING, "pam_ecryptfs: Can't check if kernel supports ecryptfs\n");
-+ ecryptfs_syslog(LOG_WARNING, "pam_ecryptfs: Can't check if kernel supports ecryptfs\n");
- if(file_exists_dotecryptfs(epd->homedir, "wrapping-independent") == 1)
- rc = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &epd->passphrase, "Encryption passphrase: ");
- else
+@@ -164,7 +164,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
rc = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&epd->passphrase);
epd->passphrase = strdup(epd->passphrase);
if (rc != PAM_SUCCESS) {
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index bd19cab..71550d0 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -4,7 +4,7 @@
%global _sbindir /sbin
Name: ecryptfs-utils
-Version: 99
+Version: 100
Release: 1%{?dist}
Summary: The eCryptfs mount helper and support libraries
Group: System Environment/Base
@@ -262,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/ecryptfs-utils/_libecryptfs.so
%changelog
+* Fri Aug 03 2012 Michal Hlavinka <mhlavink at redhat.com> - 100-1
+- ecryptfs-utils updated to 100
+
* Tue Jul 24 2012 Michal Hlavinka <mhlavink at redhat.com> - 99-1
- ecryptfs-utils updated to 99
- fixes: suid helper does not restrict mounting filesystems with
diff --git a/sources b/sources
index 8fe0eef..a425f76 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png
-17ef9190c6d078845e19d3e9a7d8ef7a ecryptfs-utils_99.orig.tar.gz
+efaa5eabbd368268874536036397f73b ecryptfs-utils_100.orig.tar.gz
More information about the scm-commits
mailing list