Add sys-fs/cryptsetup-1.7.4, update README.md

5 files changed, 608 insertions, 0 deletions

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 65953720..a80efa85 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -7,9 +7,14 @@ AUX 1.1.0_rc3-static-no-selinux.patch 813 SHA256 7ec5067c5b05b478f45cdd35953827e
 AUX 1.1.3-dm-crypt-start.sh 8651 SHA256 1489ce5480d51beb81cf4f5178468ad4b2f2e4b3f53bc75ee8fe47d3e050a76a SHA512 4cd3e4c28f1c3da4b864c556873c2036854da78d0c3055f06ea8e2d359f16dc7020b4ebc2c0d4024dc557f51e923a919ecf384add07e92525d908efe4073af4d WHIRLPOOL b68eacec508861821c1573dd85b4fb1a5d909ab70ad8445997796cf328cd54c8a2363dfc54ae8da82b4d7e526df6938baab5332bd8cb2d1c095ac15e730541ae
 AUX 1.1.3-dm-crypt-stop.sh 1272 SHA256 c81bf0cf8e57b3f83f55c808dba619b0a0f60eef8c3ed406d266be7cecdf96f9 SHA512 ec184e988f3ab36c5f661cc4743edf8ce0798ff69e4e40df854c172eaf0bae264de10160ee098dbfb7814318b2cd875ea18e1b447789c7e08b9549b11db3f175 WHIRLPOOL cb0c1afb4929229dc7bdade5657f053192c72a6011fd0eb05ef1e649f6a31925a57e61913cbea208eb0b3e2547b8bbe37cecb4e343ba84722efe2affadfa12ca
 AUX 1.4.1-dmcrypt.rc 8942 SHA256 3868b61751d36cb57d14c02a0dcbae9ed76965f4409ca6a328a0378e40ba1ce0 SHA512 afd45faddb3cd2553f860963611644f2786d56a4688624c6922dd60f5b9e07c5fa0da2b4f256f0780a902b4e6bdf6456f14e0b64f2d76dda3813e397684c32bf WHIRLPOOL 955133032bcf5b1e9530fcae5afe84ce2a48195dfa647888e061c65a79b8e6689f25dddc9e6c95be3156acdc12507a2f4eaf42ded55d1c76dc857c322b40c943
+AUX 1.6.7-dmcrypt.confd 3919 SHA256 3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 WHIRLPOOL cdad077e6c542e93b766c023a7db9cde372609114a0d8333e94dbf281292a145dd2f96db2895dc7f6dd130ed193ebe254e13cff24e47430738e0fb4c6e38dc71
+AUX 1.6.7-dmcrypt.rc 8815 SHA256 d04627e1a64e4d86e957b20ff6f478fb376833b7602098a708af9c070e30a980 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194 WHIRLPOOL c7eb2e70bdcf59d5390f9551154ef2db67ce6cafc5dc24dcceef324eb1509661e5a639d880d40bcd2b09ebbda016802a6826c16a2ff7f0d9cbac622f61aebb1c
 AUX cryptsetup-1.0.6-udevsettle.patch 561 SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60 SHA512 74631c2aab95bd32a67dce1ae75ea30acdb167be78503a31ef8afbf178b651917cc65a37bafc5d6d60c1d3545664a2f53bf07885ba3ba86f562b12db17733228 WHIRLPOOL beb109875aa9579f05527d79a12eb0ebfd187853322accb70dc9e2a36e7ca4be881aa7f504f7573a040a64e0df777e70c4fbf31f79f29728c74cffaea8029d74
 AUX cryptsetup-1.4.1.ebuild.patch 1276 SHA256 15a397efaf11ecd51ff7ba716d60cdcbc58e34e888fc64961e1f2faf08b7fd45 SHA512 ce99b39c7a1bd4ea4d744ce2113a31317ac79377e37e393d87fd1876a30eac9eb4ddfec70cfaa6b3c384588dc3dc2a3a1c3f24e34ec587ecbc0e20d591c307d2 WHIRLPOOL 883ea22897f6956e038e6e815fe6ddce3c2f027be8c434a4026a435d87a72032d3a2d245054b3a1873bd15c8840ce7b41cc900c99f2a504862553c28777a879c
 AUX cryptsetup-1.4.3.ebuild.patch 1179 SHA256 e351b75dcb4c4c979745ad1d5255245ae832fac7becf88b50274b6622c37e121 SHA512 4f458d6a0304c70bdcdaaedb61c7dc5a986beb98e4892b643b6ca420b5918a032cd72b2a6adb923c9a88b4afcbb87ef23a24670f188d21b1130364bf75ecb752 WHIRLPOOL 3be03242a20292a6e517608fab24ab1d0d3dd4cddd4df3645ced9b65b312f0bc39a2cdcbbe70459993d2ef1ae70652f0ec686ab653fc287ca050d44f66379e2c
 AUX dmcrypt.rc 9336 SHA256 2cacfbe5b305c0ba9633764e79dfadd160e63ffb089f7347c0bca8c2ba9ec42f SHA512 0019cc0d0bb91c04b04949cdfb0126fdb04541ec4e76117760092e1287d4a4eb091ecbf643fb8e4346f226e6b01d8fe358f0f0e0221f31abc83415b5e235b17a WHIRLPOOL 527fbbebafcdd7e2e3687acdc59fb07e2fa26370508aa0758ca0deb6e12fcab789271b6733cdfd18381ddf55f606152febe6f1e4fdac26d1efd4206b7b219655
