Version bump #412795 by Manuel Rüger (mrueg). Replace `read -t` with stty hacks by Martin Väth #255528.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 143 insertions, 23 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 6901e8bbf829..f42237c4370c 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.133 2012/05/11 08:31:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.134 2012/05/11 08:33:01 vapier Exp $
+
+*cryptsetup-1.4.2 (11 May 2012)
+
+  11 May 2012; Mike Frysinger <vapier@gentoo.org> +cryptsetup-1.4.2.ebuild,
+  files/dmcrypt.rc:
+  Version bump #412795 by Manuel Rüger (mrueg).  Replace `read -t` with stty
+  hacks by Martin Väth #255528.
 
   11 May 2012; Mike Frysinger <vapier@gentoo.org> +files/1.4.1-dmcrypt.rc,
   cryptsetup-1.4.1.ebuild, cryptsetup-1.4.1-r1.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 68bb39b974d6..1fc90f9028e4 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -9,35 +9,38 @@ AUX 1.1.0-libudev.patch 964 RMD160 362e8bf35a2f6c022404f515811befa80121e779 SHA1
 AUX 1.1.0_rc3-static-no-selinux.patch 813 RMD160 a9e476edd9bfe12e4663962198e3ed28f43877a3 SHA1 f26e3e356848d098c70f0857a04945fb264ae844 SHA256 7ec5067c5b05b478f45cdd35953827e4696011104f533b3339d18c4becc1985a
 AUX 1.1.3-dm-crypt-start.sh 8651 RMD160 618342317373f3a19f200addfb2e528ced25e9e3 SHA1 ea59b43866a7799d081d628eaed624323a6fa16c SHA256 1489ce5480d51beb81cf4f5178468ad4b2f2e4b3f53bc75ee8fe47d3e050a76a
 AUX 1.1.3-dm-crypt-stop.sh 1272 RMD160 f91d025777670423d572018a08429805b828688f SHA1 c91e44f75231554c8129b7c3538eae2850ba67b9 SHA256 c81bf0cf8e57b3f83f55c808dba619b0a0f60eef8c3ed406d266be7cecdf96f9
+AUX 1.4.1-dmcrypt.rc 8942 RMD160 1f5379c72e6b61703e9521c723014645f2e8ba5c SHA1 1c5a444224c258ca2bab94173f3cb9d88342995d SHA256 3868b61751d36cb57d14c02a0dcbae9ed76965f4409ca6a328a0378e40ba1ce0
 AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
-AUX dmcrypt.rc 8936 RMD160 3cd098cf77b3f7a7aa1c04469018be19541f9cea SHA1 bfb68b4b412a20d5c9e0f3a389b0a4b8271dea78 SHA256 eb478782e757d18dc612e70da6a175defd3e8830e79e604de26ef857de67594e
+AUX dmcrypt.rc 9336 RMD160 bb7d5cc57cb8bdb8d0e23f0ff0a7fae639ed2058 SHA1 80a59ace52288ad60ad6026ec2d18b2412842e3a SHA256 2cacfbe5b305c0ba9633764e79dfadd160e63ffb089f7347c0bca8c2ba9ec42f
 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
 DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
 DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
 DIST cryptsetup-1.4.1.tar.bz2 772971 RMD160 4c8a7e1a3a7bd7f2d52591c1b8de21a31edeb780 SHA1 32608be5b146a7bd3999129b086bad8b66c085b9 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
+DIST cryptsetup-1.4.2.tar.bz2 787016 RMD160 abb8daee54b76f752ce36274954333217d57d584 SHA1 7fa3fa89fe7904ffdd42d6031014cd819fbc8e7c SHA256 1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7
 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-r3.ebuild 3467 RMD160 5a95d64bff7d3dafe21ea0176456abea73319b51 SHA1 e60b7e828697ff8ec380f9b84e716e166a553ba5 SHA256 f8785d631199f73b31abeebc9a5dd335a07c124f1688557953b89be462d7b48e
 EBUILD cryptsetup-1.2.0-r1.ebuild 3693 RMD160 c03f9fad5e18fb9ae52dadba7427ba8e1eb08ac4 SHA1 684ae967abbf890fc1c61c44f7ae7b4e37955b5e SHA256 a579ec17a8d09d5ed5a3d1d79b8cedf499783fcbfcb0d1cb179c1e991eb12360
