Push out updated addon to fix baselayout-2 support #350399 by Martin Kolleck.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 142 insertions, 36 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index e267545dd7cf..4586ee0e10d8 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.107 2011/01/08 21:31:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.108 2011/01/12 23:36:42 vapier Exp $
+
+*cryptsetup-1.1.3-r3 (12 Jan 2011)
+
+  12 Jan 2011; Mike Frysinger <vapier@gentoo.org>
+  files/1.1.3-dm-crypt-start.sh, +cryptsetup-1.1.3-r3.ebuild,
+  files/1.1.3-dm-crypt-stop.sh:
+  Push out updated addon to fix baselayout-2 support #350399 by Martin
+  Kolleck.
 
   08 Jan 2011; Markus Meier <maekke@gentoo.org> cryptsetup-1.1.3-r2.ebuild:
   arm stable, bug #350044
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 491d30c600cd..5e9cd258e818 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
 AUX 1.0.5-dmcrypt.rc 660 RMD160 f1af3b07db2eaf938fd21b8ef4b23068f2fac78a SHA1 c297587c68d84611a8fec444d3a98443105efee7 SHA256 11518d0d26572b07f43e7ad69f638e93546656b9f14b647d9825ab8b4619906d
@@ -7,8 +7,8 @@ AUX 1.0.6-dmcrypt.confd 3309 RMD160 23a1a91ae2b2fd4d743bf8e0427cf40e4b24ecd8 SHA
 AUX 1.0.6-r2-dm-crypt-start.sh 8092 RMD160 d61f1cf13e75c105065f8ca6c6a9afe12eedbcaa SHA1 fc4b6580063cd3758ada2d1ddfced3e005c8fabf SHA256 56004bef91b8fad57fe67fec19427dd7c48e01c8e1ba7ff60f8c370295775fdc
 AUX 1.1.0-libudev.patch 964 RMD160 362e8bf35a2f6c022404f515811befa80121e779 SHA1 fd70e437a50a04ee6b37e8c36cee75aa9fa59e8c SHA256 02529608ee3743ada736ae3a6205c363cb1777ca5d72c5824287ec99fe9fe5f7
 AUX 1.1.0_rc3-static-no-selinux.patch 813 RMD160 a9e476edd9bfe12e4663962198e3ed28f43877a3 SHA1 f26e3e356848d098c70f0857a04945fb264ae844 SHA256 7ec5067c5b05b478f45cdd35953827e4696011104f533b3339d18c4becc1985a
-AUX 1.1.3-dm-crypt-start.sh 8352 RMD160 e602e6f1616a7f86bc0d28943bdc0e7a53e1cda0 SHA1 e7c8031a53fd7abd87179632cedb6b038adc46d4 SHA256 f5cfe9b9e9a13025aa45c896c04e96d9ba03f7b9c3c1bf73895caac24385bcf5
-AUX 1.1.3-dm-crypt-stop.sh 1107 RMD160 6920a2f701f7c80adafa6a10918e51d896867faa SHA1 81ece35ca41bae4d1737c706de1b07cc8a530773 SHA256 497c381871d38de1d47052c08c89e42b9489784c5f878472303a4bdaf402e450
+AUX 1.1.3-dm-crypt-start.sh 8559 RMD160 31eb847cdffae59d6106640d903d4a4868b8733b SHA1 3997577a46268bb42cfe636a1c6ab95957d38678 SHA256 b071aa4fd11ae5ee848d6d4d4cef66fe7ccc5fd4a2c8e709c2be74f7f3dfbaf3
+AUX 1.1.3-dm-crypt-stop.sh 1272 RMD160 f91d025777670423d572018a08429805b828688f SHA1 c91e44f75231554c8129b7c3538eae2850ba67b9 SHA256 c81bf0cf8e57b3f83f55c808dba619b0a0f60eef8c3ed406d266be7cecdf96f9
 AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
 DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
@@ -16,14 +16,14 @@ DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f2
 DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