+AUX setup-1.7.0.py 788 SHA256 ef9fc9cc2b0ab065838adcb65e117e124e59686360fb033dd8c51632a8da1c69 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89 WHIRLPOOL 26d4d90a00a5be81b8cfadd0682d032be955b71c3c2707532a95aada423fdc52edde351af2addf307b602fcd51130dc95372dc1f11bbd80d51208a1b56010add
 DIST cryptsetup-1.4.1.tar.bz2 772971 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb SHA512 663e6d90a19ff64e2b37e4b7b14bfb3f6ccdbabf0598b3a7c4a79409c0075884dbc9e3d6f93a4298254fee2f47be98b040d2eced6890c5575db96aaee2d13e8d WHIRLPOOL 3d81e3a418459d8a7d3b86fc97deeadd39c242d83ececa64e8a06cf8f7c972952aea10e123422faa8087b24830c4f9c1f1fc2fe713a47c0909e01e70f48e250c
+DIST cryptsetup-1.7.4.tar.xz 1232068 SHA256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 WHIRLPOOL f00d0e529a5d34460733e8110584266b42011055d81d94b0ae8d47a1f11f1639c4b658a55415241e72c431c615d896a94ae444a518a0b56f971b888a5ab7cc09
 EBUILD cryptsetup-1.4.1.ebuild 3409 SHA256 955ebaee86858b98d6155a4dc5d148be909406e4005c4d2dcb463aca05fc99cf SHA512 92026743a9aa9968cec17c99d09edb1695625ec0859dc513bbc2c01b070dbbd8c6644d054d84765a3764ec027d3eb45359dd324e1e40e946a6da04a114f2d825 WHIRLPOOL 2e1181b0fdf4f6febd01a4009155676ad01c31c4fd67b4ac4028ca481ca5c780871005ca4ca80f2344d0b1247129d2284bf9702a8738b631525e34673a7576cb
