rpms/ecryptfs-utils/devel .cvsignore, 1.26, 1.27 ecryptfs-utils-75-werror.patch, 1.1, 1.2 ecryptfs-utils.spec, 1.46, 1.47 sources, 1.27, 1.28 ecryptfs-utils-74-group.patch, 1.1, NONE ecryptfs-utils-75-blkid.patch, 1.1, NONE

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29671

Modified Files:
	.cvsignore ecryptfs-utils-75-werror.patch ecryptfs-utils.spec 
	sources 
Removed Files:
	ecryptfs-utils-74-group.patch ecryptfs-utils-75-blkid.patch 
Log Message:
updated to 76



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	21 May 2009 09:42:20 -0000	1.26
+++ .cvsignore	20 Jul 2009 13:25:26 -0000	1.27
@@ -1,2 +1,2 @@
-ecryptfs-utils_75.orig.tar.gz
+ecryptfs-utils_76.orig.tar.gz
 ecryptfs-mount-private.png

ecryptfs-utils-75-werror.patch:
 pam_ecryptfs.c |   31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-werror.patch	4 May 2009 17:24:51 -0000	1.1
+++ ecryptfs-utils-75-werror.patch	20 Jul 2009 13:25:26 -0000	1.2
@@ -1,30 +1,62 @@
-diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c
---- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror	2009-05-01 00:53:13.000000000 +0200
-+++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-04 17:49:49.940220924 +0200
-@@ -18,6 +18,7 @@
-  * 02111-1307, USA.
-  */
+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-20 15:17:30.013884686 +0200
++++ ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c	2009-07-20 15:19:17.111071710 +0200
+@@ -42,31 +42,6 @@
  
-+#include "config.h"
- #include <errno.h>
- #ifdef ENABLE_NSS
- #include <nss.h>
-@@ -39,7 +40,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pwd.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
+ #define PRIVATE_DIR "Private"
  
- #ifndef ENOKEY
-diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c
---- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror	2009-05-04 17:50:33.587240171 +0200
-+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-04 17:50:33.615345763 +0200
-@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
- 	char *wrapping_passphrase;
- 	char salt[ECRYPTFS_SALT_SIZE];
- 	char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
--	struct passwd *pwd;
- 	int rc = 0;
+-static void error(const char *msg)
+-{
+-	syslog(LOG_ERR, "errno = [%i]; strerror = [%m]\n", errno);
+-	switch (errno) {
+-	case ENOKEY:
+-		syslog(LOG_ERR, "%s: Requested key not available\n", msg);
+-		return;
+-
+-	case EKEYEXPIRED:
+-		syslog(LOG_ERR, "%s: Key has expired\n", msg);
+-		return;
+-
+-	case EKEYREVOKED:
+-		syslog(LOG_ERR, "%s: Key has been revoked\n", msg);
+-		return;
+-
+-	case EKEYREJECTED:
+-		syslog(LOG_ERR, "%s: Key was rejected by service\n", msg);
+-		return;
+-	default:
+-		syslog(LOG_ERR, "%s: Unknown key error\n", msg);
+-		return;
+-	}
+-}
+-
+ /* 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
+ 	char *autoumount = "auto-umount";
+ 	struct stat s;
+ 	pid_t pid;
+-	struct utmp *u;
+-	int count = 0;
  
- 	if (argc == 1) {
+ 	if ((pwd = fetch_pwd(pamh)) == NULL) {
+ 		/* fetch_pwd() logged a message */
+@@ -297,7 +270,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");
+-				symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
++				rc=symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
+ 				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
+ 		}
+ 	} else {
+ 		syslog(LOG_ERR, "Error getting passwd info for user [%s]; "
+-		       "rc = [%ld]\n", username, rc);
++		       "rc = [%d]\n", username, rc);
+ 		goto out;
+ 	}
+ 	saved_uid = geteuid();


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ecryptfs-utils.spec	21 May 2009 09:53:33 -0000	1.46
+++ ecryptfs-utils.spec	20 Jul 2009 13:25:26 -0000	1.47
@@ -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: 75
+Version: 76
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -14,17 +14,10 @@ Source1: ecryptfs-mount-private.png
 #fix wrong Makefile for umount.ecryptfs
 Patch2: ecryptfs-utils-74-build.patch
 
-#restrict suid mount.ecryptfs_private to ecryptfs group only
-#required for ecryptfs-utils <=75
-Patch3: ecryptfs-utils-74-group.patch
-
 #allow building with -Werror
 #required for ecryptfs-utils <= 75
 Patch4: ecryptfs-utils-75-werror.patch
 
-#taken from upstream, required for ecryptfs-utils <= 75, rhbz#500820
-Patch5: ecryptfs-utils-75-blkid.patch
-
 #rhbz#500829
 Patch6: ecryptfs-utils-75-nocryptdisks.patch
 
@@ -62,14 +55,13 @@ applications written in the Python progr
 the interface supplied by the ecryptfs-utils library.
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}.orig
 %patch2 -p1 -b .build
-%patch3 -p1 -b .group
 %patch4 -p1 -b .werror
-%patch5 -p0 -b .blkid
 %patch6 -p0 -b .nocryptdisks
 
 %build
+autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
 %configure --disable-rpath --enable-tspi --enable-nss --enable-static
 make clean
@@ -185,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Jul 20 2009 Michal Hlavinka <mhlavink at redhat.com> 76-1
+- updated to 76
+
 * Thu May 21 2009 Michal Hlavinka <mhlavink at redhat.com> 75-1
 - removed executable permission from ecryptfs-dot-private (#500817)
 - require cryptsetup-luks for encrypted swap (#500824)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	21 May 2009 09:42:21 -0000	1.27
+++ sources	20 Jul 2009 13:25:26 -0000	1.28
@@ -1,2 +1,2 @@
-2c4e8be38d1ea8cadd9f870f15430f07  ecryptfs-utils_75.orig.tar.gz
+0e6a58a0730838dc832ecd8bd9e0c463  ecryptfs-utils_76.orig.tar.gz
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png


--- ecryptfs-utils-74-group.patch DELETED ---


--- ecryptfs-utils-75-blkid.patch DELETED ---