Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Wed Mar 4 15:29:02 CET 2009. -------- --- cryptsetup/cryptsetup.changes 2009-02-26 15:35:40.000000000 +0100 +++ cryptsetup/cryptsetup.changes 2009-03-04 09:57:00.320349000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 16:27:23 CET 2009 - lnussel@suse.de + +- fix boot.crypto doesn't care on tries flag in crypttab (bnc#480741) +- mkinitrd scripts now included in boot.crypto git + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.crypto-0_200811031303.tar.bz2 mkinitrd-boot.sh mkinitrd-setup.sh New: ---- boot.crypto-0_200903031625.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.D23036/_old 2009-03-04 15:26:26.000000000 +0100 +++ /var/tmp/diff_new_pack.D23036/_new 2009-03-04 15:26:26.000000000 +0100 @@ -19,25 +19,23 @@ Name: cryptsetup -Url: http://luks.endorphin.org/dm-crypt +Url: http://code.google.com/p/cryptsetup/ BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel BuildRequires: libselinux-devel # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_200811031303 +%define bcver 0_200903031625 License: BSD 3-Clause; GPL v2 only; GPL v2 or later Group: System/Base AutoReqProv: on Version: 1.0.5_SVNr46 -Release: 60 +Release: 61 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 # http://www.suse.de/~lnussel/boot.crypto.git Source2: boot.crypto-%{bcver}.tar.bz2 -Source3: mkinitrd-setup.sh -Source4: mkinitrd-boot.sh # use this to create the tarball from svn Source99: cryptsetup-mktar Patch1: cryptsetup-1.0.5-udevadm.patch @@ -160,10 +158,6 @@ popd # remove unwanted symlinks rm -f $RPM_BUILD_ROOT/sbin/{rmd160,sha256,sha384,sha512} -# mkinitrd scriptlets -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-luks.sh -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-luks.sh # # boot.crypto make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT @@ -227,6 +221,9 @@ %{_libdir}/libcryptsetup.so %changelog +* Tue Mar 03 2009 lnussel@suse.de +- fix boot.crypto doesn't care on tries flag in crypttab (bnc#480741) +- mkinitrd scripts now included in boot.crypto git * Thu Feb 26 2009 mhopf@suse.de - Fix segfault with oversized hashes (bnc #476290). * Wed Feb 25 2009 jsmeix@suse.de ++++++ boot.crypto-0_200811031303.tar.bz2 -> boot.crypto-0_200903031625.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/boot.crypto new/boot.crypto-0_200903031625/boot.crypto --- old/boot.crypto-0_200811031303/boot.crypto 2008-11-03 13:03:19.000000000 +0100 +++ new/boot.crypto-0_200903031625/boot.crypto 2009-03-03 16:25:57.000000000 +0100 @@ -43,6 +43,12 @@ . /lib/cryptsetup/boot.crypto.functions rc_reset + +if test ! -s $CRYPTOTAB -a ! -s $CRYPTTAB; then + report 6 "no crypto partitions configured" + rc_exit +fi + case "$1" in start|b) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/boot.crypto.functions new/boot.crypto-0_200903031625/boot.crypto.functions --- old/boot.crypto-0_200811031303/boot.crypto.functions 2008-11-03 13:03:19.000000000 +0100 +++ new/boot.crypto-0_200903031625/boot.crypto.functions 2009-03-03 16:25:57.000000000 +0100 @@ -1,3 +1,4 @@ +#!/bin/bash # Copyright (C) 1996-2008 SUSE Linux Products GmbH, Nuernberg, Germany. # # This program is free software; you can redistribute it and/or modify @@ -467,7 +468,6 @@ keysize="" halgo="" timeout="" - tries="" pseed="" itercountk="" precheck="" @@ -516,7 +516,7 @@ ;; tries) if test -n "$value" ; then - params="$params --tries=$tries" + params="$params --tries=$value" fi ;; check) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/Makefile new/boot.crypto-0_200903031625/Makefile --- old/boot.crypto-0_200811031303/Makefile 2008-11-03 13:03:19.000000000 +0100 +++ new/boot.crypto-0_200903031625/Makefile 2009-03-03 16:25:57.000000000 +0100 @@ -2,6 +2,7 @@ pkglibdir=/lib/cryptsetup mandir=/usr/share/man sysconfdir=/etc +initrdscriptsdir=/lib/mkinitrd/scripts ASCIIDOC=asciidoc @@ -22,6 +23,7 @@ $(ASCIIDOC) cryptotab.5.txt install: crypttab.5 cryptotab.5 + install -d -m 755 $(DESTDIR)$(initrdscriptsdir) install -d -m 755 $(DESTDIR)$(initscriptdir) install -d -m 755 $(DESTDIR)$(pkglibdir)/checks install -d -m 755 $(DESTDIR)$(mandir)/man5 @@ -33,6 +35,8 @@ install -m 644 cryptotab.5 $(DESTDIR)$(mandir)/man5 install -m 644 /dev/null $(DESTDIR)$(sysconfdir)/cryptotab install -m 644 /dev/null $(DESTDIR)$(sysconfdir)/crypttab + install -m 755 mkinitrd/setup-luks.sh $(DESTDIR)$(initrdscriptsdir)/setup-luks.sh + install -m 755 mkinitrd/boot-luks.sh $(DESTDIR)$(initrdscriptsdir)/boot-luks.sh html: crypttab.5.html cryptotab.5.html diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/mkchanges new/boot.crypto-0_200903031625/mkchanges --- old/boot.crypto-0_200811031303/mkchanges 2008-11-03 13:03:19.000000000 +0100 +++ new/boot.crypto-0_200903031625/mkchanges 2009-03-03 16:25:57.000000000 +0100 @@ -5,4 +5,4 @@ fi # no idea why it always prints those commit lines echo '- boot.crypto:' -git-rev-list --pretty=format:" * %s" "$@" |grep -v ^commit +git rev-list --pretty=format:" * %s" "$@" |grep -v ^commit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/mkinitrd/boot-luks.sh new/boot.crypto-0_200903031625/mkinitrd/boot-luks.sh --- old/boot.crypto-0_200811031303/mkinitrd/boot-luks.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/boot.crypto-0_200903031625/mkinitrd/boot-luks.sh 2009-03-03 16:25:57.000000000 +0100 @@ -0,0 +1,40 @@ +#!/bin/bash +#%stage: crypto +#%programs: /sbin/cryptsetup +#%udevmodules: dm-crypt $cryptmodules +#%if: "$root_luks" -o "$luks" +# +##### LUKS (comfortable disk encryption) +## +## This activates a LUKS encrypted partition. +## +## Command line parameters +## ----------------------- +## +## luks a list of luks devices (e.g. xxx) +## luks_xxx the luks device (e.g. /dev/sda) +## + +case $luks_lang in + en*) + # We only support english keyboard layout + ;; + *) + echo "Only english keyboard layout supported." + echo "Please ensure that the password is typed correctly." + ;; +esac + +echo +echo -n "Enter LUKS Passphrase:" +read -s pass +echo + +for curluks in $luks; do + echo $pass | /sbin/cryptsetup luksOpen $(eval echo \$luks_${curluks}) $curluks || \ + /sbin/cryptsetup luksOpen $(eval echo \$luks_${curluks}) $curluks +done + +pass='xxxxxxxxxxxxxxxxxxxx' +unset pass + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/mkinitrd/setup-luks.sh new/boot.crypto-0_200903031625/mkinitrd/setup-luks.sh --- old/boot.crypto-0_200811031303/mkinitrd/setup-luks.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/boot.crypto-0_200903031625/mkinitrd/setup-luks.sh 2009-03-03 16:25:57.000000000 +0100 @@ -0,0 +1,58 @@ +#!/bin/bash +# +#%stage: crypto +# + +if [ -x /sbin/cryptsetup -a -x /sbin/dmsetup ] ; then + luks_blockdev= + luks_add_device="$blockdev $luks_add_device" + # bd holds the device we see the decrypted LUKS partition as + for bd in $luks_add_device ; do + luks_name= + update_blockdev $bd + luks_blockmajor=$blockmajor + luks_blockminor=$blockminor + # luksbd holds the device, LUKS is running on + for luksbd in $(dm_resolvedeps $bd); do # should only be one for luks + [ $? -eq 0 ] || return 1 + update_blockdev $luksbd + if /sbin/cryptsetup isLuks $luksbd 2>/dev/null; then + root_luks=1 + tmp_root_dm=1 # luks needs dm + + luks_name="$(dmsetup -c info -o name --noheadings -j $luks_blockmajor -m $luks_blockminor)" + eval luks_${luks_name}=$(beautify_blockdev ${luksbd}) + save_var luks_${luks_name} + + luks="$luks $luks_name" + luks_blockdev="$luks_blockdev $luksbd" + fi + done + if [ ! "$luks_name" ]; then # no luks found + luks_blockdev="$luks_blockdev $bd" + fi + done + blockdev="$luks_blockdev" +fi + +if [ "$root_luks" ]; then + case $LANG in + en*) + # We only support english keyboard layout currently + ;; + *) + echo "Only english keyboard layout supported." + echo "Please ensure that the password is typed correctly." + luks_lang=$LANG + ;; + esac + for m in $(cat /proc/crypto | grep module | sed 's/^module .*: \(.*\)$/\1/'); do + cryptmodules="$cryptmodules $m" + done +fi + +save_var root_luks # do we have luks? +save_var luks # which names do the luks devices have? +save_var cryptmodules # required kernel modules for crypto setup +save_var luks_lang # original language settings + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200811031303/mktar new/boot.crypto-0_200903031625/mktar --- old/boot.crypto-0_200811031303/mktar 2008-11-03 13:03:19.000000000 +0100 +++ new/boot.crypto-0_200903031625/mktar 2009-03-03 16:25:57.000000000 +0100 @@ -2,7 +2,7 @@ set -e NAME=boot.crypto VERSION=0 -LAST_COMMIT=(`git-rev-list --timestamp HEAD^..HEAD`) +LAST_COMMIT=(`git rev-list --timestamp HEAD^..HEAD`) DATE=`date +%Y%m%d%H%M -d "1970-01-01 00:00 UTC $LAST_COMMIT seconds"` fn=$NAME-${VERSION}_$DATE.tar.bz2 git archive --prefix=$NAME-${VERSION}_$DATE/ HEAD | bzip2 > $fn ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org