From 9471b77260390509409a33e3cbea32e803f396b6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Aug 11 2015 12:45:11 +0000 Subject: ecryptfs-utils updated to 108 --- diff --git a/ecryptfs-utils-100-sudokeyring.patch b/ecryptfs-utils-100-sudokeyring.patch index 122d9b7..6972fae 100644 --- a/ecryptfs-utils-100-sudokeyring.patch +++ b/ecryptfs-utils-100-sudokeyring.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-100/src/utils/ecryptfs-setup-private.sudokeyring ecryptfs-utils-100/src/utils/ecryptfs-setup-private ---- ecryptfs-utils-100/src/utils/ecryptfs-setup-private.sudokeyring 2012-10-25 14:48:55.000000000 +0200 -+++ ecryptfs-utils-100/src/utils/ecryptfs-setup-private 2012-10-25 14:50:08.637929477 +0200 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-setup-private.sudokeyring ecryptfs-utils-108/src/utils/ecryptfs-setup-private +--- ecryptfs-utils-108/src/utils/ecryptfs-setup-private.sudokeyring 2015-08-11 14:44:05.213807245 +0200 ++++ ecryptfs-utils-108/src/utils/ecryptfs-setup-private 2015-08-11 14:44:05.231807198 +0200 @@ -427,8 +427,16 @@ if [ "$BOOTSTRAP" = "1" ]; then else sig_opt="ecryptfs_sig=$sig" diff --git a/ecryptfs-utils-75-nocryptdisks.patch b/ecryptfs-utils-75-nocryptdisks.patch index e48411f..0dabed7 100644 --- a/ecryptfs-utils-75-nocryptdisks.patch +++ b/ecryptfs-utils-75-nocryptdisks.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-106/src/utils/ecryptfs-setup-swap ---- ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks 2015-03-11 16:15:31.000000000 +0100 -+++ ecryptfs-utils-106/src/utils/ecryptfs-setup-swap 2015-03-30 11:07:17.042580187 +0200 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-108/src/utils/ecryptfs-setup-swap +--- ecryptfs-utils-108/src/utils/ecryptfs-setup-swap.nocryptdisks 2015-08-04 17:41:39.000000000 +0200 ++++ ecryptfs-utils-108/src/utils/ecryptfs-setup-swap 2015-08-11 14:43:51.787842611 +0200 @@ -37,23 +37,20 @@ warn() { usage() { echo @@ -27,7 +27,7 @@ diff -up ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs- *) usage ;; -@@ -168,7 +165,6 @@ for swap in $swaps; do +@@ -188,7 +185,6 @@ for swap in $swaps; do # Add fstab entry echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab done @@ -35,7 +35,7 @@ diff -up ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs- if [ "$NO_RELOAD" != 1 ]; then # Turn swap off swapoff -a -@@ -181,3 +177,4 @@ if [ "$NO_RELOAD" != 1 ]; then +@@ -201,3 +197,4 @@ if [ "$NO_RELOAD" != 1 ]; then fi info `gettext "Successfully encrypted swap!"` diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index bdf1d1d..ee321dc 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-104/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.FGZkyg ecryptfs-utils-104/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-104/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.FGZkyg 2014-07-22 16:14:00.424530180 +0200 -+++ ecryptfs-utils-104/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2014-07-22 16:37:53.863680991 +0200 +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 @@ -98,7 +98,7 @@ static int ecryptfs_pkcs11h_deserialize( pkcs11h_data->serialized_id = NULL; } @@ -150,11 +150,9 @@ diff -up ecryptfs-utils-104/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.FGZkyg subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo); -diff -up ecryptfs-utils-104/src/libecryptfs/ecryptfs-stat.c.FGZkyg ecryptfs-utils-104/src/libecryptfs/ecryptfs-stat.c -diff -up ecryptfs-utils-104/src/libecryptfs/key_management.c.FGZkyg ecryptfs-utils-104/src/libecryptfs/key_management.c -diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg 2014-01-23 19:09:48.000000000 +0100 -+++ ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c 2014-07-22 16:40:13.429006708 +0200 +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 @@ -84,9 +84,7 @@ static int wrap_passphrase_if_necessary( stat(wrapped_pw_filename, &s) != 0 && passphrase != NULL && *passphrase != '\0' && @@ -166,7 +164,7 @@ diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg ecryptfs-util syslog(LOG_ERR, "pam_ecryptfs: Error wrapping cleartext password; " "rc = [%d]\n", rc); } return rc; -@@ -324,7 +322,7 @@ static int private_dir(pam_handle_t *pam +@@ -356,7 +354,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"); @@ -175,7 +173,7 @@ diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg ecryptfs-util fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666); if (fd != -1) close(fd); -@@ -485,7 +483,10 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand +@@ -517,7 +515,10 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand char passphrase[ECRYPTFS_MAX_PASSWORD_LENGTH + 1]; /* temp regain uid 0 to drop privs */ @@ -187,7 +185,7 @@ diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg ecryptfs-util /* setgroups() already called */ if (setgid(gid) < 0 || setuid(uid) < 0) goto out_child; -@@ -510,9 +511,9 @@ out_child: +@@ -542,9 +543,9 @@ out_child: free(wrapped_pw_filename); out: @@ -200,11 +198,22 @@ diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.FGZkyg ecryptfs-util outnouid: return rc; -diff -up ecryptfs-utils-104/src/utils/mount.ecryptfs.c.FGZkyg ecryptfs-utils-104/src/utils/mount.ecryptfs.c -diff -up ecryptfs-utils-104/src/utils/mount.ecryptfs_private.c.FGZkyg ecryptfs-utils-104/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-104/src/utils/mount.ecryptfs_private.c.FGZkyg 2014-07-22 16:17:57.372415281 +0200 -+++ ecryptfs-utils-104/src/utils/mount.ecryptfs_private.c 2014-07-22 16:44:17.969827960 +0200 -@@ -710,8 +710,8 @@ int main(int argc, char *argv[]) { +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 +@@ -89,7 +89,7 @@ int main(int argc, char **argv) + int i, c, *pcrsSelected = NULL, numPcrsSelected = 0; + TSS_UUID *uuid; + BYTE wellknown[] = TSS_WELL_KNOWN_SECRET; +- char *tmp_pcrs; ++ int *tmp_pcrs; + + 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[]) { * update mtab for us, and replace the current process. * Do not use the umount.ecryptfs helper (-i). */ @@ -215,14 +224,9 @@ diff -up ecryptfs-utils-104/src/utils/mount.ecryptfs_private.c.FGZkyg ecryptfs-u clearenv(); /* Since we're doing a lazy unmount anyway, just unmount the current -diff -up ecryptfs-utils-104/src/utils/test.c.FGZkyg ecryptfs-utils-104/src/utils/test.c -diff -up ecryptfs-utils-104/tests/kernel/directory-concurrent/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/directory-concurrent/test.c -diff -up ecryptfs-utils-104/tests/kernel/enospc/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/enospc/test.c -diff -up ecryptfs-utils-104/tests/kernel/extend-file-random/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/extend-file-random/test.c -diff -up ecryptfs-utils-104/tests/kernel/file-concurrent/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/file-concurrent/test.c -diff -up ecryptfs-utils-104/tests/kernel/inode-race-stat/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/inode-race-stat/test.c ---- ecryptfs-utils-104/tests/kernel/inode-race-stat/test.c.FGZkyg 2014-07-22 16:37:53.872680948 +0200 -+++ ecryptfs-utils-104/tests/kernel/inode-race-stat/test.c 2014-07-23 13:28:23.053997232 +0200 +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 @@ -364,6 +364,7 @@ abort: if (write(pipe_to[i][1], cmd, 1) != 1) @@ -231,18 +235,3 @@ diff -up ecryptfs-utils-104/tests/kernel/inode-race-stat/test.c.FGZkyg ecryptfs- (void)waitpid(pids[i], &status, 0); (void)close(pipe_to[i][1]); -diff -up ecryptfs-utils-104/tests/kernel/lp-509180/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/lp-509180/test.c -diff -up ecryptfs-utils-104/tests/kernel/trunc-file/test.c.FGZkyg ecryptfs-utils-104/tests/kernel/trunc-file/test.c -diff -up ecryptfs-utils-104/tests/userspace/wrap-unwrap/test.c.FGZkyg ecryptfs-utils-104/tests/userspace/wrap-unwrap/test.c -diff -up ecryptfs-utils-104/src/utils/ecryptfs_generate_tpm_key.c.werror ecryptfs-utils-104/src/utils/ecryptfs_generate_tpm_key.c ---- ecryptfs-utils-104/src/utils/ecryptfs_generate_tpm_key.c.werror 2014-07-23 15:30:36.790862415 +0200 -+++ ecryptfs-utils-104/src/utils/ecryptfs_generate_tpm_key.c 2014-07-23 15:30:36.847862115 +0200 -@@ -89,7 +89,7 @@ int main(int argc, char **argv) - int i, c, *pcrsSelected = NULL, numPcrsSelected = 0; - TSS_UUID *uuid; - BYTE wellknown[] = TSS_WELL_KNOWN_SECRET; -- char *tmp_pcrs; -+ int *tmp_pcrs; - - while (1) { - c = getopt(argc, argv, "p:"); diff --git a/ecryptfs-utils-83-fixsalt.patch b/ecryptfs-utils-83-fixsalt.patch index 01f3e50..bb661d8 100644 --- a/ecryptfs-utils-83-fixsalt.patch +++ b/ecryptfs-utils-83-fixsalt.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c ---- ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt 2009-10-20 20:49:55.000000000 +0200 -+++ ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c 2010-04-14 16:18:43.273398808 +0200 +diff -up ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_passphrase.c +--- ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_passphrase.c 2015-08-11 14:43:52.660840311 +0200 @@ -105,7 +105,7 @@ static int tf_pass_file(struct ecryptfs_ out: free(node->val); diff --git a/ecryptfs-utils-83-splitnss.patch b/ecryptfs-utils-83-splitnss.patch index 421c972..bfde60d 100644 --- a/ecryptfs-utils-83-splitnss.patch +++ b/ecryptfs-utils-83-splitnss.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-103/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-103/src/libecryptfs/key_management.c ---- ecryptfs-utils-103/src/libecryptfs/key_management.c.splitnss 2012-10-03 21:56:16.000000000 +0200 -+++ ecryptfs-utils-103/src/libecryptfs/key_management.c 2013-01-28 17:21:57.036011421 +0100 -@@ -135,28 +135,8 @@ out: +diff -up ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.c +--- ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss 2015-03-26 14:28:59.000000000 +0100 ++++ ecryptfs-utils-108/src/libecryptfs/key_management.c 2015-08-11 14:43:53.489838127 +0200 +@@ -138,28 +138,8 @@ out: } @@ -31,9 +31,9 @@ diff -up ecryptfs-utils-103/src/libecryptfs/key_management.c.splitnss ecryptfs-u int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok, char *auth_tok_sig) { -diff -up ecryptfs-utils-103/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-103/src/libecryptfs/key_management.inc.c ---- ecryptfs-utils-103/src/libecryptfs/key_management.inc.c.splitnss 2013-01-28 17:21:57.036011421 +0100 -+++ ecryptfs-utils-103/src/libecryptfs/key_management.inc.c 2013-01-28 17:21:57.036011421 +0100 +diff -up ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.inc.c +--- ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss 2015-08-11 14:43:53.489838127 +0200 ++++ ecryptfs-utils-108/src/libecryptfs/key_management.inc.c 2015-08-11 14:43:53.489838127 +0200 @@ -0,0 +1,22 @@ +int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig) +{ @@ -57,9 +57,9 @@ diff -up ecryptfs-utils-103/src/libecryptfs/key_management.inc.c.splitnss ecrypt +out: + return rc; +} -diff -up ecryptfs-utils-103/src/utils/Makefile.am.splitnss ecryptfs-utils-103/src/utils/Makefile.am ---- ecryptfs-utils-103/src/utils/Makefile.am.splitnss 2013-01-25 19:09:31.000000000 +0100 -+++ ecryptfs-utils-103/src/utils/Makefile.am 2013-01-28 17:21:57.036011421 +0100 +diff -up ecryptfs-utils-108/src/utils/Makefile.am.splitnss ecryptfs-utils-108/src/utils/Makefile.am +--- ecryptfs-utils-108/src/utils/Makefile.am.splitnss 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/utils/Makefile.am 2015-08-11 14:43:53.489838127 +0200 @@ -39,7 +39,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) umount_ecryptfs_SOURCES = umount.ecryptfs.c @@ -69,9 +69,9 @@ diff -up ecryptfs-utils-103/src/utils/Makefile.am.splitnss ecryptfs-utils-103/sr ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) -diff -up ecryptfs-utils-103/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-103/src/utils/umount.ecryptfs.c ---- ecryptfs-utils-103/src/utils/umount.ecryptfs.c.splitnss 2012-09-25 22:57:16.000000000 +0200 -+++ ecryptfs-utils-103/src/utils/umount.ecryptfs.c 2013-01-28 17:21:57.037011429 +0100 +diff -up ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-108/src/utils/umount.ecryptfs.c +--- ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/utils/umount.ecryptfs.c 2015-08-11 14:43:53.489838127 +0200 @@ -24,7 +24,10 @@ #include #include diff --git a/ecryptfs-utils-84-fixsigness.patch b/ecryptfs-utils-84-fixsigness.patch index 1e5ff27..2e2c20b 100644 --- a/ecryptfs-utils-84-fixsigness.patch +++ b/ecryptfs-utils-84-fixsigness.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c ---- ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness 2012-09-25 22:57:16.000000000 +0200 -+++ ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2013-01-28 17:22:18.711183767 +0100 -@@ -1158,7 +1158,7 @@ static int tf_pkcs11h_key_x509file(struc +diff -up ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c +--- ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsigness 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2015-08-11 14:43:54.331835910 +0200 +@@ -1157,7 +1157,7 @@ static int tf_pkcs11h_key_x509file(struc goto out; } @@ -10,7 +10,7 @@ diff -up ecryptfs-utils-103/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.fixsign syslog(LOG_ERR, "PKCS#11: Cannot read decode certificate"); rc = -EIO; goto out; -@@ -1179,7 +1179,7 @@ static int tf_pkcs11h_key_x509file(struc +@@ -1178,7 +1178,7 @@ static int tf_pkcs11h_key_x509file(struc */ p = subgraph_key_ctx->pkcs11h_data.certificate_blob; diff --git a/ecryptfs-utils-86-manpage.patch b/ecryptfs-utils-86-manpage.patch index d1ef9b9..8ee89a4 100644 --- a/ecryptfs-utils-86-manpage.patch +++ b/ecryptfs-utils-86-manpage.patch @@ -1,6 +1,18 @@ -diff -up ecryptfs-utils-106/doc/manpage/ecryptfs.7.manfix ecryptfs-utils-106/doc/manpage/ecryptfs.7 ---- ecryptfs-utils-106/doc/manpage/ecryptfs.7.manfix 2015-02-10 17:59:34.000000000 +0100 -+++ ecryptfs-utils-106/doc/manpage/ecryptfs.7 2015-03-30 11:08:58.583678996 +0200 +diff -up ecryptfs-utils-108/doc/manpage/ecryptfs-rewrite-file.1.manfix ecryptfs-utils-108/doc/manpage/ecryptfs-rewrite-file.1 +--- ecryptfs-utils-108/doc/manpage/ecryptfs-rewrite-file.1.manfix 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/doc/manpage/ecryptfs-rewrite-file.1 2015-08-11 14:43:55.128833810 +0200 +@@ -14,7 +14,7 @@ This script may be combined with \fBfind + ecryptfs-umount-private + sync + +-It is advised that this script is executed in runlevel 1 or 3, to avoid simultanteous writes and race conditions with targeted files. ++It is advised that this script is executed in runlevel 1 or 3, to avoid simultaneous writes and race conditions with targeted files. + + \fBUSING THIS SCRIPT WHILE GNOME, KDE, OR OTHER APPLICATIONS ARE RUNNING MAY CAUSE DATA LOSS.\fP + +diff -up ecryptfs-utils-108/doc/manpage/ecryptfs.7.manfix ecryptfs-utils-108/doc/manpage/ecryptfs.7 +--- ecryptfs-utils-108/doc/manpage/ecryptfs.7.manfix 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/doc/manpage/ecryptfs.7 2015-08-11 14:43:55.128833810 +0200 @@ -1,6 +1,6 @@ .TH ecryptfs 7 2009-03-24 ecryptfs-utils "eCryptfs" .SH NAME @@ -27,15 +39,3 @@ diff -up ecryptfs-utils-106/doc/manpage/ecryptfs.7.manfix ecryptfs-utils-106/doc .TP .B openssl_passwd_fd=(file descriptor) The password is specified through the specified file descriptor. -diff -up ecryptfs-utils-106/doc/manpage/ecryptfs-rewrite-file.1.manfix ecryptfs-utils-106/doc/manpage/ecryptfs-rewrite-file.1 ---- ecryptfs-utils-106/doc/manpage/ecryptfs-rewrite-file.1.manfix 2015-02-10 17:59:34.000000000 +0100 -+++ ecryptfs-utils-106/doc/manpage/ecryptfs-rewrite-file.1 2015-03-30 11:07:51.019950149 +0200 -@@ -14,7 +14,7 @@ This script may be combined with \fBfind - ecryptfs-umount-private - sync - --It is advised that this script is executed in runlevel 1 or 3, to avoid simultanteous writes and race conditions with targeted files. -+It is advised that this script is executed in runlevel 1 or 3, to avoid simultaneous writes and race conditions with targeted files. - - \fBUSING THIS SCRIPT WHILE GNOME, KDE, OR OTHER APPLICATIONS ARE RUNNING MAY CAUSE DATA LOSS.\fP - diff --git a/ecryptfs-utils-87-authconfig.patch b/ecryptfs-utils-87-authconfig.patch index 4ac45c6..3476b91 100644 --- a/ecryptfs-utils-87-authconfig.patch +++ b/ecryptfs-utils-87-authconfig.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-87/src/utils/ecryptfs-migrate-home.authconfig ecryptfs-utils-87/src/utils/ecryptfs-migrate-home ---- ecryptfs-utils-87/src/utils/ecryptfs-migrate-home.authconfig 2011-06-09 13:25:11.346617817 +0200 -+++ ecryptfs-utils-87/src/utils/ecryptfs-migrate-home 2011-06-09 13:25:39.288769200 +0200 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-migrate-home.authconfig ecryptfs-utils-108/src/utils/ecryptfs-migrate-home +--- ecryptfs-utils-108/src/utils/ecryptfs-migrate-home.authconfig 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/utils/ecryptfs-migrate-home 2015-08-11 14:43:56.758829517 +0200 @@ -98,6 +98,11 @@ sanity_check () { if ! which rsync >/dev/null 2>&1; then error "Please install the rsync package." diff --git a/ecryptfs-utils-87-autoload.patch b/ecryptfs-utils-87-autoload.patch index bd0413a..26cbdf0 100644 --- a/ecryptfs-utils-87-autoload.patch +++ b/ecryptfs-utils-87-autoload.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-103/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-103/src/utils/ecryptfs-mount-private ---- ecryptfs-utils-103/src/utils/ecryptfs-mount-private.autoload 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-103/src/utils/ecryptfs-mount-private 2013-01-28 16:41:59.164861848 +0100 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-108/src/utils/ecryptfs-mount-private +--- ecryptfs-utils-108/src/utils/ecryptfs-mount-private.autoload 2015-02-10 17:59:34.000000000 +0100 ++++ ecryptfs-utils-108/src/utils/ecryptfs-mount-private 2015-08-11 14:43:55.946831655 +0200 @@ -33,6 +33,9 @@ if /sbin/mount.ecryptfs_private >/dev/nu exit 0 fi @@ -11,9 +11,9 @@ diff -up ecryptfs-utils-103/src/utils/ecryptfs-mount-private.autoload ecryptfs-u # Otherwise, interactively prompt for the user's password if [ -f "$WRAPPED_PASSPHRASE_FILE" -a -f "$MOUNT_PASSPHRASE_SIG_FILE" ]; then tries=0 -diff -up ecryptfs-utils-103/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-103/src/utils/ecryptfs-setup-private ---- ecryptfs-utils-103/src/utils/ecryptfs-setup-private.autoload 2012-05-18 21:06:17.000000000 +0200 -+++ ecryptfs-utils-103/src/utils/ecryptfs-setup-private 2013-01-28 16:41:59.164861848 +0100 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-108/src/utils/ecryptfs-setup-private +--- ecryptfs-utils-108/src/utils/ecryptfs-setup-private.autoload 2015-02-10 20:10:13.000000000 +0100 ++++ ecryptfs-utils-108/src/utils/ecryptfs-setup-private 2015-08-11 14:43:55.946831655 +0200 @@ -101,6 +101,7 @@ random_passphrase () { } @@ -22,10 +22,10 @@ diff -up ecryptfs-utils-103/src/utils/ecryptfs-setup-private.autoload ecryptfs-u version=$(cat /sys/fs/ecryptfs/version 2>/dev/null) [ -z "$version" ] && error "$(gettext 'Cannot get ecryptfs version, ecryptfs kernel module not loaded?')" [ $(($version & 0x100)) -eq 0 ] && return 1 -diff -up ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c.autoload 2012-12-12 23:13:43.000000000 +0100 -+++ ecryptfs-utils-103/src/utils/mount.ecryptfs_private.c 2013-01-28 17:17:26.714859379 +0100 -@@ -509,6 +509,13 @@ int main(int argc, char *argv[]) { +diff -up ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c.autoload 2015-08-05 23:37:17.000000000 +0200 ++++ ecryptfs-utils-108/src/utils/mount.ecryptfs_private.c 2015-08-11 14:43:55.946831655 +0200 +@@ -577,6 +577,13 @@ int main(int argc, char *argv[]) { char **sigs; FILE *fh_counter = NULL; diff --git a/ecryptfs-utils-87-fixconst.patch b/ecryptfs-utils-87-fixconst.patch index c5d027e..21c4c5a 100644 --- a/ecryptfs-utils-87-fixconst.patch +++ b/ecryptfs-utils-87-fixconst.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/include/ecryptfs.h.fixconst ecryptfs-utils-106/src/include/ecryptfs.h ---- ecryptfs-utils-106/src/include/ecryptfs.h.fixconst 2015-03-30 11:35:35.478375245 +0200 -+++ ecryptfs-utils-106/src/include/ecryptfs.h 2015-03-30 11:38:18.400269788 +0200 +diff -up ecryptfs-utils-108/src/include/ecryptfs.h.fixconst ecryptfs-utils-108/src/include/ecryptfs.h +--- ecryptfs-utils-108/src/include/ecryptfs.h.fixconst 2015-08-11 14:44:01.791816259 +0200 ++++ ecryptfs-utils-108/src/include/ecryptfs.h 2015-08-11 14:44:01.794816251 +0200 @@ -479,8 +479,8 @@ int ecryptfs_eval_decision_graph(struct struct val_node **head, struct param_node *root_node, @@ -60,9 +60,9 @@ diff -up ecryptfs-utils-106/src/include/ecryptfs.h.fixconst ecryptfs-utils-106/s int ecryptfs_private_is_mounted(char *dev, char *mnt, char *sig, int mounting); #endif -diff -up ecryptfs-utils-106/src/libecryptfs/key_management.c.fixconst ecryptfs-utils-106/src/libecryptfs/key_management.c ---- ecryptfs-utils-106/src/libecryptfs/key_management.c.fixconst 2015-03-30 11:35:35.422376313 +0200 -+++ ecryptfs-utils-106/src/libecryptfs/key_management.c 2015-03-30 11:39:44.026637663 +0200 +diff -up ecryptfs-utils-108/src/libecryptfs/key_management.c.fixconst ecryptfs-utils-108/src/libecryptfs/key_management.c +--- ecryptfs-utils-108/src/libecryptfs/key_management.c.fixconst 2015-08-11 14:44:01.777816296 +0200 ++++ ecryptfs-utils-108/src/libecryptfs/key_management.c 2015-08-11 14:44:01.795816249 +0200 @@ -55,7 +55,7 @@ */ int ecryptfs_generate_passphrase_auth_tok(struct ecryptfs_auth_tok **auth_tok, @@ -127,9 +127,9 @@ diff -up ecryptfs-utils-106/src/libecryptfs/key_management.c.fixconst ecryptfs-u { char decrypted_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + 1] ; int rc = 0; -diff -up ecryptfs-utils-106/src/libecryptfs/main.c.fixconst ecryptfs-utils-106/src/libecryptfs/main.c ---- ecryptfs-utils-106/src/libecryptfs/main.c.fixconst 2015-03-30 11:35:35.479375226 +0200 -+++ ecryptfs-utils-106/src/libecryptfs/main.c 2015-03-30 11:35:35.492374978 +0200 +diff -up ecryptfs-utils-108/src/libecryptfs/main.c.fixconst ecryptfs-utils-108/src/libecryptfs/main.c +--- ecryptfs-utils-108/src/libecryptfs/main.c.fixconst 2015-08-11 14:44:01.791816259 +0200 ++++ ecryptfs-utils-108/src/libecryptfs/main.c 2015-08-11 14:44:01.795816249 +0200 @@ -92,7 +92,7 @@ out: /* Read ecryptfs private mount from file * Allocate and return a string @@ -148,7 +148,7 @@ diff -up ecryptfs-utils-106/src/libecryptfs/main.c.fixconst ecryptfs-utils-106/s { char salt_and_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + ECRYPTFS_SALT_SIZE]; -@@ -256,7 +256,7 @@ generate_passphrase_sig(char *passphrase +@@ -257,7 +257,7 @@ generate_passphrase_sig(char *passphrase */ int generate_payload(struct ecryptfs_auth_tok *auth_tok, char *passphrase_sig, diff --git a/ecryptfs-utils-87-fixexecgid.patch b/ecryptfs-utils-87-fixexecgid.patch index 7b29841..e47c56a 100644 --- a/ecryptfs-utils-87-fixexecgid.patch +++ b/ecryptfs-utils-87-fixexecgid.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid 2015-03-30 11:13:48.419194024 +0200 -+++ ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c 2015-03-30 11:16:44.434863028 +0200 +diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.fixexecgid 2015-08-11 14:43:59.298822826 +0200 ++++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:43:59.299822823 +0200 @@ -365,8 +365,10 @@ static int private_dir(pam_handle_t *pam _exit(0); } diff --git a/ecryptfs-utils-87-fixpamfork.patch b/ecryptfs-utils-87-fixpamfork.patch index 1c415fe..b498aa7 100644 --- a/ecryptfs-utils-87-fixpamfork.patch +++ b/ecryptfs-utils-87-fixpamfork.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork 2015-03-30 11:09:51.498677610 +0200 -+++ ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c 2015-03-30 11:13:32.209500784 +0200 +diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork 2015-08-11 14:43:58.438825091 +0200 ++++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:43:58.439825089 +0200 @@ -253,7 +253,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h } out_child: @@ -53,13 +53,13 @@ diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.fixpamfork ecryptfs- - exit(-1); + _exit(-1); execl("/sbin/umount.ecryptfs_private", - "umount.ecryptfs_private", NULL); + "umount.ecryptfs_private", "-d", NULL); - exit(1); + syslog(LOG_ERR, "unable to execute umount.ecryptfs_private : %m"); -+ _exit(-1); ++ _exit(1); } - exit(1); -+ _exit(-1); ++ _exit(1); } else { waitpid(pid, &rc, 0); } diff --git a/ecryptfs-utils-87-nozombies.patch b/ecryptfs-utils-87-nozombies.patch index 88be4c9..2d4ea3f 100644 --- a/ecryptfs-utils-87-nozombies.patch +++ b/ecryptfs-utils-87-nozombies.patch @@ -1,7 +1,7 @@ -diff -up ecryptfs-utils-104/src/include/ecryptfs.h.bNmPrV ecryptfs-utils-104/src/include/ecryptfs.h ---- ecryptfs-utils-104/src/include/ecryptfs.h.bNmPrV 2014-01-23 19:09:48.000000000 +0100 -+++ ecryptfs-utils-104/src/include/ecryptfs.h 2014-07-23 13:31:32.329095017 +0200 -@@ -530,10 +530,6 @@ int ecryptfs_validate_keyring(void); +diff -up ecryptfs-utils-108/src/include/ecryptfs.h.nozombies ecryptfs-utils-108/src/include/ecryptfs.h +--- ecryptfs-utils-108/src/include/ecryptfs.h.nozombies 2015-03-11 16:07:01.000000000 +0100 ++++ ecryptfs-utils-108/src/include/ecryptfs.h 2015-08-11 14:44:00.122820656 +0200 +@@ -532,10 +532,6 @@ int ecryptfs_validate_keyring(void); #define ECRYPTFS_SHM_KEY 0x3c81b7f5 #define ECRYPTFS_SEM_KEY 0x3c81b7f6 #define ECRYPTFS_SHM_SIZE 4096 @@ -12,10 +12,10 @@ diff -up ecryptfs-utils-104/src/include/ecryptfs.h.bNmPrV ecryptfs-utils-104/src int ecryptfs_build_linear_subgraph_from_nvp(struct transition_node **trans_node, struct ecryptfs_key_mod *key_mod); int ecryptfs_build_linear_subgraph(struct transition_node **trans_node, -diff -up ecryptfs-utils-104/src/libecryptfs/main.c.bNmPrV ecryptfs-utils-104/src/libecryptfs/main.c ---- ecryptfs-utils-104/src/libecryptfs/main.c.bNmPrV 2014-07-23 13:31:32.331095008 +0200 -+++ ecryptfs-utils-104/src/libecryptfs/main.c 2014-07-23 13:33:09.872630059 +0200 -@@ -383,495 +383,6 @@ out: +diff -up ecryptfs-utils-108/src/libecryptfs/main.c.nozombies ecryptfs-utils-108/src/libecryptfs/main.c +--- ecryptfs-utils-108/src/libecryptfs/main.c.nozombies 2015-03-26 14:28:59.000000000 +0100 ++++ ecryptfs-utils-108/src/libecryptfs/main.c 2015-08-11 14:44:00.122820656 +0200 +@@ -384,495 +384,6 @@ out: return rc; } @@ -511,10 +511,10 @@ diff -up ecryptfs-utils-104/src/libecryptfs/main.c.bNmPrV ecryptfs-utils-104/src static struct ecryptfs_ctx_ops ctx_ops; struct ecryptfs_ctx_ops *cryptfs_get_ctx_opts (void) -diff -up ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.bNmPrV ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c.bNmPrV 2014-07-23 13:31:32.310095109 +0200 -+++ ecryptfs-utils-104/src/pam_ecryptfs/pam_ecryptfs.c 2014-07-23 13:31:32.332095003 +0200 -@@ -214,11 +214,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h +diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.nozombies ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.nozombies 2015-08-11 14:44:00.120820661 +0200 ++++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:44:00.122820656 +0200 +@@ -246,11 +246,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h syslog(LOG_ERR, "pam_ecryptfs: Error adding passphrase key token to user session keyring; rc = [%ld]\n", rc); goto out_child; } diff --git a/ecryptfs-utils-87-pamdata.patch b/ecryptfs-utils-87-pamdata.patch index 9e294ca..ec4dd2b 100644 --- a/ecryptfs-utils-87-pamdata.patch +++ b/ecryptfs-utils-87-pamdata.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.pamdata ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.pamdata 2015-03-30 12:35:15.001400416 +0200 -+++ ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c 2015-03-30 12:35:27.938155898 +0200 +diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.pamdata ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.pamdata 2015-08-11 14:44:00.963818440 +0200 ++++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:44:00.965818435 +0200 @@ -46,6 +46,26 @@ #define PRIVATE_DIR "Private" diff --git a/ecryptfs-utils-87-syslog.patch b/ecryptfs-utils-87-syslog.patch index 6fe2dfd..be563bc 100644 --- a/ecryptfs-utils-87-syslog.patch +++ b/ecryptfs-utils-87-syslog.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-106/src/include/ecryptfs.h.syslog ecryptfs-utils-106/src/include/ecryptfs.h ---- ecryptfs-utils-106/src/include/ecryptfs.h.syslog 2015-03-30 11:44:14.242490372 +0200 -+++ ecryptfs-utils-106/src/include/ecryptfs.h 2015-03-30 11:44:14.249490239 +0200 +diff -up ecryptfs-utils-108/src/include/ecryptfs.h.syslog ecryptfs-utils-108/src/include/ecryptfs.h +--- ecryptfs-utils-108/src/include/ecryptfs.h.syslog 2015-08-11 14:44:02.641814020 +0200 ++++ ecryptfs-utils-108/src/include/ecryptfs.h 2015-08-11 14:44:02.643814015 +0200 @@ -137,7 +137,7 @@ #define ECRYPTFS_TAG_67_PACKET 0x43 @@ -10,9 +10,9 @@ diff -up ecryptfs-utils-106/src/include/ecryptfs.h.syslog ecryptfs-utils-106/src #define ECRYPTFS_MAX_NUM_CIPHERS 64 #define ECRYPTFS_ECHO_ON 1 -diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.syslog 2015-03-30 11:44:14.235490506 +0200 -+++ ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c 2015-03-30 11:47:23.825882697 +0200 +diff -up ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c.syslog 2015-08-11 14:44:02.640814023 +0200 ++++ ecryptfs-utils-108/src/pam_ecryptfs/pam_ecryptfs.c 2015-08-11 14:44:02.643814015 +0200 @@ -93,7 +93,7 @@ static int wrap_passphrase_if_necessary( rc = asprintf(&unwrapped_pw_filename, "/dev/shm/.ecryptfs-%s", username); @@ -163,12 +163,12 @@ diff -up ecryptfs-utils-106/src/pam_ecryptfs/pam_ecryptfs.c.syslog ecryptfs-util @@ -327,7 +327,7 @@ static int private_dir(pam_handle_t *pam _exit(-1); execl("/sbin/umount.ecryptfs_private", - "umount.ecryptfs_private", NULL); + "umount.ecryptfs_private", "-d", NULL); - syslog(LOG_ERR, "unable to execute umount.ecryptfs_private : %m"); + ecryptfs_syslog(LOG_ERR, "unable to execute umount.ecryptfs_private : %m"); - _exit(-1); + _exit(1); } - _exit(-1); + _exit(1); @@ -362,24 +362,24 @@ static int fill_keyring(pam_handle_t *pa if ((rc=pam_get_data(pamh, ECRYPTFS_PAM_DATA, (const void **)&epd)) != PAM_SUCCESS) diff --git a/ecryptfs-utils-96-groupcheck.patch b/ecryptfs-utils-96-groupcheck.patch index ebbd6f0..9aa53bc 100644 --- a/ecryptfs-utils-96-groupcheck.patch +++ b/ecryptfs-utils-96-groupcheck.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-96/src/utils/ecryptfs-mount-private.groupcheck ecryptfs-utils-96/src/utils/ecryptfs-mount-private ---- ecryptfs-utils-96/src/utils/ecryptfs-mount-private.groupcheck 2012-04-16 14:42:56.386317997 +0200 -+++ ecryptfs-utils-96/src/utils/ecryptfs-mount-private 2012-04-16 14:49:13.637431764 +0200 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-mount-private.groupcheck ecryptfs-utils-108/src/utils/ecryptfs-mount-private +--- ecryptfs-utils-108/src/utils/ecryptfs-mount-private.groupcheck 2015-08-11 14:44:03.505811744 +0200 ++++ ecryptfs-utils-108/src/utils/ecryptfs-mount-private 2015-08-11 14:44:03.524811694 +0200 @@ -69,7 +69,16 @@ if [ -f "$WRAPPED_PASSPHRASE_FILE" -a -f echo `gettext "ERROR:"` `gettext "Too many incorrect password attempts, exiting"` exit 1 diff --git a/ecryptfs-utils-99-selinux.patch b/ecryptfs-utils-99-selinux.patch index cdad277..884d728 100644 --- a/ecryptfs-utils-99-selinux.patch +++ b/ecryptfs-utils-99-selinux.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-103/src/utils/ecryptfs-migrate-home.selinux ecryptfs-utils-103/src/utils/ecryptfs-migrate-home ---- ecryptfs-utils-103/src/utils/ecryptfs-migrate-home.selinux 2013-11-13 13:29:25.676878706 +0100 -+++ ecryptfs-utils-103/src/utils/ecryptfs-migrate-home 2013-11-13 13:30:16.557552704 +0100 +diff -up ecryptfs-utils-108/src/utils/ecryptfs-migrate-home.selinux ecryptfs-utils-108/src/utils/ecryptfs-migrate-home +--- ecryptfs-utils-108/src/utils/ecryptfs-migrate-home.selinux 2015-08-11 14:44:04.362809487 +0200 ++++ ecryptfs-utils-108/src/utils/ecryptfs-migrate-home 2015-08-11 14:44:04.377809448 +0200 @@ -136,6 +136,7 @@ encrypt_dir () { error "Cannot proceed." fi diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 431e7c2..3734d63 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,8 +4,8 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 106 -Release: 2%{?dist} +Version: 108 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Tue Aug 11 2015 Michal Hlavinka - 108-1 +- ecryptfs-utils updated to 108 + * Wed Jun 17 2015 Fedora Release Engineering - 106-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -496,7 +499,7 @@ rm -rf $RPM_BUILD_ROOT - move libs from /usr/lib to /lib (#486139) - fix symlinks created by ecryptfs-setup-private (#486146) -* Mon Feb 24 2009 Michal Hlavinka 71-1 +* Tue Feb 24 2009 Michal Hlavinka 71-1 - updated to 71 - remove .la files