rpms/ecryptfs-utils/devel ecryptfs-utils-68-headn1.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 ecryptfs-utils.spec, 1.33, 1.34 sources, 1.20, 1.21

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	.cvsignore ecryptfs-utils.spec sources 
Added Files:
	ecryptfs-utils-68-headn1.patch 
Log Message:
updated to 68
fix #478464 - /usr/bin/ecryptfs-setup-private errors out


ecryptfs-utils-68-headn1.patch:

--- NEW FILE ecryptfs-utils-68-headn1.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Dec 2008 20:03:43 -0000	1.19
+++ .cvsignore	12 Jan 2009 16:57:50 -0000	1.20
@@ -1 +1 @@
-ecryptfs-utils-67.tar.gz
+ecryptfs-utils-68.tar.gz


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ecryptfs-utils.spec	29 Dec 2008 20:36:18 -0000	1.33
+++ ecryptfs-utils.spec	12 Jan 2009 16:57:50 -0000	1.34
@@ -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: 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 @@
 
 %setup -q
 %patch0 -p1 -b .nss3
+%patch1 -p1 -b .headn1
 
 %build
 %configure --disable-rpath --enable-tspi --enable-nss
@@ -81,8 +84,6 @@
 %{_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 @@
 %{_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 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Jan 12 2009 Michal Hlavinka <mhlavink at redhat.com> 68-0
+- updated to 68
+- fix #478464 - /usr/bin/ecryptfs-setup-private errors out
+
 * Mon Dec 29 2008 Michal Hlavinka <mhlavink at redhat.com> 67-1
 - bump release for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Dec 2008 20:03:43 -0000	1.20
+++ sources	12 Jan 2009 16:57:50 -0000	1.21
@@ -1 +1 @@
-0c72ec1328acfa24e2ed299d965e0200  ecryptfs-utils-67.tar.gz
+57428a8bf128bc1f076412c7b6478ca0  ecryptfs-utils-68.tar.gz