rpms/cryptsetup-luks/devel cryptsetup-1.0.6-pre2-key_slot_num_fix.patch, NONE, 1.1 cryptsetup-1.0.6-pre2-luksRemoveKey.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 cryptsetup-luks.spec, 1.54, 1.55 sources, 1.9, 1.10 cryptsetup-1.0.5-luksInit_header.patch, 1.1, NONE cryptsetup-1.0.5-readonly_detection.patch, 1.1, NONE cryptsetup-luks-1.0.1-proto.patch, 1.1, NONE

Till Maas (till) fedora-extras-commits at redhat.com
Mon Mar 3 21:49:54 UTC 2008


Author: till

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

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Added Files:
	cryptsetup-1.0.6-pre2-key_slot_num_fix.patch 
	cryptsetup-1.0.6-pre2-luksRemoveKey.patch 
Removed Files:
	cryptsetup-1.0.5-luksInit_header.patch 
	cryptsetup-1.0.5-readonly_detection.patch 
	cryptsetup-luks-1.0.1-proto.patch 
Log Message:
* Mon Mar 03 2008 Till Maas <opensource till name> - 1.0.6-0.1.pre2
- Update to new version with several bugfixes
- remove patches that have been merged upstream
- add patch from cryptsetup newsgroup
- fix typo / missing luksRemoveKey in manpage (patch)


cryptsetup-1.0.6-pre2-key_slot_num_fix.patch:

--- NEW FILE cryptsetup-1.0.6-pre2-key_slot_num_fix.patch ---
>From message <20080302124900.3f4fe49f at v3405.naf.net.ru>
on the dm-crypt mailing gmane newsgroup by
Nikolay A. Fetisov
Fix wrong usage of 'i' as a key slot number
diff -up cryptsetup-1.0.6-pre2/lib/setup.c.key_slot_num_fix cryptsetup-1.0.6-pre2/lib/setup.c
--- cryptsetup-1.0.6-pre2/lib/setup.c.key_slot_num_fix	2008-03-01 14:37:41.000000000 +0100
+++ cryptsetup-1.0.6-pre2/lib/setup.c	2008-03-03 20:47:41.000000000 +0100
@@ -583,7 +583,7 @@ static int __crypt_luks_add_key(int arg,
 	        options->icb->log(CRYPT_LOG_ERROR,"No key available with this passphrase.\n");
 		r = -EPERM; goto out;
 	} else
-	        logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n",i);
+	        logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n",r);
 
 	safe_free(password);
 	

cryptsetup-1.0.6-pre2-luksRemoveKey.patch:

--- NEW FILE cryptsetup-1.0.6-pre2-luksRemoveKey.patch ---
Author: Till Maas <opensource till name>

- Fix typo in luksRemoveKey help message "]" -> ">"
- show some info about luksRemoveKey in the manpage 
  (maye <options> with explanation needs to be added)

