rpms/ecryptfs-utils/F-11 .cvsignore, 1.29, 1.30 ecryptfs-utils-75-werror.patch, 1.5, 1.6 ecryptfs-utils.spec, 1.53, 1.54 sources, 1.32, 1.33

Michal Hlavinka mhlavink at fedoraproject.org
Thu Feb 18 10:33:21 UTC 2010 

Author: mhlavink

Update of /cvs/pkgs/rpms/ecryptfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18426

Modified Files:
	.cvsignore ecryptfs-utils-75-werror.patch ecryptfs-utils.spec 
	sources 
Log Message:
* Wed Jan 27 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-1
- updated to v. 83



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	11 Nov 2009 10:56:19 -0000	1.29
+++ .cvsignore	18 Feb 2010 10:33:21 -0000	1.30
@@ -1,2 +1,2 @@
-ecryptfs-utils_82.orig.tar.gz
+ecryptfs-utils_83.orig.tar.gz
 ecryptfs-mount-private.png

ecryptfs-utils-75-werror.patch:
 libecryptfs/ecryptfs-stat.c |    2 +-
 pam_ecryptfs/pam_ecryptfs.c |   35 +++--------------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ecryptfs-utils-75-werror.patch	21 Jul 2009 07:19:47 -0000	1.5
+++ ecryptfs-utils-75-werror.patch	18 Feb 2010 10:33:21 -0000	1.6
@@ -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/libe
  		       "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_
  /* 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_
  
  	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_
  				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]; "


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ecryptfs-utils.spec	11 Nov 2009 10:56:20 -0000	1.53
+++ ecryptfs-utils.spec	18 Feb 2010 10:33:21 -0000	1.54
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 82
+Version: 83
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -27,7 +27,7 @@ Patch9: ecryptfs-utils-75-workaround5032
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel nss-devel desktop-file-utils
+BuildRequires: trousers-devel nss-devel desktop-file-utils intltool
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -86,6 +86,8 @@ printf "Encoding=UTF-8\n" >>$RPM_BUILD_R
 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
@@ -96,6 +98,8 @@ touch -r src/desktop/ecryptfs-setup-priv
      $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
 
@@ -106,7 +110,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
@@ -123,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-wrap-passphrase
 %{_bindir}/ecryptfs-add-passphrase
 %{_bindir}/ecryptfs-generate-tpm-key
+%{_bindir}/ecryptfs-migrate-home
 %{_bindir}/ecryptfs-mount-private
 %{_bindir}/ecryptfs-setup-private
 %{_bindir}/ecryptfs-setup-swap
@@ -177,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Wed Jan 27 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-1
+- updated to v. 83
+
 * Wed Nov 11 2009 Michal Hlavinka <mhlavink at redhat.com> - 82-1
 - updated to 82
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	11 Nov 2009 10:56:20 -0000	1.32
+++ sources	18 Feb 2010 10:33:21 -0000	1.33
@@ -1,2 +1,2 @@
-3f07853dac0cb97b56d6dcb11280b785  ecryptfs-utils_82.orig.tar.gz
+1c97d96437d62921744647d4157a8f3e  ecryptfs-utils_83.orig.tar.gz
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png

More information about the scm-commits mailing list