From 3099b4d97b4cb33a22fc6cbade851ecd41673e66 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Jan 27 2009 12:51:02 +0000
Subject: updated to 69


---

diff --git a/.cvsignore b/.cvsignore
index b54c7c5..72d6d16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ecryptfs-utils-68.tar.gz
+ecryptfs-utils_69.orig.tar.gz
diff --git a/ecryptfs-utils-68-headn1.patch b/ecryptfs-utils-68-headn1.patch
deleted file mode 100644
index 9abf4f9..0000000
--- a/ecryptfs-utils-68-headn1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1 ecryptfs-utils-68/src/utils/ecryptfs-setup-private
---- ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1	2008-12-22 23:23:24.000000000 +0100
-+++ ecryptfs-utils-68/src/utils/ecryptfs-setup-private	2009-01-12 17:36:20.386755719 +0100
-@@ -198,13 +198,13 @@ if [ -z "$LOGINPASS" ] && [ "$BOOTSTRAP"
- 	while [ $tries -lt $PW_ATTEMPTS ]; do
- 		stty -echo
- 		echo -n "$MESSAGE: "
--		LOGINPASS=`line`
-+               LOGINPASS=`head -n1`
- 		stty $stty_orig
- 		echo
- 		if [ $WRAPPING_PASS != "LOGIN" ]; then
- 			stty -echo
- 			echo -n "$MESSAGE (again): "
--			LOGINPASS2=`line`
-+                       LOGINPASS2=`head -n1`
- 			stty $stty_orig
- 			echo
- 			if [ "$LOGINPASS" != "$LOGINPASS2" ]; then
-@@ -239,7 +239,7 @@ if [ -z "$MOUNTPASS" ]; then
- 	while [ $tries -lt $PW_ATTEMPTS ]; do
- 		stty -echo
- 		echo -n "Enter your mount passphrase [leave blank to generate one]: "
--		MOUNTPASS=`line`
-+               MOUNTPASS=`head -n1`
- 		stty $stty_orig
- 		echo
- 		if [ -z "$MOUNTPASS" ]; then
-@@ -249,7 +249,7 @@ if [ -z "$MOUNTPASS" ]; then
- 		else
- 			stty -echo
- 			echo -n "Enter your mount passphrase (again): "
--			MOUNTPASS2=`line`
-+                       MOUNTPASS2=`head -n1`
- 			stty $stty_orig
- 			echo
- 			if [ "$MOUNTPASS" != "$MOUNTPASS2" ]; then
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index c5aa5f7..09dae91 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -2,20 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 68
+Version: 69
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
-Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils-%{version}.tar.gz
+Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel python python-devel nss-devel
 Conflicts: kernel < 2.6.19
 Patch0: ecryptfs-utils-67-nss3.patch
-#from upstream, required for version <= 68
-Patch1: ecryptfs-utils-68-headn1.patch
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -47,7 +45,6 @@ the interface supplied by the ecryptfs-utils library.
 
 %setup -q
 %patch0 -p1 -b .nss3
-%patch1 -p1 -b .headn1
 
 %build
 %configure --disable-rpath --enable-tspi --enable-nss
@@ -128,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
-* Thu Jan 15 2009 Tomas Mraz <tmraz@redhat.com> 68-1
-- rebuild with new openssl
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink@redhat.com> 69-1
+- updated to 68
 
 * Mon Jan 12 2009 Michal Hlavinka <mhlavink@redhat.com> 68-0
 - updated to 68
diff --git a/sources b/sources
index 2e6fb08..25ca0eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57428a8bf128bc1f076412c7b6478ca0  ecryptfs-utils-68.tar.gz
+9df6a132d6a9c40ec0befbb8b55575fa  ecryptfs-utils_69.orig.tar.gz