rpms/cryptsetup-luks/devel cryptsetup-prompt.patch, NONE, 1.1 cryptsetup-luks.spec, 1.57, 1.58

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/cryptsetup-luks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16120

Modified Files:
	cryptsetup-luks.spec 
Added Files:
	cryptsetup-prompt.patch 
Log Message:
don't use recode, use iconv (#442574)
add a patch that adds the device to the luksOpen prompt (#433406)


cryptsetup-prompt.patch:

--- NEW FILE cryptsetup-prompt.patch ---
diff -up cryptsetup-1.0.6/lib/setup.c.foo cryptsetup-1.0.6/lib/setup.c
--- cryptsetup-1.0.6/lib/setup.c.foo	2008-04-15 12:07:58.000000000 -0400
+++ cryptsetup-1.0.6/lib/setup.c	2008-04-15 12:12:38.000000000 -0400
@@ -444,6 +444,7 @@ static int __crypt_luks_open(int arg, st
 {
 	struct luks_masterkey *mk=NULL;
 	struct luks_phdr hdr;
+	char *prompt = NULL;
 	char *password; int passwordLen;
 	struct device_infos infos;
 	struct crypt_options tmp = {
@@ -474,7 +475,8 @@ static int __crypt_luks_open(int arg, st
 start:
 	mk=NULL;
 
-	if(get_key("Enter LUKS passphrase: ",&password,&passwordLen, 0, options->key_file,  options->passphrase_fd, options->timeout, options->flags))
+	asprintf(&prompt, "Enter LUKS passphrase for %s: ", options->device);
+	if(get_key(prompt ? prompt : "Enter LUKS passphrase: ",&password,&passwordLen, 0, options->key_file,  options->passphrase_fd, options->timeout, options->flags))
 		tries--;
 	else
 		tries = 0;
@@ -518,6 +520,7 @@ start:
  out1:
 	safe_free(password);
  out:
+ 	free(prompt);
 	LUKS_dealloc_masterkey(mk);
 	if (r == -EPERM && tries > 0)
 		goto start;


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/extras/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cryptsetup-luks.spec	13 Mar 2008 20:10:54 -0000	1.57
+++ cryptsetup-luks.spec	15 Apr 2008 17:35:01 -0000	1.58
@@ -8,11 +8,11 @@
 Group: Applications/System
 URL: http://luks.endorphin.org/
 Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
+Patch: cryptsetup-prompt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
 BuildRequires: libselinux-devel
-BuildRequires: recode
 Provides: cryptsetup = %{version}-%{release}
 Obsoletes: cryptsetup <= 0.1
 
@@ -36,7 +36,9 @@
 
 %prep
 %setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}}
-recode latin1..utf-8 ChangeLog
+%patch -p1 -b .prompt
+iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
+mv -f ChangeLog.new ChangeLog 
 
 
 %build
@@ -79,6 +81,10 @@
 
 
 %changelog
+* Tue Apr 15 2008 Bill Nottinghm <notting at redhat.com> - 1.0.6-2
+- Add the device to the luksOpen prompt (#433406)
+- Use iconv, not recode (#442574)
+
 * Thu Mar 13 2008 Till Maas <opensource till name> - 1.0.6-1
 - Update to latest version
 - remove patches that have been merged upstream