-EBUILD cryptsetup-1.1.3-r2.ebuild 3149 RMD160 cd65e032a03f33575ce221aca7298d8d8fd91c63 SHA1 8f0e0d1c55739be912cedf12b06018943db4fa21 SHA256 7753c5f3df36e2be15181f76bdc60f18b87ca2cb9e66359efe89a673663e5171
+EBUILD cryptsetup-1.1.3-r3.ebuild 3149 RMD160 cc0f623d0e0e9f8a0f03790410374950ce4d1e87 SHA1 c640988703966d2d406abb4cfa53f8d630894d43 SHA256 ab314f0503db7d5b34a3f6c7b6836c2d3d94e7afbae2aaa23a8947f8e9d741fd
 EBUILD cryptsetup-1.2.0-r1.ebuild 3323 RMD160 f60b7fdda559e38d9971dd51c4b4a93ae47a78a9 SHA1 fe508623919bacbbd95b6eaf5b28e2470c145113 SHA256 0c2b473e5bd5834d0baa8f8e96d21486e042cce2c8a258be985f76943e4df5aa
-MISC ChangeLog 15536 RMD160 8f3772e89c8ce8097d4deccadf45bf9bac6b67be SHA1 d502d9613aea8ba9d6350a5f3842f13f9ed9a47b SHA256 d04045705d7cc55c4288703171d12fae3c27e5c06e64cd69313c63edddf0afd6
+MISC ChangeLog 15799 RMD160 8140ada2a6f07fe610c6c6c85fc960f179dc31ed SHA1 45cc5f421135301b38c3ea46e33725452da94f34 SHA256 8daaaa190ceffae1830230d4aba23b6e51454eb592c19e82c54dd70796c7213d
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0o2B4ACgkQkKaRLQcq0GLyBgCeJ3YF0K283zqXCdr5YDipz4Up
-LgYAoK4rTuK4xg3IfMyunnwqkjQPrh4a
-=6nHk
+iF4EAREIAAYFAk0uOyAACgkQaC/OocHi7JbDigEAnnRU0sv2TomqOC9jOQlnyBp5
++/VeBuCdiMHNh7DZ1cUA/jwCNzZR23d/sCIg4oOjN+w6kZhrACbSqnn02k9HLyBE
+=zkzs
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..c74f8132407a
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.1 2011/01/12 23:36:42 vapier Exp $
+
+EAPI="2"
+
+inherit linux-info eutils multilib libtool
+
+MY_P=${P/_rc/-rc}
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://code.google.com/p/cryptsetup/"
+SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="dynamic nls selinux"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=sys-fs/lvm2-2.02.64
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libgpg-error-1.0-r1
+	>=dev-libs/popt-1.7
+	>=sys-fs/udev-124
+	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
+	selinux? ( sys-libs/libselinux )
+	!sys-fs/cryptsetup-luks"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\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
+
+	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
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable !dynamic static) \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable nls) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc TODO ChangeLog # README NEWS # last ones are empty
+
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
+	newins "${FILESDIR}"/1.1.3-dm-crypt-stop.sh dm-crypt-stop.sh || die
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
+	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
+}
+
+pkg_postinst() {
+	ewarn "This ebuild introduces a new set of scripts and configuration"
+	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
+	ewarn "then you *MUST* copy your old file to:"
+	ewarn "/etc/conf.d/dmcrypt"
+	ewarn "Or your encrypted partitions will *NOT* work."
+	elog "Please see the example for configuring a LUKS mountpoint"
+	elog "in /etc/conf.d/dmcrypt"
+	elog
+	elog "If you are using baselayout-2 then please do:"
+	elog "rc-update add dmcrypt boot"
+	elog "This version introduces a command line arguement 'key_timeout'."
+	elog "If you want the search for the removable key device to timeout"
+	elog "after 10 seconds add the following to your bootloader config:"
+	elog "key_timeout=10"
+	elog "A timeout of 0 will mean it will wait indefinitely."
+	elog
+	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
+	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
+	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
+	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
+
+}
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
index 536f3dfaa944..c78f0bcaedaf 100644
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
+++ b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
@@ -1,20 +1,19 @@
 # /lib/rcscripts/addons/dm-crypt-start.sh
 
