Hello community,
here is the log from the commit of package cryptsetup
checked in at Mon Feb 4 17:35:05 CET 2008.
--------
--- cryptsetup/cryptsetup.changes 2008-01-09 12:09:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2008-02-04 16:22:46.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Feb 4 16:22:42 CET 2008 - lnussel@suse.de
+
+- boot.crypto:
+ * check for columns of terminal (bnc#337614)
+ * enhance crypttab manpage (#351061)
+ * check for fs_passno (#345339)
+
+-------------------------------------------------------------------
Old:
----
boot.crypto-0_200801091212.tar.bz2
New:
----
boot.crypto-0_200802041620.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cryptsetup.spec ++++++
--- /var/tmp/diff_new_pack.p20978/_old 2008-02-04 17:34:23.000000000 +0100
+++ /var/tmp/diff_new_pack.p20978/_new 2008-02-04 17:34:23.000000000 +0100
@@ -16,12 +16,12 @@
# hashalot version
%define haver 0.3
# boot.crypto version
-%define bcver 0_200801091212
+%define bcver 0_200802041620
License: BSD 3-Clause; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 1.0.5_SVNr42
-Release: 1
+Release: 10
Summary: Set Up dm-crypt Based Encrypted Block Devices
Source: cryptsetup-%{version}.tar.bz2
Source1: hashalot-%haver.tar.bz2
@@ -158,6 +158,7 @@
%_mandir/man1/hashalot.1.gz
%_mandir/man8/cryptsetup.8.gz
%_mandir/man5/crypttab.5.gz
+%_mandir/man5/cryptotab.5.gz
/%_lib/libcryptsetup.so.0
/%_lib/libcryptsetup.so.0.0.0
/lib/cryptsetup
@@ -168,7 +169,12 @@
%{_libdir}/libcryptsetup.so
%changelog
-* Wed Jan 09 2008 - lnussel@suse.de
+* Mon Feb 04 2008 lnussel@suse.de
+- boot.crypto:
+ * check for columns of terminal (bnc#337614)
+ * enhance crypttab manpage (#351061)
+ * check for fs_passno (#345339)
+* Wed Jan 09 2008 lnussel@suse.de
- upgrade to svn revision 42 which includes previous patches
- boot.crypto:
* don't mount read-only as safety check (#345338)
@@ -178,11 +184,11 @@
* add vol_id check script
* maintain boot.crypto stuff in revision control and use tarball
snapshots of it
-* Thu Nov 29 2007 - lnussel@suse.de
+* Thu Nov 29 2007 lnussel@suse.de
- upgrade to svn revision 38
-* Wed Nov 07 2007 - mkoenig@suse.de
+* Wed Nov 07 2007 mkoenig@suse.de
- add %%fillup_prereq and %%insserv_prereq to PreReq
-* Tue Oct 16 2007 - lnussel@suse.de
+* Tue Oct 16 2007 lnussel@suse.de
- upgrade to svn revision 31
* Rename luksDelKey into luksKillSlot
* Add luksRemoveKey that queries a given key before removal
@@ -197,49 +203,49 @@
will likely lead to disk corruption.
* Add signal handler to keyencryption to free the temporary
mapping in case the user hits ctrl-c.
-* Mon Aug 27 2007 - lnussel@suse.de
+* Mon Aug 27 2007 lnussel@suse.de
- remove /var/run/keymap from previous boot to make /etc/init.d/kbd
work (#296409)
-* Mon Aug 27 2007 - lnussel@suse.de
+* Mon Aug 27 2007 lnussel@suse.de
- run fsck with progressbar (#304750)
-* Thu Jun 21 2007 - mkoenig@suse.de
+* Thu Jun 21 2007 mkoenig@suse.de
- run udevsettle to avoid problems with busy temporary
device mapper devices [#285478]
-* Mon Jun 11 2007 - lnussel@suse.de
+* Mon Jun 11 2007 lnussel@suse.de
- rephrase error message (#279169)
-* Fri Jun 01 2007 - lnussel@suse.de
+* Fri Jun 01 2007 lnussel@suse.de
- rename util-linux-crypto to cryptsetup
- remove dmconvert
- replace svn snapshot with official 1.0.5 release
- don't enable boot.crypto by default
-* Tue May 29 2007 - lnussel@suse.de
+* Tue May 29 2007 lnussel@suse.de
- fix segfault when trying to open a non existing device
- fix gcc warnings
- add Short-Description to boot.crypto
- use %%find_lang
-* Wed May 09 2007 - lnussel@suse.de
+* Wed May 09 2007 lnussel@suse.de
- boot.crypto: implement 'status'
- boot.crypto: accept argument to start/stop single devices
-* Wed May 09 2007 - lnussel@suse.de
+* Wed May 09 2007 lnussel@suse.de
- hashalot: add timeout option
-* Wed May 09 2007 - lnussel@suse.de
+* Wed May 09 2007 lnussel@suse.de
- fix build
-* Tue May 08 2007 - lnussel@suse.de
+* Tue May 08 2007 lnussel@suse.de
- boot.crypto: switch off splash screen only when needed
- boot.crypto: report status for individual volumes instead of using one global
exit status
- hashalot: exit unsucessfully on empty passphrase
-* Tue May 08 2007 - lnussel@suse.de
+* Tue May 08 2007 lnussel@suse.de
- boot.crypto: sleep a bit longer before overwriting the prompt
- boot.crypto: add support for pseed and itercountk options
- boot.crypto: skip entries with unsupported/unknown options
- hashalot: add support for itercountk
-* Fri May 04 2007 - lnussel@suse.de
+* Fri May 04 2007 lnussel@suse.de
- upgrade cryptsetup to current svn revision 30 which includes
previous patches.
- fix background prompt process not getting killed on ctrl-d in
boot.crypto
-* Fri Apr 27 2007 - lnussel@suse.de
+* Fri Apr 27 2007 lnussel@suse.de
- upgrade cryptsetup to current svn revision 26. Does no longer hang
when a file is specified instead of a device.
- remove obsolete cryptsetup.sh script
@@ -250,27 +256,27 @@
* run sulogin only during boot if fsck failed
* support crypttab's 'tries' option
- add crypttab manpage based on Debian one
-* Tue Apr 24 2007 - lnussel@suse.de
+* Tue Apr 24 2007 lnussel@suse.de
- add boot.crypto (#257884)
- add crypttab and cryptotab as %%ghost to filelist
-* Tue Mar 27 2007 - mkoenig@suse.de
+* Tue Mar 27 2007 mkoenig@suse.de
- move devel .so link to %%{libdir}
- run ldconfig, since we have now a shared lib installed
-* Fri Mar 23 2007 - dmueller@suse.de
+* Fri Mar 23 2007 dmueller@suse.de
- cryptsetup can now link shared since libpopt is
no longer under /usr
-* Fri Mar 09 2007 - lnussel@suse.de
+* Fri Mar 09 2007 lnussel@suse.de
- add patch to support old loop_fish2 key hash method
-* Thu Dec 07 2006 - mkoenig@suse.de
+* Thu Dec 07 2006 mkoenig@suse.de
- update cryptsetup to version 1.0.4:
* added terminal timeout rewrite
* allow user selection of key slot
* reading binary keys from stdin using the "-" as key file
* fix 64 bit compiler warning issues.
* fix getline problem for 64-bit archs.
-* Fri Oct 13 2006 - mkoenig@suse.de
+* Fri Oct 13 2006 mkoenig@suse.de
- fix build failure due to missing pthreads
-* Wed Sep 13 2006 - hvogel@suse.de
+* Wed Sep 13 2006 hvogel@suse.de
- use the LUKS version of cryptsetup
- split -devel subpackage for libcryptsetup
- remove patches because they are in the new cryptsetup
@@ -279,20 +285,20 @@
* cryptsetup-0.1-dmi.exists.patch
* cryptsetup-0.1-timeout.patch
- use man page from the new cryptsetup
-* Tue May 16 2006 - hvogel@suse.de
+* Tue May 16 2006 hvogel@suse.de
- Fix cryptsetup to work when the device does not exist yet
[#175931]
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Mon Dec 19 2005 - mmj@suse.de
+* Mon Dec 19 2005 mmj@suse.de
- Remove symlinks to hashalot we don't want
-* Thu Oct 13 2005 - hvogel@suse.de
+* Thu Oct 13 2005 hvogel@suse.de
- Fix uninitialized var in dmconvert. Add
* dmconvert-0.2-uninitialized.patch
- Fix return value in cryptsetup. Add
* cryptsetup-0.1-retval.patch
-* Wed Jun 29 2005 - hvogel@suse.de
+* Wed Jun 29 2005 hvogel@suse.de
- Link cryptsetup static so it can be in /sbin and you can get
/usr over nfs or even crypted
-* Mon May 09 2005 - hvogel@suse.de
+* Mon May 09 2005 hvogel@suse.de
- New package, Version 2.12q
++++++ boot.crypto-0_200801091212.tar.bz2 -> boot.crypto-0_200802041620.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200801091212/boot.crypto new/boot.crypto-0_200802041620/boot.crypto
--- old/boot.crypto-0_200801091212/boot.crypto 2008-01-09 12:12:31.000000000 +0100
+++ new/boot.crypto-0_200802041620/boot.crypto 2008-02-04 16:20:31.000000000 +0100
@@ -85,7 +85,9 @@
prmt=""
setprompt ()
{
- if test -t 1 -a "$TERM" != "raw" -a "$TERM" != "dumb" && stty size <&1 > /dev/null 2>&1
+ read rows cols < <(stty size -F $REDIRECT 2>/dev/null)
+ test -z "$cols" && cols=0
+ if test -t 1 -a "$TERM" != "raw" -a "$TERM" != "dumb" && stty size <&1 > /dev/null 2>&1 && test $cols -gt ${#prmt}
then
(
trap "exit 0" SIGTERM
@@ -655,10 +657,12 @@
mountpoint=''
fs_type='auto'
infstab=''
- read dummy mountpoint fs_type dummy < <(/bin/awk -vd=/dev/mapper/$name '$1==d{print;exit}' < /etc/fstab)
+ read dummy mountpoint fs_type dummy dummy fs_passno < \
+ <(/bin/awk -vd=/dev/mapper/$name '$1==d{print;exit}' < /etc/fstab)
if test "$?" -eq 0; then
infstab='yes'
fi
+ test -z "$fs_passno" && fs_passno=0
# run mkfs if the tmp option was given
if test "$maketmp" = "yes"; then
@@ -720,9 +724,11 @@
continue
fi
- if ! run_fsck "$fs_type" "/dev/mapper/$name" "$mp" "$physdev"; then
- report 1 "$physdev..."
- continue
+ if test $fs_passno -gt 0; then
+ if ! run_fsck "$fs_type" "/dev/mapper/$name" "$mp" "$physdev"; then
+ report 1 "$physdev..."
+ continue
+ fi
fi
mount /dev/mapper/$name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200801091212/cryptotab.5 new/boot.crypto-0_200802041620/cryptotab.5
--- old/boot.crypto-0_200801091212/cryptotab.5 1970-01-01 01:00:00.000000000 +0100
+++ new/boot.crypto-0_200802041620/cryptotab.5 2008-02-04 16:20:31.000000000 +0100
@@ -0,0 +1,115 @@
+.\" Title: cryptotab
+.\" Author:
+.\" Generator: DocBook XSL Stylesheets v1.73.1 http://docbook.sf.net/
+.\" Date: 01/17/2008
+.\" Manual:
+.\" Source:
+.\"
+.TH "CRYPTOTAB" "5" "01/17/2008" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+cryptotab - static information about crypted filesystems (deprecated)
+.SH "SYNOPSIS"
+.PP
+\fBcryptotab\fR
+.RS 4
+
+\fILOOPDEVICE\fR
+\fIDEVICE\fR
+\fIMOUNTPOINT\fR
+\fIFILESYSTEM\fR
+\fIALGORITHM\fR[
+\fIMOUNTOPTIONS\fR[
+\fIINFO\fR]]
+.RE
+.SH "DESCRIPTION"
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+Note
+\fB/etc/cryptotab\fR was designed for use with the now deprecated cryptoloop technology and must therefore be considered deprecated as well\. \fB/etc/crypttab\fR (note the missing \(lqo\(rq) should be used instead\.
+.sp
+
+The file \fB/etc/cryptotab\fR contains descriptive informations about encrypted volumes\. Each volume is described on a separate line; columns on each line are separated by tabs or spaces\. Lines starting with "\fI#\fR" are comments, empty lines are ignored\. The order of records in \fBcryptotab\fR is important because the \fB/etc/init\.d/boot\.crypto\fR script sequentially iterates through \fBcryptotab\fR entries\.
+.sp
+.TS
+tab(:);
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt.
+T{
+\fILOOPDEVICE\fR
+.sp
+T}:T{
+specifies the loop device to use for this mapping, for example /dev/loop0
+.sp
+T}
+T{
+\fIDEVICE\fR
+.sp
+T}:T{
+specifies the block special device that holds the encrypted data
+.sp
+T}
+T{
+\fIMOUNTPOINT\fR
+.sp
+T}:T{
+specifies the where the volume should be mounted
+.sp
+T}
+T{
+\fIFILESYSTEM\fR
+.sp
+T}:T{
+specifies the file system of the volume
+.sp
+T}
+T{
+\fIALGORITHM\fR
+.sp
+T}:T{
+specifies the encryption algorithm to use
+.sp
+
+Supported algorithms are \fItwofish\fR, \fItwofishSL92\fR and \fItwofish256\fR
+.sp
+T}
+T{
+\fIMOUNTOPTIONS\fR
+.sp
+T}:T{
+optionally specifies mount option
+.sp
+T}
+T{
+\fIINFO\fR
+.sp
+T}:T{
+optionally specifies a string that should be printed when prompting for the passphrase
+.sp
+T}
+.TE
+.sp
+.SH "EXAMPLES"
+.sp
+.RS 4
+.nf
+/dev/loop0 /dev/sda6 /secret ext2 twofish256
+.fi
+.RE
+.SH "SEE ALSO"
+cryptsetup(8), /etc/crypttab, mount(8)
+.sp
+.SH "AUTHOR"
+Ludwig Nussel