From 7daec397d6fddc4d336364e1a95edff48d982612 Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Wed, 11 Apr 2007 15:27:55 +0000 Subject: [PATCH] Version bump to fix masked baselayout issues (bug 157590), and minor QA. Package-Manager: portage-2.1.2.3 --- sys-fs/cryptsetup-luks/ChangeLog | 8 +- sys-fs/cryptsetup-luks/Manifest | 37 ++- .../cryptsetup-luks-1.0.3-r2.ebuild | 4 +- .../cryptsetup-luks-1.0.4-r2.ebuild | 93 +++++++ .../files/1.0.4-dm-crypt-start.sh | 236 ++++++++++++++++++ .../files/digest-cryptsetup-luks-1.0.4-r2 | 3 + 6 files changed, 370 insertions(+), 11 deletions(-) create mode 100644 sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r2.ebuild create mode 100644 sys-fs/cryptsetup-luks/files/1.0.4-dm-crypt-start.sh create mode 100644 sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r2 diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog index 8f910644e940..d3bc21414f83 100644 --- a/sys-fs/cryptsetup-luks/ChangeLog +++ b/sys-fs/cryptsetup-luks/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/cryptsetup-luks # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.48 2007/01/27 02:18:18 strerror Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.49 2007/04/11 15:27:55 ikelos Exp $ + +*cryptsetup-luks-1.0.4-r2 (11 Apr 2007) + + 11 Apr 2007; Mike Auty +files/1.0.4-dm-crypt-start.sh, + +cryptsetup-luks-1.0.4-r2.ebuild: + Version bump to fix masked baselayout issues (bug 157590), and minor QA. 27 Jan 2007; Benjamin Smee cryptsetup-luks-1.0.4-r1.ebuild: diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest index b03b08787acb..4cc34bd98314 100644 --- a/sys-fs/cryptsetup-luks/Manifest +++ b/sys-fs/cryptsetup-luks/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.0.3-cryptfs.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA1 b006d7f31773842e7247b2df0fe1735aac87ec59 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280 MD5 63d91d8391aedaf1830d56922f9b5bf8 files/1.0.3-cryptfs.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 files/1.0.3-cryptfs.confd 3029 @@ -10,6 +13,10 @@ AUX 1.0.3-dm-crypt-stop.sh 1021 RMD160 4b4537e0cadf447c1efed6ca8a4478b058e99aad MD5 341064815588da90206d883ed5dc42df files/1.0.3-dm-crypt-stop.sh 1021 RMD160 4b4537e0cadf447c1efed6ca8a4478b058e99aad files/1.0.3-dm-crypt-stop.sh 1021 SHA256 fd8856130104aa37d6941168b299389a47e6760077a9e6d3f86f3301385a4973 files/1.0.3-dm-crypt-stop.sh 1021 +AUX 1.0.4-dm-crypt-start.sh 7274 RMD160 22e364fb7887ed016c02241c078c79c41c373289 SHA1 84ae6918301b9f6f8761d4f500936d390eaeb180 SHA256 a191aa680814eae2f2d5de7694eae4756d44ab78fbcdd254bef05c3d3653a147 +MD5 df7af1ac103b488312891f0e123b4bfb files/1.0.4-dm-crypt-start.sh 7274 +RMD160 22e364fb7887ed016c02241c078c79c41c373289 files/1.0.4-dm-crypt-start.sh 7274 +SHA256 a191aa680814eae2f2d5de7694eae4756d44ab78fbcdd254bef05c3d3653a147 files/1.0.4-dm-crypt-start.sh 7274 AUX cryptfs.confd 1548 RMD160 a009482d77e0c467fc9b26bbf7cd0a46ed5eb26e SHA1 a51fd66f741436626706f6221be4709f5b6870ad SHA256 7e6d165edb4e3971d949847629e56849c0839c73f43de07822b4c942171dc16a MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548 RMD160 a009482d77e0c467fc9b26bbf7cd0a46ed5eb26e files/cryptfs.confd 1548 @@ -45,10 +52,10 @@ EBUILD cryptsetup-luks-1.0.1-r2.ebuild 2113 RMD160 9e2a4262487ac28c5187608d7f556 MD5 06345bb64c18f0ab5857556a8bd52de0 cryptsetup-luks-1.0.1-r2.ebuild 2113 RMD160 9e2a4262487ac28c5187608d7f55611a3427b438 cryptsetup-luks-1.0.1-r2.ebuild 2113 SHA256 b694e6dd1aee7872022e048ab9db572fdaf2ffeda36603dc2dbd268cb639f495 cryptsetup-luks-1.0.1-r2.ebuild 2113 -EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2167 RMD160 d73618273a5a0bfd85f49a1e6bf479d70d393de7 SHA1 d243aba13292380acd071e3cb9185af5a3854140 SHA256 090927749d8e9c271a9fdd387dc1b71099b42593fbbbfeb3a4e21e1d903eafde -MD5 ec079ab3b68ff3e2ac0af6bf69f2e4d9 cryptsetup-luks-1.0.3-r2.ebuild 2167 -RMD160 d73618273a5a0bfd85f49a1e6bf479d70d393de7 cryptsetup-luks-1.0.3-r2.ebuild 2167 -SHA256 090927749d8e9c271a9fdd387dc1b71099b42593fbbbfeb3a4e21e1d903eafde cryptsetup-luks-1.0.3-r2.ebuild 2167 +EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2165 RMD160 ab29969c858e2523ab955dab595f766fb5e206d1 SHA1 9fc7c006433019a5c9e8a2c9281bf955b47499d5 SHA256 833677e3f597562c1994ad29097f12a93b50fde9a9537056457c63c7c1a0985a +MD5 38e2e3c5cbf28955c0efd9a4a454c11d cryptsetup-luks-1.0.3-r2.ebuild 2165 +RMD160 ab29969c858e2523ab955dab595f766fb5e206d1 cryptsetup-luks-1.0.3-r2.ebuild 2165 +SHA256 833677e3f597562c1994ad29097f12a93b50fde9a9537056457c63c7c1a0985a cryptsetup-luks-1.0.3-r2.ebuild 2165 EBUILD cryptsetup-luks-1.0.3-r3.ebuild 2501 RMD160 26b3819c326be2f8de409218a752bbf2e9ee0dfe SHA1 5797cfc05dbe0543b0365a7f2e0a0d40891cf2f9 SHA256 7853beb6728fb4ded96c3ff4439ecb3a5b81f8c77f59acbe2eb10951da655233 MD5 d71bdc0955c4b77ee4061100ae1cdb87 cryptsetup-luks-1.0.3-r3.ebuild 2501 RMD160 26b3819c326be2f8de409218a752bbf2e9ee0dfe cryptsetup-luks-1.0.3-r3.ebuild 2501 @@ -57,14 +64,18 @@ EBUILD cryptsetup-luks-1.0.4-r1.ebuild 2605 RMD160 2e37b32c41ee15c9120f154fab0fc MD5 f36c87aa5faa82b33e8e51c9b1773d0b cryptsetup-luks-1.0.4-r1.ebuild 2605 RMD160 2e37b32c41ee15c9120f154fab0fca5fbc048f91 cryptsetup-luks-1.0.4-r1.ebuild 2605 SHA256 20880e9fd0faeadb1ac41678487a74037ae9542de70fb489a2ef44e574c31f18 cryptsetup-luks-1.0.4-r1.ebuild 2605 +EBUILD cryptsetup-luks-1.0.4-r2.ebuild 2603 RMD160 4909e9f2a36056b9ae31afa286321f64924e5cbf SHA1 7951b5578c1ecd49a9e1cc37cdbb545b244143db SHA256 622ed75b3faf622d0e577a4fe1ad724e8e6f5d6d065052ab5ad6df208699082f +MD5 971f19c2fdc7c7ecdbb190691a8d6344 cryptsetup-luks-1.0.4-r2.ebuild 2603 +RMD160 4909e9f2a36056b9ae31afa286321f64924e5cbf cryptsetup-luks-1.0.4-r2.ebuild 2603 +SHA256 622ed75b3faf622d0e577a4fe1ad724e8e6f5d6d065052ab5ad6df208699082f cryptsetup-luks-1.0.4-r2.ebuild 2603 EBUILD cryptsetup-luks-1.0.4.ebuild 2557 RMD160 f0852837246003218baa1a691eb0d0fd7ff451f0 SHA1 23e3159c6c156b004f8611a7eb96413c2e2a03f3 SHA256 9d20d95029a8123d9dc20b05d028103205440aa972cebb39742395ba3a169df4 MD5 8aa10f77a53fabd16359c10bfe57f980 cryptsetup-luks-1.0.4.ebuild 2557 RMD160 f0852837246003218baa1a691eb0d0fd7ff451f0 cryptsetup-luks-1.0.4.ebuild 2557 SHA256 9d20d95029a8123d9dc20b05d028103205440aa972cebb39742395ba3a169df4 cryptsetup-luks-1.0.4.ebuild 2557 -MISC ChangeLog 6765 RMD160 ab7481b6fb801436899391e43152edd9b6289768 SHA1 2aa3012c5d8fefec223929d479f2859dc612b0e4 SHA256 785d2d161bcc3ad8d439ea2671c55c6ff41584a799c9952aba718719fd2f1f47 -MD5 1178626253bbf5929d4c0ddffcbc4626 ChangeLog 6765 -RMD160 ab7481b6fb801436899391e43152edd9b6289768 ChangeLog 6765 -SHA256 785d2d161bcc3ad8d439ea2671c55c6ff41584a799c9952aba718719fd2f1f47 ChangeLog 6765 +MISC ChangeLog 6993 RMD160 fb739be4733968cdfe99016386866d756262df2e SHA1 6fc7b89c62715a781e6377e00a303267676e4d10 SHA256 28fbef8cc6c6d11f00f50ced77a96328fb0a5b7b8bf92e9ce63267628019639d +MD5 4c5d1e21e66f1aef0724a63da4a317c2 ChangeLog 6993 +RMD160 fb739be4733968cdfe99016386866d756262df2e ChangeLog 6993 +SHA256 28fbef8cc6c6d11f00f50ced77a96328fb0a5b7b8bf92e9ce63267628019639d ChangeLog 6993 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228 @@ -87,3 +98,13 @@ SHA256 9c5d89e73392ea18152a5a4d7b1804ed6a57bb5309abfe23e4605210737f6ec9 files/di MD5 99aa86b96620381c73335d1bc21ddf77 files/digest-cryptsetup-luks-1.0.4-r1 268 RMD160 ba93465625d521cc777c1fbc352c3aec11786eff files/digest-cryptsetup-luks-1.0.4-r1 268 SHA256 9c5d89e73392ea18152a5a4d7b1804ed6a57bb5309abfe23e4605210737f6ec9 files/digest-cryptsetup-luks-1.0.4-r1 268 +MD5 99aa86b96620381c73335d1bc21ddf77 files/digest-cryptsetup-luks-1.0.4-r2 268 +RMD160 ba93465625d521cc777c1fbc352c3aec11786eff files/digest-cryptsetup-luks-1.0.4-r2 268 +SHA256 9c5d89e73392ea18152a5a4d7b1804ed6a57bb5309abfe23e4605210737f6ec9 files/digest-cryptsetup-luks-1.0.4-r2 268 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGHP6Ku7rWomwgFXoRAnQ9AKCD41ZMYae2Kso+OdmZYXznz4YbdQCgskaV +Zik4w0g1KvbbtcsxWvb7BmU= +=cCJ1 +-----END PGP SIGNATURE----- diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild index 78d4f363d64b..6c6e3ffa3956 100644 --- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild +++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.15 2006/09/26 20:06:14 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.16 2007/04/11 15:27:55 ikelos Exp $ inherit autotools linux-info eutils flag-o-matic multilib diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r2.ebuild new file mode 100644 index 000000000000..32e36e709692 --- /dev/null +++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r2.ebuild,v 1.1 2007/04/11 15:27:55 ikelos Exp $ + +inherit linux-info eutils flag-o-matic multilib + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="http://luks.endorphin.org/" +SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="build dynamic nls selinux" +RESTRICT="confcache" + +DEPEND=">=sys-fs/device-mapper-1.00.07-r1 + >=dev-libs/libgcrypt-1.1.42 + >=dev-libs/libgpg-error-1.0-r1 + >=dev-libs/popt-1.7 + selinux? ( sys-libs/libselinux ) + !sys-fs/cryptsetup" + +dm-crypt_check() { + local CONFIG_CHECK="~DM_CRYPT" + local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup-luks)" + check_extra_config + echo +} + +crypto_check() { + local CONFIG_CHECK="~CRYPTO" + local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup-luks)" + check_extra_config + echo +} + +cbc_check() { + local CONFIG_CHECK="~CRYPTO_CBC" + local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for Kernel 2.6.19)" + check_extra_config + echo +} + +pkg_setup() { + # Bug 148390 + if ! use build ; then + linux-info_pkg_setup + dm-crypt_check + crypto_check + cbc_check + fi +} + +src_compile() { + if use dynamic ; then + ewarn "If you need cryptsetup for an initrd or initramfs then you" + ewarn "should NOT use the dynamic USE flag" + epause 5 + fi + + econf \ + --sbindir=/sbin \ + $(use_enable !dynamic static) \ + --libdir=/usr/$(get_libdir) \ + $(use_enable nls) \ + $(use_enable selinux) \ + || die + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + rmdir "${D}"/usr/$(get_libdir)/cryptsetup + insinto /lib/rcscripts/addons + dosym /sbin/cryptsetup /bin/cryptsetup + newins "${FILESDIR}"/1.0.4-dm-crypt-start.sh dm-crypt-start.sh || die + newins "${FILESDIR}"/1.0.3-dm-crypt-stop.sh dm-crypt-stop.sh || die + newconfd "${FILESDIR}"/1.0.3-cryptfs.confd cryptfs || die +} + +pkg_postinst() { + ewarn "This ebuild introduces a new set of scripts and configuration" + ewarn "then the previous system. If you are currently using /etc/conf.d/crypfs" + ewarn "then you *MUST* read the new /etc/conf.d/cryptfs for instructions" + ewarn "on how to convert your previous cryptfs to the new syntax or your" + ewarn "encrypted partitions will *NOT* work." + einfo + einfo "Please see the example for configuring a LUKS mountpoint" + einfo "in /etc/conf.d/cryptfs" + einfo +} diff --git a/sys-fs/cryptsetup-luks/files/1.0.4-dm-crypt-start.sh b/sys-fs/cryptsetup-luks/files/1.0.4-dm-crypt-start.sh new file mode 100644 index 000000000000..01ff7905a076 --- /dev/null +++ b/sys-fs/cryptsetup-luks/files/1.0.4-dm-crypt-start.sh @@ -0,0 +1,236 @@ +# /lib/rcscripts/addons/dm-crypt-start.sh + +# For backwards compatability with baselayout < 1.13.0 +dm_crypt_execute_checkfs() { + dm_crypt_execute_volumes +} + +# Setup mappings for an individual target/swap +# Note: This relies on variables localized in the main body below. +dm_crypt_execute_volumes() { + local dev ret mode + # some colors + local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m' + + if [ -n "$target" ]; then + # let user set options, otherwise leave empty + : ${options:=' '} + elif [ -n "$swap" ]; then + target=${swap} + # swap contents do not need to be preserved between boots, luks not required. + # suspend2 users should have initramfs's init handling their swap partition either way. + : ${options:='-c aes -h sha1 -d /dev/urandom'} + : ${pre_mount:='mkswap ${dev}'} + else + return + fi + if [ -z "$source" ] && [ ! -e "$source" ]; then + ewarn "source \"${source}\" for ${target} missing, skipping..." + return + fi + + if [[ -n ${loop_file} ]] ; then + dev="/dev/mapper/${target}" + ebegin " Setting up loop device ${source}" + /sbin/losetup ${source} ${loop_file} + fi + + # cryptsetup: + # luksOpen # is $source + # create # is $target + local arg1="create" arg2="$target" arg3="$source" luks=0 + + cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; } + + if /bin/cryptsetup status ${target} | egrep -q '\/dev/null >/dev/null + if mount -n -o ro ${remdev} ${mntrem} 2>/dev/null >/dev/null ; then + sleep 2 + # keyfile exists? + if [ ! -e "${mntrem}${key}" ]; then + umount -n ${mntrem} 2>/dev/null >/dev/null + rmdir ${mntrem} 2>/dev/null >/dev/null + einfo "Cannot find ${key} on removable media." + echo -n -e " ${green}*${off} Abort?(${red}yes${off}/${green}no${off})" >/dev/console + read ans /dev/console + [ "$ans" != "yes" ] && { i=0; c=0; } || return + else + key="${mntrem}${key}" + break + fi + else + [ "$c" -eq 0 ] && einfo "Please insert removable device for ${target}" + c=1 + sleep 2 + # let user abort + if [ "$i" -eq 9 ]; then + rmdir ${mntrem} 2>/dev/null >/dev/null + einfo "Removable device for ${target} not present." + echo -n -e " ${green}*${off} Abort?(${red}yes${off}/${green}no${off})" >/dev/console + read ans /dev/console + [ "$ans" != "yes" ] && { i=0; c=0; } || return + fi + fi + done + else # keyfile ! on removable device + if [ ! -e "$key" ]; then + ewarn "${source} will not be decrypted ..." + einfo "Reason: keyfile ${key} does not exist." + return + fi + fi + ;; + *) + ewarn "${source} will not be decrypted ..." + einfo "Reason: mode ${mode} is invalid." + return + ;; + esac + else + mode=none + fi + splash svc_input_begin ${SVCNAME} >/dev/null 2>&1 + ebegin "dm-crypt map ${target}" + einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}" + if [ "$mode" == "gpg" ]; then + : ${gpg_options:='-q -d'} + # gpg available ? + if type -p gpg >/dev/null ; then + for (( i = 0 ; i < 3 ; i++ )) + do + # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. + # save stdin stdout stderr "values" + exec 3>&0 4>&1 6>&2 # ABS says fd 5 is reserved + exec &>/dev/console /dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3} + ret="$?" + # restore values and close file descriptors + exec 0>&3 1>&4 2>&6 + exec 3>&- 4>&- 6>&- + [ "$ret" -eq 0 ] && break + done + eend "${ret}" "failure running cryptsetup" + else + ewarn "${source} will not be decrypted ..." + einfo "Reason: cannot find gpg application." + einfo "You have to install app-crypt/gnupg first." + einfo "If you have /usr on its own partition, try copying gpg to /bin ." + fi + else + if [ "$mode" == "reg" ]; then + cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3} >/dev/console /dev/console /dev/null >/dev/null + rmdir ${mntrem} 2>/dev/null >/dev/null + fi + splash svc_input_end ${SVCNAME} >/dev/null 2>&1 + + if [[ ${ret} != 0 ]] ; then + cryptfs_status=1 + else + if [[ -n ${pre_mount} ]] ; then + dev="/dev/mapper/${target}" + ebegin " Running pre_mount commands for ${target}" + eval "${pre_mount}" > /dev/null + ewend $? || cryptfs_status=1 + fi + fi +} + +# Run any post_mount commands for an individual mount +# +# Note: This relies on variables localized in the main body below. +dm_crypt_execute_localmount() { + local mount_point + + [ -z "$target" ] && [ -z "$post_mount" ] && return + + if ! /bin/cryptsetup status ${target} | egrep -q '\/dev/null + eend $? || cryptfs_status=1 + fi +} + +local cryptfs_status=0 +local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev + +if [[ -f /etc/conf.d/cryptfs ]] && [[ -x /bin/cryptsetup ]] ; then + ebegin "Setting up dm-crypt mappings" + + while read targetline ; do + # skip comments and blank lines + [[ ${targetline}\# == \#* ]] && continue + + # check for the start of a new target/swap + case ${targetline} in + target=*|swap=*) + # If we have a target queued up, then execute it + dm_crypt_execute_${SVCNAME} + + # Prepare for the next target/swap by resetting variables + unset gpg_options key loop_file target options pre_mount post_mount source swap remdev + ;; + + gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*) + if [[ -z ${target} && -z ${swap} ]] ; then + ewarn "Ignoring setting outside target/swap section: ${targetline}" + continue + fi + ;; + + *) + ewarn "Skipping invalid line in /etc/conf.d/cryptfs: ${targetline}" + ;; + esac + + # Queue this setting for the next call to dm_crypt_execute_${SVCNAME} + eval "${targetline}" + done < /etc/conf.d/cryptfs + + # If we have a target queued up, then execute it + dm_crypt_execute_${SVCNAME} + + ewend ${cryptfs_status} "Failed to setup dm-crypt devices" +fi + +# vim:ts=4 diff --git a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r2 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r2 new file mode 100644 index 000000000000..5941fa96ba5e --- /dev/null +++ b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r2 @@ -0,0 +1,3 @@ +MD5 156ae6b618438ee9feeddc6c2bdc4e94 cryptsetup-luks-1.0.4.tar.bz2 306907 +RMD160 47737ab9302152a64f0e13b405c219d0166d8217 cryptsetup-luks-1.0.4.tar.bz2 306907 +SHA256 5ba6066d79443fce157b8b6081be466b4c04759cf5cd020b51a8f6cfc996e2a6 cryptsetup-luks-1.0.4.tar.bz2 306907 -- 2.26.2