-# For backwards compatability with baselayout < 1.13.0 #174256
-if [[ -z ${SVCNAME} ]] ; then
-	case ${myservice} in
-		""|checkfs|localmount) SVCNAME=dmcrypt ;;
-		*) SVCNAME=${myservice} ;;
-	esac
-fi
-
-dm_crypt_execute_checkfs() {
-	dm_crypt_execute_dmcrypt
-}
-
-dm_crypt_execute_volumes() {
-	dm_crypt_execute_dmcrypt
-}
+# For backwards compatibility with baselayout < 1.13.0 #174256
+: ${SVCNAME:=${myservice}}
+
+# We might be hooked into init.d scripts (ala baselayout-1), or we might
+# be a standalone dmcrypt script.  We support multiple dmcrypt instances,
+# but they must start with "dmcrypt." to be detected that way.  It keeps
+# our lives much simpler with this multiplexed arrangement.
+execute_hook="dm_crypt_execute_dmcrypt"
+conf_file="dmcrypt"
+case ${SVCNAME} in
+	localmount) execute_hook="dm_crypt_execute_localmount" ;;
+	dmcrypt.*)  conf_file="${SVCNAME}" ;;
+esac
+conf_file="/etc/conf.d/${conf_file}"
 
 # Setup mappings for an individual target/swap
 # Note: This relies on variables localized in the main body below.
@@ -260,7 +259,7 @@ do
 	esac
 done
 
-if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then
+if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then
 	ebegin "Setting up dm-crypt mappings"
 
 	while read -u 3 targetline ; do
@@ -271,7 +270,7 @@ if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then
 		case ${targetline} in
 			target=*|swap=*)
 				# If we have a target queued up, then execute it
-				dm_crypt_execute_${SVCNAME%.*}
+				${execute_hook}
 
 				# Prepare for the next target/swap by resetting variables
 				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
@@ -290,16 +289,16 @@ if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then
 				;;
 
 			*)
-				ewarn "Skipping invalid line in /etc/conf.d/${SVCNAME}: ${targetline}"
+				ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
 				;;
 		esac
 
-		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME%.*}
+		# Queue this setting for the next call to dm_crypt_execute_xxx
 		eval "${targetline}"
-	done 3< /etc/conf.d/${SVCNAME}
+	done 3< ${conf_file}
 
 	# If we have a target queued up, then execute it
-	dm_crypt_execute_${SVCNAME%.*}
+	${execute_hook}
 
 	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
 fi
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
index 138688bced2e..548269c0ae3b 100644
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
+++ b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
@@ -1,15 +1,23 @@
 # /lib/rcscripts/addons/dm-crypt-stop.sh
 
-# Fix for baselayout-1.12.10 (bug 174256)
+# For backwards compatibility with baselayout < 1.13.0 #174256
 : ${SVCNAME:=${myservice}}
 
+# See notes in dm-crypt-start.sh
+execute_hook="dm_crypt_execute_dmcrypt"
+conf_file="dmcrypt"
+case ${SVCNAME} in
+	dmcrypt.*)  conf_file="${SVCNAME}" ;;
+esac
+conf_file="/etc/conf.d/${conf_file}"
+
 # Try to remove any dm-crypt mappings
 csetup=/sbin/cryptsetup
-if [ -f /etc/conf.d/${SVCNAME} ] && [ -x "$csetup" ]
+if [ -f ${conf_file} ] && [ -x "$csetup" ]
 then
 	einfo "Removing dm-crypt mappings"
 
-	/bin/egrep "^(target|swap)" /etc/conf.d/${SVCNAME} | \
+	/bin/egrep "^(target|swap)" ${conf_file} | \
 	while read targetline
 	do
 		target=
@@ -18,16 +26,16 @@ then
 		eval ${targetline}
 
 		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/${SVCNAME}: ${targetline}"
+		[ -z "${target}" ] && ewarn "Invalid line in ${conf_file}: ${targetline}"
 
 		ebegin "Removing dm-crypt mapping for: ${target}"
 		${csetup} remove ${target}
 		eend $? "Failed to remove dm-crypt mapping for: ${target}"
 	done
 
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/${SVCNAME}) ]] ; then
+	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" ${conf_file}) ]] ; then
 		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" /etc/conf.d/${SVCNAME} | while read sourceline
+		/bin/egrep -e "^(source)" ${conf_file} | while read sourceline
 		do
 			source=
 			eval ${sourceline}