+EBUILD cryptsetup-1.7.4.ebuild 4117 SHA256 cb47ec0af2eb0a549e6267d55d99b95d5c1881c28c2c79f1fbadaab177ed76f5 SHA512 8e3b8902b98fae9cbae50edcadaa6e059047b6c153426ed6c1b1fa618c1b45a02f583ca9cad0830c894b64c23b3aa7e98228e1ff65a0266ee2643f783f8a5294 WHIRLPOOL abd3155b277ec870d414c17130d85bc342c4cd42990c0ae0a636ea2a61baecf75da276433ca5249e51a00664a48125a4cd4b7d0d30199ea404ca62babff1d408
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
new file mode 100644
index 00000000..fc851331
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools distutils-r1 linux-info libtool eutils versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt sep-usr static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	sys-apps/util-linux[static-libs(+)]
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+#PATCHES=( )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	#epatch "${PATCHES[@]}"
+	epatch_user && eautoreconf
+
+	if use python ; then
+		cd python
+		cp "${FILESDIR}"/setup-1.7.0.py setup.py || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	# We disable autotool python integration so we can use eclasses
+	# for proper integration with multiple python versions.
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		--disable-python \
+		$(use_enable static static-cryptsetup) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable pwquality) \
+		$(use_enable reencrypt cryptsetup-reencrypt) \
+		$(use_enable udev) \
+		$(use_enable !urandom dev-random) \
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+
+	use python && cd python && distutils-r1_src_configure
+}
+
+src_compile() {
+	default
+	use python && cd python && distutils-r1_src_compile
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+	default
+}
+
+src_install() {
+	default
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+
+	if use sep-usr; then
+		# need the libs in /
+		gen_usr_ldscript -a cryptsetup
+	fi
+
+	prune_libtool_files --modules
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+
+	use python && cd python && distutils-r1_src_install
+}
diff --git a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd
new file mode 100644
index 00000000..642ff087
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd
@@ -0,0 +1,111 @@
+# /etc/conf.d/dmcrypt
+
+# For people who run dmcrypt on top of some other layer (like raid),
+# use rc_need to specify that requirement.  See the runscript(8) man
+# page for more information.
+
+#--------------------
+# Instructions
+#--------------------
+
+# Note regarding the syntax of this file.  This file is *almost* bash,
+# but each line is evaluated separately.  Separate swaps/targets can be
+# specified.  The init-script which reads this file assumes that a
+# swap= or target= line starts a new section, similar to lilo or grub
+# configuration.
+
+# Note when using gpg keys and /usr on a separate partition, you will
+# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
+# and ensure that gpg has been compiled statically.
+# See http://bugs.gentoo.org/90482 for more information.
+
+# Note that the init-script which reads this file detects whether your
+# partition is LUKS or not. No mkfs is run unless you specify a makefs
+# option.
+
+# Global options:
+#----------------
+
+# How long to wait for each timeout (in seconds).
+dmcrypt_key_timeout=1
+
+# Max number of checks to perform (see dmcrypt_key_timeout).
+#dmcrypt_max_timeout=300
+
+# Number of password retries.
+dmcrypt_retries=5
+
+# Arguments:
+#-----------
+# target=<name>                      == Mapping name for partition.
+# swap=<name>                        == Mapping name for swap partition.
+# source='<dev>'                     == Real device for partition.
+#                                    Note: You can (and should) specify a tag like UUID
+#                                    for blkid (see -t option).  This is safer than using
+#                                    the full path to the device.
+# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
+# remdev='<dev>'                     == Device that will be assigned to removable media.
+# gpg_options='<opts>'               == Default are --quiet --decrypt
+# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
+# loop_file='<file>'                 == Loopback file.
+#                                    Note: If you omit $source, then a free loopback will
+#                                    be looked up automatically.
+# pre_mount='cmds'                   == commands to execute before mounting partition.
+# post_mount='cmds'                  == commands to execute after mounting partition.
+#-----------
+# Supported Modes
+# gpg					== decrypt and pipe key into cryptsetup.
+#						Note: new-line character must not be part of key.
+#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
+
+#--------------------
+# dm-crypt examples
+#--------------------
+
+## swap
+# Swap partitions. These should come first so that no keys make their
+# way into unencrypted swap.
+# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
+# If no makefs is given then mkswap will be assumed
+#swap=crypt-swap
+#source='/dev/hda2'
+
+## /home with passphrase
+#target=crypt-home
+#source='/dev/hda5'
+
+## /home with regular keyfile
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+
+## /home with gpg protected key
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+
+## /home with regular keyfile on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+#remdev='/dev/sda1'
+
+## /home with gpg protected key on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+#remdev='/dev/sda1'
+
+## /tmp with regular keyfile
+#target=crypt-tmp
+#source='/dev/hda6'
+#key='/full/path/to/tmpkey'
+#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
+#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
+
+## Loopback file example
+#target='crypt-loop-home'
+#source='/dev/loop0'
+#loop_file='/mnt/crypt/home'
+
+# The file must be terminated by a newline.  Or leave this comment last.
diff --git a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
new file mode 100644
index 00000000..cdd20ba9
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
@@ -0,0 +1,339 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before checkfs fsck
+
+	if grep -qs ^swap= "${conf_file}" ; then
+		before swap
+	fi
+}
+
+# We support multiple dmcrypt instances based on $SVCNAME
+conf_file="/etc/conf.d/${SVCNAME}"
+
+# Get splash helpers if available.
+if [ -e /sbin/splash-functions.sh ] ; then
+	. /sbin/splash-functions.sh
+fi
+
+# Setup mappings for an individual target/swap
+# Note: This relies on variables localized in the main body below.
+dm_crypt_execute() {
+	local dev ret mode foo
+
+	if [ -z "${target}" -a -z "${swap}" ] ; then
+		return
+	fi
+
+	# Set up default values.
+	: ${dmcrypt_key_timeout:=1}
+	: ${dmcrypt_max_timeout:=300}
+	: ${dmcrypt_retries:=5}
+
+	# Handle automatic look up of the source path.
+	if [ -z "${source}" -a -n "${loop_file}" ] ; then
+		source=$(losetup --show -f "${loop_file}")
+	fi
+	case ${source} in
+	*=*)
+		source=$(blkid -l -t "${source}" -o device)
+		;;
+	esac
+	if [ -z "${source}" ] || [ ! -e "${source}" ] ; then
+		ewarn "source \"${source}\" for ${target} missing, skipping..."
+		return
+	fi
+
+	if [ -n "${target}" ] ; then
+		# let user set options, otherwise leave empty
+		: ${options:=' '}
+	elif [ -n "${swap}" ] ; then
+		if cryptsetup isLuks ${source} 2>/dev/null ; then
+			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
+			return
+		fi
+		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}'}
+	fi
+
+	if [ -n "${loop_file}" ] ; then
+		dev="/dev/mapper/${target}"
+		ebegin "  Setting up loop device ${source}"
+		losetup ${source} ${loop_file}
+	fi
+
+	# cryptsetup:
+	# open   <device> <name>      # <device> is $source
+	# create <name>   <device>    # <name>   is $target
+	local arg1="create" arg2="${target}" arg3="${source}"
+	if cryptsetup isLuks ${source} 2>/dev/null ; then
+		arg1="open"
+		arg2="${source}"
+		arg3="${target}"
+	fi
+
+	# Older versions reported:
+	#	${target} is active:
+	# Newer versions report:
+	#	${target} is active[ and is in use.]
+	if cryptsetup status ${target} | egrep -q ' is active' ; then
+		einfo "dm-crypt mapping ${target} is already configured"
+		return
+	fi
+	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
+
+	# Handle keys
+	if [ -n "${key}" ] ; then
+		read_abort() {
+			# some colors
+			local ans savetty resettty
+			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
+			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
+			shift
+			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
+			# we end up having to implement our own crap with stty/etc...
+			savetty=$(stty -g)
+			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
+			trap 'eval "${resettty}"' EXIT HUP INT TERM
+			stty -icanon
+			stty min 0 time "$(( $2 * 10 ))"
+			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
+			eval "${resettty}"
+			if [ -z "${ans}" ] ; then
+				printf '\r'
+			else
+				echo
+			fi
+			case ${ans} in
+				[yY]) return 0;;
+				*) return 1;;
+			esac
+		}
+
+		# Notes: sed not used to avoid case where /usr partition is encrypted.
+		mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
+		key=${key%:*}
+		case "${mode}" in
+		gpg|reg)
+			# handle key on removable device
+			if [ -n "${remdev}" ] ; then
+				# temp directory to mount removable device
+				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
+				if [ ! -d "${mntrem}" ] ; then
+					if ! mkdir -p "${mntrem}" ; then
+						ewarn "${source} will not be decrypted ..."
+						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
+						return
+					fi
+				fi
+				i=0
+				einfo "Please insert removable device for ${target}"
+				while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do
+					foo=""
+					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
+						# keyfile exists?
+						if [ ! -e "${mntrem}${key}" ] ; then
+							umount -n "${mntrem}"
+							rmdir "${mntrem}"
+							einfo "Cannot find ${key} on removable media."
+							read_abort "Abort" ${dmcrypt_key_timeout} && return
+						else
+							key="${mntrem}${key}"
+							break
+						fi
+					else
+						[ -e "${remdev}" ] \
+							&& foo="mount failed" \
+							|| foo="mount source not found"
+					fi
+					: $((i += 1))
+					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
+				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
+	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
+	if [ "${mode}" = "gpg" ] ; then
+		: ${gpg_options:='-q -d'}
+		# gpg available ?
+		if command -v gpg >/dev/null ; then
+			i=0
+			while [ ${i} -lt ${dmcrypt_retries} ] ; do
+				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
+				# save stdin stdout stderr "values"
+				timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \
+					cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3}
+				ret=$?
+				# The timeout command exits 124 when it times out.
+				[ ${ret} -eq 0 -o ${ret} -eq 124 ] && break
+				: $(( i += 1 ))
+			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}
+			ret=$?
+			eend ${ret} "failure running cryptsetup"
+		else
+			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
+			ret=$?
+			eend ${ret} "failure running cryptsetup"
+		fi
+	fi
+	if [ -d "${mntrem}" ] ; then
+		umount -n ${mntrem} 2>/dev/null >/dev/null
+		rmdir ${mntrem} 2>/dev/null >/dev/null
+	fi
+	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
+
+	if [ ${ret} -ne 0 ] ; then
+		cryptfs_status=1
+	else
+		if [ -n "${pre_mount}" ] ; then
+			dev="/dev/mapper/${target}"
+			eval ebegin \""    pre_mount: ${pre_mount}"\"
+			eval "${pre_mount}" > /dev/null
+			ewend $? || cryptfs_status=1
+		fi
+	fi
+}
+
+# Lookup optional bootparams
+get_bootparam_val() {
+	# We're given something like:
+	#    foo=bar=cow
+	# Return the "bar=cow" part.
+	case $1 in
+	*=*)
+		echo "${1#*=}"
+		;;
+	esac
+}
+
+start() {
+	local header=true cryptfs_status=0
+	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
+
+	local x
+	for x in $(cat /proc/cmdline) ; do
+		case "${x}" in
+		key_timeout=*)
+			dmcrypt_key_timeout=$(get_bootparam_val "${x}")
+			;;
+		esac
+	done
+
+	while read targetline <&3 ; do
+		case ${targetline} in
+		# skip comments and blank lines
+		""|"#"*) continue ;;
+		# skip service-specific openrc configs #377927
+		rc_*) continue ;;
+		esac
+
+		${header} && ebegin "Setting up dm-crypt mappings"
+		header=false
+
+		# 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
+
+			# 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}${swap}" ] ; then
+				ewarn "Ignoring setting outside target/swap section: ${targetline}"
+				continue
+			fi
+			;;
+
+		dmcrypt_*=*)
+			# ignore global options
+			continue
+			;;
+
+		*)
+			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
+			;;
+		esac
+
+		# Queue this setting for the next call to dm_crypt_execute
+		eval "${targetline}"
+	done 3< ${conf_file}
+
+	# If we have a target queued up, then execute it
+	dm_crypt_execute
+
+	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
+}
+
+stop() {
+	local line header
+
+	# Break down all mappings
+	header=true
+	egrep "^(target|swap)=" ${conf_file} | \
+	while read line ; do
+		${header} && einfo "Removing dm-crypt mappings"
+		header=false
+
+		target= swap=
+		eval ${line}
+
+		[ -n "${swap}" ] && target=${swap}
+		if [ -z "${target}" ] ; then
+			ewarn "invalid line in ${conf_file}: ${line}"
+			continue
+		fi
+
+		ebegin "  ${target}"
+		cryptsetup remove ${target}
+		eend $?
+	done
+
+	# Break down loop devices
+	header=true
+	grep '^source=./dev/loop' ${conf_file} | \
+	while read line ; do
+		${header} && einfo "Detaching dm-crypt loop devices"
+		header=false
+
+		source=
+		eval ${line}
+
+		ebegin "  ${source}"
+		losetup -d "${source}"
+		eend $?
+	done
+
+	return 0
+}
diff --git a/sys-fs/cryptsetup/files/setup-1.7.0.py b/sys-fs/cryptsetup/files/setup-1.7.0.py
new file mode 100644
index 00000000..0da063c0
--- /dev/null
+++ b/sys-fs/cryptsetup/files/setup-1.7.0.py
@@ -0,0 +1,21 @@
+import os
+from distutils.core import setup, Extension
+
+top_srcdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+
+def get_ver():
+    with open(os.path.join(top_srcdir, 'configure')) as f:
+        for line in f:
+            if line.startswith('PACKAGE_VERSION='):
+                return line.split('=')[1].replace("'", '').strip()
+
+module = Extension('pycryptsetup',
+                   include_dirs=[os.path.join(top_srcdir, 'lib')],
+                   extra_compile_args=['-include', os.path.join(top_srcdir, 'config.h')],
+                   library_dirs=[os.path.join(top_srcdir, 'lib', '.libs')],
+                   libraries=['cryptsetup'],
+                   sources=['pycryptsetup.c'])
+
+setup(name='pycryptsetup',
+      version=get_ver(),
+      ext_modules=[module])