Push out updated addon to fix baselayout-1 support #350399 by Manuel Danisch.

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

4 files changed, 121 insertions, 8 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 378e31f247f8..002f4af3a3d1 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2011/01/08 00:53:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.106 2011/01/08 01:03:23 vapier Exp $
+
+*cryptsetup-1.1.3-r2 (08 Jan 2011)
+
+  08 Jan 2011; Mike Frysinger <vapier@gentoo.org>
+  files/1.1.3-dm-crypt-start.sh, +cryptsetup-1.1.3-r2.ebuild:
+  Push out updated addon to fix baselayout-1 support #350399 by Manuel
+  Danisch.
 
   08 Jan 2011; Mike Frysinger <vapier@gentoo.org>
   files/1.1.3-dm-crypt-start.sh:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 569d40e6630d..b8ad8096fdaa 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,10 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX 1.0.6-dmcrypt.confd 3309 RMD160 23a1a91ae2b2fd4d743bf8e0427cf40e4b24ecd8 SHA1 a4bd74df103227c0aaa1cfcd75908f16c67f843a SHA256 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271
 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 8131 RMD160 f81286cbd07155c743fd679c19e531ff3a228461 SHA1 e67d2bd2df95ad098cc67a5bbeba7da4426d4014 SHA256 f671be89b8d0d005dfc4aadc6d9a9a3bf80e720d54574515632d63ac8dd27ab7
+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 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
@@ -13,8 +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-r1.ebuild 3150 RMD160 d32aa2f002e40e247115d09248c00837c4d34167 SHA1 bfad8f741e3d83f2b09bf8b3b249f5b9cd6cd1e0 SHA256 7af9cbf04a6f58402d363f52f72d01d8641c4bbebb3df15aa29fb959dce11535
-EBUILD cryptsetup-1.1.3.ebuild 3397 RMD160 40eab87e9d566cf807d7d7c1d274cb82a3f19812 SHA1 0bcbb75cf10c9221432b8aae34d67993bbe74ea3 SHA256 1270c0f6df14ffb46cb97760863743160ae1520e18c133a2969661e9a3b1d1e4
-EBUILD cryptsetup-1.2.0-r1.ebuild 3107 RMD160 b9e87ec38437139031dfe8900cdf9a6ed80e8bbb SHA1 4d53bb76dbd051c339f800acf5b5f5043210795f SHA256 3f069e0f40397461c26c47345cd1026a1a600a4ddb8e5846aac16671ab555703
-MISC ChangeLog 14888 RMD160 80c05042cc4e62f3a7c912c3ec7436ce5fc07dba SHA1 57467be12506ff74031148d58fdc1de7dbb63e28 SHA256 05441232363d0b64c975acb06fd9cae0ded4e09542d4bd2638e1d52ffb650854
+EBUILD cryptsetup-1.1.3-r2.ebuild 3150 RMD160 c0da57a657ee5c6675d17f9bdc5602469dab0ee8 SHA1 7f558257ae24ec12bfae497081433998c01e9958 SHA256 db3e5b794d7e2ea487ad49d0befefdb48e75fd8178cf6ec932ebcf70abd1922d
+EBUILD cryptsetup-1.2.0-r1.ebuild 3323 RMD160 f60b7fdda559e38d9971dd51c4b4a93ae47a78a9 SHA1 fe508623919bacbbd95b6eaf5b28e2470c145113 SHA256 0c2b473e5bd5834d0baa8f8e96d21486e042cce2c8a258be985f76943e4df5aa
+MISC ChangeLog 15433 RMD160 5d84b49e1e38b34374bf894aac6e6d61a6420423 SHA1 d0eccd47f9f27167a07c416b1dadc53b3cfa8f97 SHA256 c4bfc849cf3d557b420d8c1a47dd4eaf946a31e082e57ccf35f4fa6adc796caa
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk0nuGgACgkQaC/OocHi7Jac/AD8D6dwxKP4ysfulL/b8/+C9eL8
+lEx327XkdBXSuyFuuGkA/3zHHFbZrpwx1HOaVtmAxFNudCQ93hqkbQANANGDHb49
+=vNua
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..9054de491e6b
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.3-r2.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-r2.ebuild,v 1.1 2011/01/08 01:03:23 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 49bf9e16771b..536f3dfaa944 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,7 +1,13 @@
 # /lib/rcscripts/addons/dm-crypt-start.sh
 
-# For backwards compatability with baselayout < 1.13.0
-: ${SVCNAME:=${myservice}} #174256
+# 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
 }