diff -up cryptsetup-1.0.6-pre2/src/cryptsetup.c.luksRemoveKey cryptsetup-1.0.6-pre2/src/cryptsetup.c
--- cryptsetup-1.0.6-pre2/src/cryptsetup.c.luksRemoveKey	2008-03-01 17:10:40.000000000 +0100
+++ cryptsetup-1.0.6-pre2/src/cryptsetup.c	2008-03-03 21:21:49.000000000 +0100
@@ -64,7 +64,7 @@ static struct action_type {
 	{ "luksFormat",	action_luksFormat, 0, 1, N_("<device> [<new key file>]"), N_("formats a LUKS device") },
 	{ "luksOpen",	action_luksOpen, 0, 2, N_("<device> <name> "), N_("open LUKS device as mapping <name>") },
 	{ "luksAddKey",	action_luksAddKey, 0, 1, N_("<device> [<new key file>]"), N_("add key to LUKS device") },
-	{ "luksRemoveKey", action_luksRemoveKey, 0, 1, N_("<device> [<key file]]"), N_("removes supplied key or key file from LUKS device") },
+	{ "luksRemoveKey", action_luksRemoveKey, 0, 1, N_("<device> [<key file>]"), N_("removes supplied key or key file from LUKS device") },
 	{ "luksKillSlot",  action_luksKillSlot, 0, 2, N_("<device> <key slot>"), N_("wipes key with number <key slot> from LUKS device") },
 	{ "luksUUID",	action_luksUUID, 0, 1, N_("<device>"), N_("print UUID of LUKS device") },
 	{ "isLuks",	action_isLuks, 0, 1, N_("<device>"), N_("tests <device> for LUKS partition header") },
diff -up cryptsetup-1.0.6-pre2/man/cryptsetup.8.luksRemoveKey cryptsetup-1.0.6-pre2/man/cryptsetup.8
--- cryptsetup-1.0.6-pre2/man/cryptsetup.8.luksRemoveKey	2008-03-01 10:17:23.000000000 +0100
+++ cryptsetup-1.0.6-pre2/man/cryptsetup.8	2008-03-03 21:21:14.000000000 +0100
@@ -54,6 +54,10 @@ identical to \fIremove\fR.
 .IP
 add a new key file/passphrase. An existing passphrase or key file (via \-\-key-file) must be supplied. The key file with the new material is supplied as a positional argument. <options> can be [\-\-key-file, \-\-key-slot].
 .PP
+\fIluksRemoveKey\fR <device> [<key file>] 
+.IP
+remove supplied key or key file from LUKS device
+.PP
 \fIluksKillSlot\fR <device> <key slot number>
 .IP
 wipe key with number <key slot> from LUKS device. A remaining passphrase or key file (via \-\-key-file) must be supplied. <options> can be [\-\-key-file].


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Jun 2007 21:43:10 -0000	1.9
+++ .cvsignore	3 Mar 2008 21:49:17 -0000	1.10
@@ -1 +1 @@
-cryptsetup-1.0.5.tar.bz2
+cryptsetup-1.0.6-pre2.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cryptsetup-luks.spec	19 Feb 2008 19:40:13 -0000	1.54
+++ cryptsetup-luks.spec	3 Mar 2008 21:49:17 -0000	1.55
@@ -1,14 +1,15 @@
+%define devrelease pre2
+
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.5
-Release: 9%{?dist}
+Version: 1.0.6
+Release: 0.1%{?devrelease:.%{devrelease}}%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://luks.endorphin.org/
-Source: http://luks.endorphin.org/source/cryptsetup-%{version}.tar.bz2
-Patch: cryptsetup-luks-1.0.1-proto.patch
-Patch1: cryptsetup-1.0.5-readonly_detection.patch
-Patch3: cryptsetup-1.0.5-luksInit_header.patch
+Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
+Patch1: cryptsetup-1.0.6-pre2-key_slot_num_fix.patch
+Patch2: cryptsetup-1.0.6-pre2-luksRemoveKey.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
@@ -17,31 +18,37 @@
 Provides: cryptsetup = %{version}-%{release}
 Obsoletes: cryptsetup <= 0.1
 
+
 %description
 This package contains cryptsetup, a utility for setting up
 encrypted filesystems using Device Mapper and the dm-crypt target.
 
+
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, e2fsprogs-devel
 Summary: Headers and libraries for using encrypted filesystems
 
+
 %description devel
 The cryptsetup-luks-devel package contain libraries and header files
 used for writing code that makes use of encrypted filesystems.
 
 
 %prep
-%setup -q -n cryptsetup-%{version}
-%patch -p1
-%patch3 -p1
+%setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}}
+%patch1 -p1 -b .key_slot_num_fix
+%patch2 -p1 -b .luksRemoveKey
+
 recode latin1..utf-8 ChangeLog
 
+
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -75,7 +82,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %changelog
+* Mon Mar 03 2008 Till Maas <opensource till name> - 1.0.6-0.1.pre2
+- Update to new version with several bugfixes
+- remove patches that have been merged upstream
+- add patch from cryptsetup newsgroup
+- fix typo / missing luksRemoveKey in manpage (patch)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.5-9
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Jun 2007 21:43:10 -0000	1.9
+++ sources	3 Mar 2008 21:49:17 -0000	1.10
@@ -1 +1 @@
-0aa2f94c39123f1a0352983e5366179c  cryptsetup-1.0.5.tar.bz2
+1ce62e5a6c3117ac4826e12abef3e2dd  cryptsetup-1.0.6-pre2.tar.bz2


--- cryptsetup-1.0.5-luksInit_header.patch DELETED ---


--- cryptsetup-1.0.5-readonly_detection.patch DELETED ---


--- cryptsetup-luks-1.0.1-proto.patch DELETED ---




More information about the fedora-extras-commits mailing list