From aefcf63b7865da9d0d0bfd64d796512d7f0e525d Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Jan 12 2009 16:57:50 +0000
Subject: updated to 68 fix #478464 - /usr/bin/ecryptfs-setup-private errors out


---

diff --git a/.cvsignore b/.cvsignore
index 8a8d341..b54c7c5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ecryptfs-utils-67.tar.gz
+ecryptfs-utils-68.tar.gz
diff --git a/ecryptfs-utils-68-headn1.patch b/ecryptfs-utils-68-headn1.patch
new file mode 100644
index 0000000..9abf4f9
--- /dev/null
+++ b/ecryptfs-utils-68-headn1.patch
@@ -0,0 +1,37 @@
+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 0122579..0f971ae 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: 67
-Release: 1%{?dist}
+Version: 68
+Release: 0%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -14,6 +14,8 @@ 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
@@ -45,6 +47,7 @@ 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
@@ -81,8 +84,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-unwrap-passphrase
 %{_bindir}/ecryptfs-wrap-passphrase
 %{_bindir}/ecryptfs-add-passphrase
-%{_bindir}/ecryptfs-zombie-kill
-%{_bindir}/ecryptfs-zombie-list
 %{_bindir}/ecryptfs-generate-tpm-key
 %{_bindir}/ecryptfs-mount-private
 %{_bindir}/ecryptfs-setup-private
@@ -102,8 +103,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
-%{_mandir}/man1/ecryptfs-zombie-kill.1.gz
-%{_mandir}/man1/ecryptfs-zombie-list.1.gz
 %{_mandir}/man1/mount.ecryptfs_private.1.gz
 %{_mandir}/man1/umount.ecryptfs_private.1.gz
 %{_mandir}/man7/ecryptfs.7.gz
@@ -129,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Jan 12 2009 Michal Hlavinka <mhlavink@redhat.com> 68-0
+- updated to 68
+- fix #478464 - /usr/bin/ecryptfs-setup-private errors out
+
 * Mon Dec 29 2008 Michal Hlavinka <mhlavink@redhat.com> 67-1
 - bump release for rebuild
 
diff --git a/sources b/sources
index 1348bd7..2e6fb08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c72ec1328acfa24e2ed299d965e0200  ecryptfs-utils-67.tar.gz
+57428a8bf128bc1f076412c7b6478ca0  ecryptfs-utils-68.tar.gz