-EBUILD cryptsetup-1.4.1-r1.ebuild 3295 RMD160 6c2f9ff926beaa2adbc0ca4dbac47261d089c44b SHA1 e0625a0a967c7f493d89ec5a5c720c0463c3d379 SHA256 67a6390f191a0b6dd25e741b3dfd11a4faa6d40d24ab4f303191e0eb591701f5
-EBUILD cryptsetup-1.4.1.ebuild 3389 RMD160 e503d6ce6a64cb51725bbfec9ee32c225cb699ad SHA1 8e6f588da37c44b613612c815f230e5e8158e480 SHA256 04da047c80e7292f4e451aa8dc30bf9ec0122a76238960a1f3cfdfbae9f50f83
-MISC ChangeLog 19642 RMD160 30fb972ef2408290d5345a35e7d456c84f274e9e SHA1 827ef38e1e991499d684b33a55e3013e96b38ff2 SHA256 3cc32a42f0c1d124d0aad8c9e86b3fe85e829ec524e6ad2251f0228cd9998079
+EBUILD cryptsetup-1.4.1-r1.ebuild 3301 RMD160 647490023744eec3086844ce585c7015ab10c53c SHA1 ff88da1634eb173e96a835444a5557b40ddb665d SHA256 4542b703622c0852a152f806251728019847b14ec59c99f9407898fcdf6158c7
+EBUILD cryptsetup-1.4.1.ebuild 3394 RMD160 7f934640d0b47ca697a20de781718e3ca67b4628 SHA1 9c72ae3ad0788f22b2cb41c601c3f45e58b0d46b SHA256 bd70f5ec5f0bb7c2dfa36a966160a2d8595cb8539e7c8f5305fe2e1028a28ac3
+EBUILD cryptsetup-1.4.2.ebuild 3377 RMD160 52d7ba4871256f9fc43d473b7f2bd5b5887ff298 SHA1 5ce147e745df760f9252bb5cb0441344274fc8f9 SHA256 e9494bc82a283cd7d65cac9244baca9f8c609947e1e794f760d628e82a95e681
+MISC ChangeLog 20085 RMD160 8ec07e48f94f661e6ed8b7845502bbb89d6ff105 SHA1 cc2c6b2648e3af2fec48a3d41362be154bd65fc1 SHA256 205380cd467bc413305cc493849700347139964152273273c9508dfa3eaddce1
 MISC metadata.xml 319 RMD160 12a57320613564de0b0f076f47915481b15b4e1a SHA1 e0a65649b5aabd5079bf6b67058c5afef11a556b SHA256 9f83a3638c5c1aaac590711dd3ac6b1a7fbea92b3f32be918cc6207689772705
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPrMtRAAoJELEHsLL7fEFWgrgQAIBDZiMbKBlkXLi/qb/NJvK5
-K65jXxl8WUkpaxs9Af2kCBachrmYNCPnm2YbxtaH15pJPo/RiAUdj0EtGcvCK5Tl
-vnrIOWKevu2rT0kdKAXlHI+SBbesCeiOO9QPREeZGq9XdcdvXP++lRWaVwELj/qS
-ItpfsAye2MbmOu0WJDAhYgOXq75YcCrBHLdKPyPwUSRrzK7uE/5QXFvF8IrOldz8
-azlrfmJXu2DeBAB9fOWK/eIxq+UfTbvQxydLXtH1riYxETqokzj5agxuu2mSZE8H
-L3+Jfe5YULbDMwkbmsosiRPiy7hgg3aUdTA2k/pDRNWBAu0XaB+MkX4YwAcD8w92
-JCguFj0IMBUrivlQSn4tlmQiJAafEp3yNTyBwspHgdwc3MdcJ6s1KkO2Mbbb2JT8
-xCxvVNBulZXy8V+isK9CjAQccAeMb7mEpGvYvTId6QgpACsjIlZIitfb1rlTzHhR
-a4x78xYO0AEk/sCP3gOBz4aId5tAMLesKmgA3WOUhnVA1xW+XE2E7qXgcET+AdBS
-xYUxEdZh3dKrrmEW/++P+DWEOcVt76vDfDRDAs9rtT1Iii9guetm9iAGfHjtQ+T7
-Hh3l2zCTWRUq+7G+AkSySt+GJLTrhR4Mm4pa9B1O8n1t1VzT9/3hNi13Mn98nINu
-WQwRJhoOGQ2uI8eDQRRD
-=GHgE
+iQIcBAEBAgAGBQJPrM7MAAoJELEHsLL7fEFW20gQAIzjKHm/XFP9+Bp5FWYbGlLQ
+jOaBbaOW5S8BdcNlSwuUW0h9cxS6nCKd88+U4poyuyel2nBWuZGGpx5NAv+N8qmI
+AHX8/U0iqC72F6uJqTTlBw4W0k2gxsji0jxyFwOMNRVszFjj92Qp6Fb4RQqz6uBj
+3IeWJNUewX58AttvmopoXVKDX1IPn4GwM3K3HBuB0vvOuNdd8JAg6iblYM0OMZDU
+O83OvxmOE8fIG7b6ZHM5oP8EULgaenCVRBshdsPrv6IHZ5vW5/MqqeRFmMXtjpFz
+3pRDv+6SZuX6t/NMfmPo6tQ3ZL6VL7Z6qPfOsnr0frLbYDCga53jx8rqnbhA0kna
+KzuN1hfhN2mWPIpsJoPapHAkFFcmE57f/yalGlQ6kR4vaUxxUhqGLPcijVYfD8cd
+yaOaMdJ4RbPQ6vWArHmlTqpCYDulxIpGeEwfFCO8lbtaQvYh5l+nHtoonGZ6u/Mi
+cNjZyhJyls/i/+6iOuTESoMs0tFJ/CWKlnBA8eEO+zlxXQMyxwJVAGAuN8KjQGuE
+H/rP6Dr8TskfEVP0rS8oYMIGKEvcrjbv+ywQH6BavnYYxyXsQsR9fdv945FgWwOJ
+LSoXb302g36byPKu0TXLY24hAlfRI6Zh8u7nKjc1zGXxjqsMBcs+CnknXCZGhcC5
+c3rFPZbovzN6s8SclVtK
+=Vr1b
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild
new file mode 100644
index 000000000000..3c4f0c02a36d
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild,v 1.1 2012/05/11 08:33:01 vapier Exp $
+
+EAPI="4"
+
+inherit linux-info 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="nls selinux static static-libs"
+
+S=${WORKDIR}/${MY_P}
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	>=dev-libs/popt-1.7[static-libs(+)]
+	>=sys-apps/util-linux-2.17.2[static-libs(+)]
+	>=dev-libs/libgcrypt-1.1.42[static-libs(+)]
+	>=sys-fs/lvm2-2.02.64[static-libs(+)]
+	>=sys-fs/udev-124[static-libs(+)]
+	>=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]"
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<sys-apps/baselayout-2
+	!sys-fs/cryptsetup-luks
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+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
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable static static-cryptsetup) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable selinux)
+}
+
+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
+	use static && { mv "${ED}"/sbin/cryptsetup{.static,} || die ; }
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt
+}
+
+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/dmcrypt.rc b/sys-fs/cryptsetup/files/dmcrypt.rc
index 7be9a9a3fdf9..130036b9202f 100755
--- a/sys-fs/cryptsetup/files/dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/dmcrypt.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.3 2012/05/11 08:18:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
 
 depend() {
 	before checkfs fsck
@@ -71,17 +71,26 @@ dm_crypt_execute_dmcrypt() {
 	if [ -n "${key}" ] ; then
 		read_abort() {
 			# some colors
-			local ans
-			shift
+			local ans savetty resettty
 			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
 			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			if ! read -n 1 $* ans ; then
+			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
+			[ "${1}" = -t ] && 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]|[yY][eE][sS]) return 0;;
+				[yY]) return 0;;
 				*) return 1;;
 			esac
 		}