diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch index a2da446..549a428 100644 --- a/ecryptfs-utils-75-werror.patch +++ b/ecryptfs-utils-75-werror.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c ---- ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c.werror 2009-07-17 01:24:18.000000000 +0200 -+++ ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c 2009-07-21 08:10:43.516946733 +0200 +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-02-18 10:40:45.447667184 +0100 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES @@ -10,10 +10,10 @@ diff -up ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs- "bytes; there are only [%zu] bytes\n", __FUNCTION__, (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES -diff -up ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c ---- ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-07-17 01:24:18.000000000 +0200 -+++ ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c 2009-07-21 08:10:07.068947047 +0200 -@@ -42,31 +42,6 @@ +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-02-18 10:41:48.792416776 +0100 +@@ -43,31 +43,6 @@ #define PRIVATE_DIR "Private" @@ -45,7 +45,25 @@ diff -up ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs- /* returns: 0 for pam automounting not set, 1 for set, <0 for error */ static int ecryptfs_pam_automount_set(const char *homedir) { -@@ -249,8 +224,6 @@ static int private_dir(pam_handle_t *pam +@@ -87,7 +62,7 @@ out: + return rc; + } + +-static int wrap_passphrase_if_necessary(char *username, uid_t uid, char *wrapped_pw_filename, char *passphrase, char *salt) ++static int wrap_passphrase_if_necessary(const char *username, uid_t uid, char *wrapped_pw_filename, char *passphrase, char *salt) + { + char *unwrapped_pw_filename = NULL; + struct stat s; +@@ -198,8 +173,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h + if ((argc == 1) + && (memcmp(argv[0], "unwrap\0", 7) == 0)) { + char *wrapped_pw_filename; +- char *unwrapped_pw_filename; +- struct stat s; + + rc = asprintf( + &wrapped_pw_filename, "%s/.ecryptfs/%s", +@@ -291,8 +264,6 @@ static int private_dir(pam_handle_t *pam char *autoumount = "auto-umount"; struct stat s; pid_t pid; @@ -54,7 +72,7 @@ diff -up ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs- if ((pwd = fetch_pwd(pamh)) == NULL) { /* fetch_pwd() logged a message */ -@@ -297,7 +270,7 @@ static int private_dir(pam_handle_t *pam +@@ -339,7 +310,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"); @@ -63,7 +81,7 @@ diff -up ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs- fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666); close(fd); } -@@ -390,7 +363,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand +@@ -428,7 +399,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand } } else { syslog(LOG_ERR, "Error getting passwd info for user [%s]; " diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index e3255c6..bb8a556 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,8 +4,8 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 82 -Release: 2%{?dist} +Version: 83 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -79,6 +79,8 @@ printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-p printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-setup-private.desktop chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop @@ -89,6 +91,8 @@ touch -r src/desktop/ecryptfs-setup-private.desktop \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase +%find_lang %{name} + %pre groupadd -r -f ecryptfs @@ -99,7 +103,7 @@ groupadd -r -f ecryptfs %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING AUTHORS NEWS THANKS %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt @@ -108,19 +112,20 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/umount.ecryptfs %attr(4750,root,ecryptfs) %{_sbindir}/mount.ecryptfs_private %{_sbindir}/umount.ecryptfs_private -%{_bindir}/ecryptfs-manager -%{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring -%{_bindir}/ecryptfs-rewrap-passphrase -%{_bindir}/ecryptfs-rewrite-file -%{_bindir}/ecryptfs-unwrap-passphrase -%{_bindir}/ecryptfs-wrap-passphrase %{_bindir}/ecryptfs-add-passphrase %{_bindir}/ecryptfs-generate-tpm-key +%{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring +%{_bindir}/ecryptfs-manager +%{_bindir}/ecryptfs-migrate-home %{_bindir}/ecryptfs-mount-private +%{_bindir}/ecryptfs-rewrap-passphrase +%{_bindir}/ecryptfs-rewrite-file %{_bindir}/ecryptfs-setup-private %{_bindir}/ecryptfs-setup-swap -%{_bindir}/ecryptfs-umount-private %{_bindir}/ecryptfs-stat +%{_bindir}/ecryptfs-umount-private +%{_bindir}/ecryptfs-unwrap-passphrase +%{_bindir}/ecryptfs-wrap-passphrase %{_bindir}/ecryptfsd %{_libdir}/ecryptfs %{_libdir}/libecryptfs.so.* @@ -169,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Wed Jan 27 2010 Michal Hlavinka - 83-1 +- updated to v. 83 + * Wed Jan 27 2010 Michal Hlavinka - 82-2 - better fix for (#486139)