diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2008-09-14 01:41:51 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2008-09-14 01:41:51 +0000 |
commit | 4972c76163b90e8c1c475c189389788f7d56ace2 (patch) | |
tree | 533aea69443d5ea6c299bcf3a28687e4f58bf11d /sys-fs/cryptsetup | |
parent | Mask video_cards_ast, no hardware to test (diff) | |
download | gentoo-2-4972c76163b90e8c1c475c189389788f7d56ace2.tar.gz gentoo-2-4972c76163b90e8c1c475c189389788f7d56ace2.tar.bz2 gentoo-2-4972c76163b90e8c1c475c189389788f7d56ace2.zip |
fix bug #236481. block udev-126 and higher on older versions that won't work with it. add udev as a depend since the code calls it always. remove old version
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 222 | ||||
-rw-r--r-- | sys-fs/cryptsetup/cryptsetup-0.1-r2.ebuild | 65 | ||||
-rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild | 99 | ||||
-rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch | 35 |
7 files changed, 152 insertions, 281 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index c1efc7ad40e0..98a4e894c769 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,218 +1,14 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.58 2008/08/22 20:18:50 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.59 2008/09/14 01:41:51 cardoe Exp $ - 22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc +*cryptsetup-1.0.6-r1 (14 Sep 2008) - 16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml: - Remove strerror from metadata.xml (#89719) - - 25 Mar 2008; <ricmm@gentoo.org> cryptsetup-0.1-r2.ebuild, - cryptsetup-0.1-r3.ebuild: - Drop to ~mips due to unstable deps - -*cryptsetup-1.0.6 (19 Mar 2008) - - 19 Mar 2008; Mike Frysinger <vapier@gentoo.org> - +files/1.0.6-dm-crypt-start.sh, +cryptsetup-1.0.6.ebuild: - Version bump #212997 by Alex Elsayed and make startup script much nicer - #202364 by me. - - 20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cryptsetup-1.0.5.ebuild, cryptsetup-1.0.5-r1.ebuild: - I hate blank spaces in output for no reason, so switching from using echo to - using an extra \n at the end of the line. - - 01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> files/1.0.5-dmcrypt.rc: - Update init script to work with current development version of OpenRC - (checkroot -> root; checkfs -> fsck). - - 31 Jan 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cryptsetup-1.0.5-r1.ebuild: - Cleaning up a couple typos/errors in einfo/ewarn output. There's no actual - code changes in this. - - 06 Nov 2007; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.0.5-r1.ebuild: - alpha/ia64/sparc stable wrt #195648 - - 02 Nov 2007; Steve Dibb <beandog@gentoo.org> cryptsetup-1.0.5-r1.ebuild: - amd64 stable, bug 195648 - - 14 Oct 2007; Markus Rothe <corsair@gentoo.org> cryptsetup-1.0.5-r1.ebuild: - Stable on ppc64; bug #195648 - - 13 Oct 2007; Jeroen Roovers <jer@gentoo.org> cryptsetup-1.0.5-r1.ebuild: - Stable for HPPA (bug #195648). - - 13 Oct 2007; nixnut <nixnut@gentoo.org> cryptsetup-1.0.5-r1.ebuild: - Stable on ppc wrt bug 195648 - - 13 Oct 2007; Christian Faulhammer <opfer@gentoo.org> - cryptsetup-1.0.5-r1.ebuild: - stable x86, bug 195648 - - 06 Oct 2007; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.0.5.ebuild, - cryptsetup-1.0.5-r1.ebuild: - Block cryptsetup-luks #194907 by Jakub Moc. - -*cryptsetup-1.0.5-r1 (02 Oct 2007) - - 02 Oct 2007; Benjamin Smee <strerror@gentoo.org> - files/1.0.5-dm-crypt-start.sh, files/1.0.5-dm-crypt-stop.sh, - files/1.0.5-dmcrypt.rc, +cryptsetup-1.0.5-r1.ebuild: - Fixes for bugs #180068 #181503 #164795 and other improvements. Thanks to - Thomas Bettler for a patch - - 14 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> - cryptsetup-1.0.5.ebuild: - Removed check for USE=build since it did nothing because cryptsetup isn't in - stage1. Removed call to linux-info_pkg_setup to remove requirement on a - configured kernel. This fixes bug #148390 from this end, but changes are - still needed in linux-info.eclass, which is tracked at bug #192556. - - 15 Aug 2007; Benjamin Smee <strerror@gentoo.org> - files/1.0.5-dm-crypt-start.sh: - Change to 1.0.5-dm-crypt-start.sh to fix misplaced bin - -*cryptsetup-1.0.5 (14 Aug 2007) - - 14 Aug 2007; Benjamin Smee <strerror@gentoo.org> - +files/1.0.5-dm-crypt-start.sh, +files/1.0.5-dm-crypt-stop.sh, - +files/1.0.5-dmcrypt.confd, +files/1.0.5-dmcrypt.rc, - +cryptsetup-1.0.5.ebuild: - Major changes for bug #177100 and others. Thanks to ikelos - - 07 Jul 2006; Thomas Cort <tcort@gentoo.org> cryptsetup-0.1-r3.ebuild: - Stable on alpha wrt Bug #124928. - - 28 Apr 2006; Luis Medinas <metalgod@gentoo.org> cryptsetup-0.1-r3.ebuild: - Stable on amd64. Bug #124928. - - 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest: - Fixing SHA256 digest, pass four - - 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> cryptsetup-0.1-r3.ebuild: - Marked stable on mips. - - 10 Mar 2006; Aron Griffis <agriffis@gentoo.org> cryptsetup-0.1-r3.ebuild: - Mark 0.1-r3 stable on ia64. #124928 - - 06 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> - cryptsetup-0.1-r3.ebuild: - Stable on sparc wrt #124928 - - 06 Mar 2006; Michele Noberasco <s4t4n@gentoo.org> cryptsetup-0.1-r3.ebuild: - Stable for x86, see bug #124928 - - 05 Mar 2006; Tom Gall <tgall@gentoo.org> cryptsetup-0.1-r3.ebuild: - stable on ppc64, bug #124928 - - 04 Mar 2006; <nixnut@gentoo.org> cryptsetup-0.1-r3.ebuild: - Stable on ppc. bug #124928 - - 26 Feb 2006; Joshua Kinard <kumba@gentoo.org> cryptsetup-0.1-r2.ebuild: - Marked stable on mips. - - 15 Feb 2006; Markus Rothe <corsair@gentoo.org> cryptsetup-0.1-r2.ebuild: - Stable on ppc64; bug #118791 - - 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> cryptsetup-0.1-r2.ebuild: - Mark 0.1-r2 stable on alpha - -*cryptsetup-0.1-r3 (02 Feb 2006) - - 02 Feb 2006; Benjamin Smee <strerror@gentoo.org> - +files/cryptsetup-libmapper.patch, +cryptsetup-0.1-r3.ebuild: - Bump for bug #120802 - - 13 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> - cryptsetup-0.1-r2.ebuild: - ppc stable, bug #118791 - - 12 Jan 2006; Markus Rothe <corsair@gentoo.org> cryptsetup-0.1-r2.ebuild: - Added ~ppc64 - - 12 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cryptsetup-0.1-r2.ebuild: - Stable on x86 wrt bug #118791. - - 12 Jan 2006; Luis Medinas <metalgod@gentoo.org> cryptsetup-0.1-r2.ebuild: - Stable on amd64. See bug #118791. - - 12 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> - cryptsetup-0.1-r2.ebuild: - Stable on sparc wrt #118791 - - 25 Nov 2005; Tom Gall <tgall@gentoo.org> cryptsetup-0.1-r1.ebuild: - stable on ppc64 - - 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> cryptsetup-0.1-r1.ebuild: - Mark 0.1-r1 stable on alpha - - 03 Sep 2005; Daniel Black <dragonheart@gentoo.org> - cryptsetup-0.1-r1.ebuild, cryptsetup-0.1-r2.ebuild: - dependancy fixes - - 08 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> cryptsetup-0.1-r2.ebuild: - Added ~mips for bug 89528. - -*cryptsetup-0.1-r2 (02 Jun 2005) - - 02 Jun 2005; Benjamin Smee <strerror@gentoo.org> - +cryptsetup-0.1-r2.ebuild: - Now blocks with cryptsetup-luks - - 29 May 2005; Benjamin Smee <strerror@gentoo.org> cryptsetup-0.1-r1.ebuild: - Removed "die" call as per Spanky's request. - - 25 May 2005; Herbie Hopkins <herbs@gentoo.org> cryptsetup-0.1-r1.ebuild: - Multilib fixes. - - 24 May 2005; Benjamin Smee <strerror@gentoo.org> metadata.xml, - cryptsetup-0.1-r1.ebuild: - Fixed the dm-crypt check as per bug 89142 - - 12 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> - cryptsetup-0.1-r1.ebuild: - Stable on sparc - - 25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> - cryptsetup-0.1-r1.ebuild: - Add ~alpha keyword, bug 83684. - - 22 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> - cryptsetup-0.1-r1.ebuild: - Keyworded ~sparc wrt #83684 - - 14 Mar 2005; Rob Holland <tigger@gentoo.org> : - fixed up module check. fixes bug #85102 - -*cryptsetup-0.1-r1 (02 Mar 2005) - - 02 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +files/cryptfs.confd, - +files/dm-crypt-start.sh, +files/dm-crypt-stop.sh, - +cryptsetup-0.1-r1.ebuild: - Add cryptfs conf.d file and addon scripts. - - 01 Mar 2005; Lars Weiler <pylon@gentoo.org> cryptsetup-0.1.ebuild: - Stable on ppc. - - 13 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> cryptsetup-0.1.ebuild: - Stable on amd64, blame jhuebel. - - 17 Sep 2004; Rob Holland <tigger@gentoo.org> cryptsetup-0.1.ebuild: - Marking stable on x86 - - 27 Jul 2004; Travis Tilley <lv@gentoo.org> cryptsetup-0.1.ebuild: - added ~amd64 keyword - - 22 Jul 2004; David Holm <dholm@gentoo.org> cryptsetup-0.1.ebuild: - Added to ~ppc. - -*cryptsetup-0.1 (21 Jul 2004) - - 21 Jul 2004; Rob Holland <tigger@gentoo.org> +cryptsetup-0.1.ebuild: - Initial version. Closes bug #44079. Thanks to ripple@ripple.be and - ben@disciplina.net for submitting ebuilds for it + 14 Sep 2008; Doug Goldstein <cardoe@gentoo.org> + +files/cryptsetup-1.0.6-udevsettle.patch, -cryptsetup-0.1-r2.ebuild, + cryptsetup-1.0.5.ebuild, cryptsetup-1.0.5-r1.ebuild, + cryptsetup-1.0.6.ebuild, +cryptsetup-1.0.6-r1.ebuild: + fix bug #236481. block udev-126 and higher on older versions that won't + work with it. add udev as a depend since the code calls it always. remove + old version diff --git a/sys-fs/cryptsetup/cryptsetup-0.1-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-0.1-r2.ebuild deleted file mode 100644 index 52b10d469e87..000000000000 --- a/sys-fs/cryptsetup/cryptsetup-0.1-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r2.ebuild,v 1.19 2008/03/26 03:37:41 ricmm Exp $ - -inherit linux-info multilib eutils - -DESCRIPTION="Tool to setup encrypted devices with dm-crypt" -HOMEPAGE="http://www.saout.de/misc/dm-crypt/" -SRC_URI="http://www.saout.de/misc/dm-crypt/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -RDEPEND=">=sys-fs/device-mapper-1.00.07-r1 - !sys-fs/cryptsetup-luks" -DEPEND="dev-libs/popt - >=dev-libs/libgcrypt-1.1.42 - dev-libs/libgpg-error" - -dm-crypt_check() { - ebegin "Checking for dm-crypt support" - linux_chkconfig_present DM_CRYPT - eend $? - - if [[ $? -ne 0 ]] ; then - ewarn "cryptsetup requires dm-crypt support!" - ewarn "Please enable dm-crypt support in your kernel config, found at:" - ewarn "(for 2.6 kernels)" - ewarn - ewarn " Device Drivers" - ewarn " Multi-Device Support" - ewarn " Device mapper support" - ewarn " [*] Crypt Target Support" - ewarn - ewarn "and recompile your kernel if you want this package to work with this kernel" - epause 5 - fi -} - -pkg_setup() { - linux-info_pkg_setup - dm-crypt_check; -} - -src_compile() { - econf --bindir=/bin --disable-nls || die - - sed -i \ - -e "s|-lgcrypt|/usr/$(get_libdir)/libgcrypt.a|" \ - -e "s|-lgpg-error|/usr/$(get_libdir)/libgpg-error.a|" \ - Makefile src/Makefile - sed -i -e "s|-lpopt|/usr/$(get_libdir)/libpopt.a|" src/Makefile - - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die "install failed" - - newconfd ${FILESDIR}/cryptfs.confd cryptfs - insinto /lib/rcscripts/addons - doins "${FILESDIR}"/dm-crypt-{start,stop}.sh -} diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild index e842bf3b525d..b9f32fd30389 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.12 2008/02/20 02:52:26 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.13 2008/09/14 01:41:51 cardoe Exp $ inherit linux-info eutils flag-o-matic multilib @@ -17,7 +17,9 @@ 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 + sys-fs/udev selinux? ( sys-libs/libselinux ) + !>=sys-fs/udev-126 !sys-fs/cryptsetup-luks" dm-crypt_check() { diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild index b6d62a2008fb..1ee25de453dc 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.4 2008/02/20 02:52:26 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.5 2008/09/14 01:41:51 cardoe Exp $ inherit linux-info eutils flag-o-matic multilib @@ -17,7 +17,9 @@ 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 + sys-fs/udev selinux? ( sys-libs/libselinux ) + !>=sys-fs/udev-126 !sys-fs/cryptsetup-luks" dm-crypt_check() { diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild new file mode 100644 index 000000000000..c47d0fbb0d03 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild,v 1.1 2008/09/14 01:41:51 cardoe 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" + +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 + sys-fs/udev + selinux? ( sys-libs/libselinux ) + !sys-fs/cryptsetup-luks" + +dm-crypt_check() { + local CONFIG_CHECK="~DM_CRYPT" + local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" + check_extra_config +} + +crypto_check() { + local CONFIG_CHECK="~CRYPTO" + local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" + check_extra_config +} + +cbc_check() { + local CONFIG_CHECK="~CRYPTO_CBC" + local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" + check_extra_config +} + +pkg_setup() { + dm-crypt_check + crypto_check + cbc_check + + 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_unpack() { + unpack ${A} + cd "${S}" + + # fix for bug #236481, use udevadm instead of udevsettle + epatch "${FILESDIR}"/${PN}-1.0.6-udevsettle.patch +} + +src_compile() { + 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 + newins "${FILESDIR}"/1.0.6-dm-crypt-start.sh dm-crypt-start.sh || die + newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die + newconfd "${FILESDIR}"/1.0.5-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." +} diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild index 2849580df0d0..e8a51df8ab74 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.1 2008/03/19 07:20:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.2 2008/09/14 01:41:51 cardoe Exp $ inherit linux-info eutils flag-o-matic multilib @@ -17,7 +17,9 @@ 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 + sys-fs/udev selinux? ( sys-libs/libselinux ) + !>=sys-fs/udev-126 !sys-fs/cryptsetup-luks" dm-crypt_check() { diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch new file mode 100644 index 000000000000..0d28732471e2 --- /dev/null +++ b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch @@ -0,0 +1,35 @@ +2008-09-13 Doug Goldstein <cardoe@gentoo.org> + * switch to udevadm settle since udevsettle has been deprecated + and finally removed with udev 126. + * add message if udevadm settle fails to execute properly what the + consequence is + +diff -Nur cryptsetup-1.0.6/lib/libdevmapper.c cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c +--- cryptsetup-1.0.6/lib/libdevmapper.c 2007-10-25 03:11:19.000000000 -0400 ++++ cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c 2008-09-13 21:22:56.000000000 -0400 +@@ -18,11 +18,11 @@ + + #define CRYPT_TARGET "crypt" + +-#define UDEVSETTLE "/sbin/udevsettle" ++#define UDEVSETTLE "/sbin/udevadm settle" + +-static void run_udevsettle(void) ++static int run_udevsettle(void) + { +- system(UDEVSETTLE); ++ return system(UDEVSETTLE); + } + + static void set_dm_error(int level, const char *file, int line, +@@ -192,7 +192,9 @@ + options->flags |= CRYPT_FLAG_READONLY; + + /* run udevsettle to avoid a race in libdevmapper causing busy dm devices */ +- run_udevsettle(); ++ if (run_udevsettle() != 0) ++ fprintf(stderr, "%s unable to avoid potential race with busy " ++ "device-mapper devices", UDEVSETTLE); + + r = 0; + |