rpms/ecryptfs-utils/F-11 .cvsignore, 1.24, 1.25 ecryptfs-utils-75-werror.patch, 1.4, 1.5 ecryptfs-utils.spec, 1.48, 1.49 sources, 1.27, 1.28

[Michal Hlavinka]

Author: mhlavink

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	21 Mar 2009 07:30:12 -0000	1.24
+++ .cvsignore	21 Jul 2009 07:19:47 -0000	1.25
@@ -1 +1,2 @@
-ecryptfs-utils_73.orig.tar.gz
+ecryptfs-utils_76.orig.tar.gz
+ecryptfs-mount-private.png

ecryptfs-utils-75-werror.patch:
 libecryptfs/ecryptfs-stat.c |    2 +-
 pam_ecryptfs/pam_ecryptfs.c |   31 ++-----------------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ecryptfs-utils-75-werror.patch	5 May 2009 12:18:58 -0000	1.4
+++ ecryptfs-utils-75-werror.patch	21 Jul 2009 07:19:47 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror	2009-03-05 22:17:36.000000000 +0100
-+++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c	2009-05-05 14:16:47.965159244 +0200
+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
 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_
  	if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
  			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
@@ -10,28 +10,9 @@ diff -up ecryptfs-utils-75/src/libecrypt
  		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
  		       (ECRYPTFS_FILE_SIZE_BYTES
  			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
-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-05 13:57:18.142095484 +0200
-@@ -18,6 +18,7 @@
-  * 02111-1307, USA.
-  */
- 
-+#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"
- 
- #ifndef ENOKEY
-diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c
---- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror	2009-04-30 23:40:12.000000000 +0200
-+++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c	2009-05-05 13:57:18.142095484 +0200
+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 @@
  
  #define PRIVATE_DIR "Private"
@@ -78,7 +59,7 @@ diff -up ecryptfs-utils-75/src/pam_ecryp
  				/* 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");
++				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);
  			}
@@ -91,14 +72,3 @@ diff -up ecryptfs-utils-75/src/pam_ecryp
  		goto out;
  	}
  	saved_uid = geteuid();
-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-01 01:04:38.000000000 +0200
-+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-05 13:57:18.142095484 +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;
- 
- 	if (argc == 1) {


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ecryptfs-utils.spec	23 Jun 2009 08:37:27 -0000	1.48
+++ ecryptfs-utils.spec	21 Jul 2009 07:19:47 -0000	1.49
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 75
-Release: 4%{?dist}
+Version: 76
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -14,33 +14,22 @@ 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
 
-#sent upstream, rhbz#495143
-Patch7: ecryptfs-utils-75-pamcheck.patch
-
-#sent upstream, rhbz#495143
-Patch8: ecryptfs-utils-75-fnekonfail.patch
-
 #temporary workaround for rhbz#503261
 Patch9: ecryptfs-utils-75-workaround503261.patch
 
+#Patch11: ecryptfs-utils-75-testdebug.patch
+
 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 autoconf automake libtool
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -71,17 +60,15 @@ 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
-%patch7 -p0 -b .pamcheck
-%patch8 -p0 -b .fnekonfail
 %patch9 -p1 -b .rhbz503261
+#%patch11 -p1 -b .testdebug
 
 %build
+autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
 %configure --disable-rpath --enable-tspi --enable-nss --enable-static
 make clean
@@ -135,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/ecryptfs-pkcs11-helper-doc.txt
 /sbin/mount.ecryptfs
 /sbin/umount.ecryptfs
-%attr(4755,root,ecryptfs) /sbin/mount.ecryptfs_private
+%attr(4750,root,ecryptfs) /sbin/mount.ecryptfs_private
 /sbin/umount.ecryptfs_private
 %{_bindir}/ecryptfs-manager
 %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring
@@ -197,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Jul 21 2009 Michal Hlavinka <mhlavink at redhat.com> 76-1
+- updated to 76
+
 * Tue Jun 23 2009 Michal Hlavinka <mhlavink at redhat.com> 75-4
 - add temporary workaround for #503261
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	21 May 2009 09:58:45 -0000	1.27
+++ sources	21 Jul 2009 07:19:47 -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