From 3b73d051b63485e10218031e40244f053ae1ce21 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Feb 16 2009 10:29:32 +0000
Subject: - update to 70


---

diff --git a/.cvsignore b/.cvsignore
index 72d6d16..30c0f52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ecryptfs-utils_69.orig.tar.gz
+ecryptfs-utils_70.orig.tar.gz
diff --git a/ecryptfs-utils-67-nss3.patch b/ecryptfs-utils-67-nss3.patch
deleted file mode 100644
index a4c6204..0000000
--- a/ecryptfs-utils-67-nss3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up ecryptfs-utils-67/src/libecryptfs/key_management.c.nss3 ecryptfs-utils-67/src/libecryptfs/key_management.c
---- ecryptfs-utils-67/src/libecryptfs/key_management.c.nss3	2008-12-02 05:15:43.000000000 +0100
-+++ ecryptfs-utils-67/src/libecryptfs/key_management.c	2008-12-29 17:57:33.841262892 +0100
-@@ -20,9 +20,9 @@
- 
- #include <errno.h>
- #ifdef ENABLE_NSS
--#include <nss/pk11func.h>
--#include <nss/secmod.h>
--#include <nss/secmodt.h>
-+#include <nss3/pk11func.h>
-+#include <nss3/secmod.h>
-+#include <nss3/secmodt.h>
- #else
- #include <gcrypt.h>
- #endif /* #ifdef ENABLE_NSS */
-diff -up ecryptfs-utils-67/src/libecryptfs/main.c.nss3 ecryptfs-utils-67/src/libecryptfs/main.c
---- ecryptfs-utils-67/src/libecryptfs/main.c.nss3	2008-12-02 05:15:43.000000000 +0100
-+++ ecryptfs-utils-67/src/libecryptfs/main.c	2008-12-29 17:57:47.143261227 +0100
-@@ -21,9 +21,9 @@
- 
- #include <errno.h>
- #ifdef ENABLE_NSS
--#include <nss/pk11func.h>
--#include <nss/secmod.h>
--#include <nss/secmodt.h>
-+#include <nss3/pk11func.h>
-+#include <nss3/secmod.h>
-+#include <nss3/secmodt.h>
- #else
- #include <gcrypt.h>
- #endif /* #ifdef ENABLE_NSS */
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 0b3f2a1..f0e76d6 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -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: 69
-Release: 4%{?dist}
+Version: 70
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -14,8 +14,6 @@ Requires: keyutils
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel python python-devel nss-devel
 Conflicts: kernel < 2.6.19
-#fix building with nss
-Patch0: ecryptfs-utils-67-nss3.patch
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -46,7 +44,6 @@ the interface supplied by the ecryptfs-utils library.
 %prep
 
 %setup -q
-%patch0 -p1 -b .nss3
 
 %build
 %configure --disable-rpath --enable-tspi --enable-nss
@@ -75,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt
 %doc doc/ecryptfs-pkcs11-helper-doc.txt
 %attr(4755,root,root) /sbin/mount.ecryptfs
+%attr(4755,root,root) /sbin/umount.ecryptfs
 %attr(4755,root,root) /sbin/mount.ecryptfs_private
 %attr(4755,root,root) /sbin/umount.ecryptfs_private
 %{_bindir}/ecryptfs-manager
@@ -129,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Feb 16 2009 Michal Hlavinka <mhlavink@redhat.com> 70-1
+- updated to 70
+- fix: #479762 - ecryptfsecryptfs-setup-private broken
+- added umount option to clear per-user keyring
+
 * Mon Feb 02 2009 Michal Hlavinka <mhlavink@redhat.com> 69-4
 - fix list of onwed directories
 
diff --git a/sources b/sources
index 25ca0eb..47d48c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9df6a132d6a9c40ec0befbb8b55575fa  ecryptfs-utils_69.orig.tar.gz
+1131c41046b0736270a3a437fd47aeb7  ecryptfs-utils_70.orig.tar.gz