mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-17 12:20:59 +02:00
cryptsetup: various fixes for using dash as /bin/sh
This commit is contained in:
Zero_Chaos
parent
9a207b26da
commit
b9e47a74be
15 changed files with 1318 additions and 253 deletions
480
sys-fs/cryptsetup/ChangeLog
Normal file
480
sys-fs/cryptsetup/ChangeLog
Normal file
|
|
@ -0,0 +1,480 @@
|
|||
# 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.114 2011/01/22 21:28:15 armin76 Exp $
|
||||
|
||||
22 Jan 2011; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.1.3-r3.ebuild:
|
||||
alpha/ia64/s390/sh/sparc stable wrt #350044
|
||||
|
||||
21 Jan 2011; Jeroen Roovers <jer@gentoo.org> cryptsetup-1.1.3-r3.ebuild:
|
||||
Stable for HPPA (bug #350044).
|
||||
|
||||
18 Jan 2011; Mike Frysinger <vapier@gentoo.org> files/1.0.5-dmcrypt.rc:
|
||||
Don't require device-mapper -- let the user select which packages they
|
||||
need for their fs stack #351251 by Jochen Klein.
|
||||
|
||||
18 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
|
||||
cryptsetup-1.1.3-r3.ebuild:
|
||||
ppc64 stable wrt #350044
|
||||
|
||||
17 Jan 2011; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild:
|
||||
Require new dev-libs/libgcrypt[static-libs] too #351810.
|
||||
|
||||
15 Jan 2011; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.2.0-r1.ebuild:
|
||||
Require libgpg-error[static-libs] when USE=static #351810 by Peter Volkov.
|
||||
|
||||
*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
|
||||
|
||||
*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:
|
||||
Tweak status detection to work with newer cryptsetup output #350345 by
|
||||
Aaron Lewis.
|
||||
|
||||
08 Jan 2011; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.2.0-r1.ebuild:
|
||||
Improve tests a bit -- skip when dmcrypt is not available.
|
||||
|
||||
07 Jan 2011; Brent Baude <ranger@gentoo.org> cryptsetup-1.1.3-r1.ebuild:
|
||||
stable ppc, bug 350044
|
||||
|
||||
04 Jan 2011; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.2.0-r1.ebuild:
|
||||
Fix build failures for USE=-static #350463 by Alessandro Guido.
|
||||
|
||||
02 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||
cryptsetup-1.1.3-r1.ebuild:
|
||||
x86 stable wrt bug #350044
|
||||
|
||||
01 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
|
||||
cryptsetup-1.1.3-r1.ebuild:
|
||||
Stable on amd64 wrt bug #350044
|
||||
|
||||
*cryptsetup-1.2.0-r1 (30 Dec 2010)
|
||||
|
||||
30 Dec 2010; Mike Frysinger <vapier@gentoo.org> -cryptsetup-1.2.0.ebuild,
|
||||
+cryptsetup-1.2.0-r1.ebuild:
|
||||
Convert to IUSE=+static and make it work again #350105 by Casey Carter.
|
||||
|
||||
*cryptsetup-1.2.0 (29 Dec 2010)
|
||||
|
||||
29 Dec 2010; Mike Frysinger <vapier@gentoo.org> +cryptsetup-1.2.0.ebuild:
|
||||
Version bump #349962 by ScytheMan.
|
||||
|
||||
29 Oct 2010; Jeroen Roovers <jer@gentoo.org> cryptsetup-1.1.2.ebuild:
|
||||
Stable for HPPA (bug #327689).
|
||||
|
||||
06 Oct 2010; Mike Frysinger <vapier@gentoo.org>
|
||||
files/1.1.3-dm-crypt-start.sh:
|
||||
Do not warn about global options #329437 by Marcin Mirosław.
|
||||
|
||||
*cryptsetup-1.1.3-r1 (30 Sep 2010)
|
||||
|
||||
30 Sep 2010; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/1.1.3-dm-crypt-start.sh, +cryptsetup-1.1.3-r1.ebuild,
|
||||
+files/1.1.3-dm-crypt-stop.sh:
|
||||
Update by Wolfram to let the init.d scripts be multiplexed #338876.
|
||||
|
||||
28 Aug 2010; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.1.2.ebuild:
|
||||
ia64/s390/sh/sparc stable wrt #327689
|
||||
|
||||
28 Aug 2010; Markus Meier <maekke@gentoo.org> cryptsetup-1.1.2.ebuild:
|
||||
arm stable, bug #327689
|
||||
|
||||
13 Aug 2010; Joseph Jezak <josejx@gentoo.org> cryptsetup-1.1.2.ebuild:
|
||||
Marked ppc/ppc64 stable for bug #327689.
|
||||
|
||||
31 Jul 2010; Tobias Klausmann <klausman@gentoo.org>
|
||||
cryptsetup-1.1.2.ebuild:
|
||||
Stable on alpha, bug #327689
|
||||
|
||||
27 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
-cryptsetup-1.0.5-r1.ebuild, -cryptsetup-1.0.7.ebuild,
|
||||
-cryptsetup-1.0.7-r1.ebuild, -cryptsetup-1.1.0.ebuild,
|
||||
-cryptsetup-1.1.1_rc1.ebuild, -cryptsetup-1.1.1_rc2.ebuild,
|
||||
-cryptsetup-1.1.1.ebuild:
|
||||
Cleanup old versions.
|
||||
|
||||
27 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
cryptsetup-1.1.2.ebuild, cryptsetup-1.1.3.ebuild:
|
||||
Bug #329991: Document that users of plain (non-LUKS) volumes from the 1.0
|
||||
series MUST specify the cipher/keysize/hash, as the defaults have changed
|
||||
for security reasons.
|
||||
|
||||
27 Jul 2010; Pacho Ramos <pacho@gentoo.org> cryptsetup-1.1.2.ebuild:
|
||||
amd64 stable, bug 327689
|
||||
|
||||
23 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
|
||||
cryptsetup-1.1.2.ebuild:
|
||||
stable x86, bug 327689
|
||||
|
||||
*cryptsetup-1.1.3 (21 Jul 2010)
|
||||
|
||||
21 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.1.3.ebuild:
|
||||
Version bump.
|
||||
|
||||
*cryptsetup-1.1.2 (17 Jun 2010)
|
||||
|
||||
17 Jun 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.1.2.ebuild:
|
||||
Bug #323655: version bump
|
||||
|
||||
*cryptsetup-1.1.1 (24 May 2010)
|
||||
|
||||
24 May 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.1.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
*cryptsetup-1.1.1_rc2 (14 May 2010)
|
||||
|
||||
14 May 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.1.1_rc2.ebuild:
|
||||
Bug #318379: version bump. Fixes dm-crypt module loading over rc1.
|
||||
|
||||
01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
cryptsetup-1.1.1_rc1.ebuild:
|
||||
Both patches are actually not needed now.
|
||||
|
||||
*cryptsetup-1.1.1_rc1 (01 May 2010)
|
||||
|
||||
01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.1.1_rc1.ebuild:
|
||||
Bug #318039: version bump.
|
||||
|
||||
23 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+files/1.1.0-libudev.patch, cryptsetup-1.1.0.ebuild:
|
||||
Bug #316571: Bring in libudev for devmapper.
|
||||
|
||||
*cryptsetup-1.1.0 (14 Feb 2010)
|
||||
|
||||
14 Feb 2010; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+files/1.1.0_rc3-static-no-selinux.patch, +cryptsetup-1.1.0.ebuild:
|
||||
Version bump per bug #294934.
|
||||
|
||||
*cryptsetup-1.0.7-r1 (30 Nov 2009)
|
||||
|
||||
30 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.0.7-r1.ebuild:
|
||||
Bug #276803: old sys-fs/devicemapper not supported anymore. Use the new
|
||||
lvm2-2.02.56-r1 for safe static linking.
|
||||
|
||||
*cryptsetup-1.0.7 (28 Nov 2009)
|
||||
|
||||
28 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
|
||||
+cryptsetup-1.0.7.ebuild:
|
||||
Version bump per bug #277990.
|
||||
|
||||
31 Aug 2009; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
|
||||
arm/ia64/s390/sh/sparc stable wrt #259253
|
||||
|
||||
16 Aug 2009; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
Install into rcscripts multilib dir #262838 by Thilo Bangert.
|
||||
|
||||
16 Aug 2009; Mike Frysinger <vapier@gentoo.org>
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
Make sure USE=selinux is respected #274034 by Petteri Räty.
|
||||
|
||||
16 Aug 2009; Mike Frysinger <vapier@gentoo.org>
|
||||
files/cryptsetup-1.0.6-udevsettle.patch:
|
||||
Do not complain if udevadm did not exec for systems that use mdev and such
|
||||
#276369 by Florian Streibelt.
|
||||
|
||||
15 Jul 2009; nixnut <nixnut@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
|
||||
ppc stable #259253
|
||||
|
||||
27 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
Stable on alpha, bug #259253
|
||||
|
||||
27 Jun 2009; Tobias Klausmann <klausman@gentoo.org> ChangeLog:
|
||||
Stable on alpha, bug #259253
|
||||
|
||||
26 Jun 2009; Thomas Anderson <gentoofan23@gentoo.org>
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
stable amd64, bug 259253
|
||||
|
||||
19 Jun 2009; Brent Baude <ranger@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
|
||||
stable ppc64, bug 259253
|
||||
|
||||
17 Jun 2009; Jeroen Roovers <jer@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
|
||||
Stable for HPPA (bug #259253).
|
||||
|
||||
17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
stable x86, bug 259253
|
||||
|
||||
16 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
|
||||
files/1.0.6-r2-dm-crypt-start.sh:
|
||||
Fix dm-crypt-start.sh file for passphrase at startup issue, bug 243216
|
||||
|
||||
19 Apr 2009; Doug Goldstein <cardoe@gentoo.org>
|
||||
-files/1.0.6-dm-crypt-start.sh, -cryptsetup-1.0.5.ebuild,
|
||||
cryptsetup-1.0.5-r1.ebuild, -cryptsetup-1.0.6.ebuild,
|
||||
-cryptsetup-1.0.6-r1.ebuild, cryptsetup-1.0.6-r2.ebuild:
|
||||
clean up old versions. clean up depends
|
||||
|
||||
10 Apr 2009; Caleb Tennis <caleb@gentoo.org> cryptsetup-0.1-r3.ebuild,
|
||||
cryptsetup-1.0.5.ebuild, cryptsetup-1.0.5-r1.ebuild,
|
||||
cryptsetup-1.0.6.ebuild, cryptsetup-1.0.6-r1.ebuild,
|
||||
cryptsetup-1.0.6-r2.ebuild:
|
||||
Fix device-mapper dep for new lvm2, bug #265599
|
||||
|
||||
*cryptsetup-1.0.6-r2 (05 Oct 2008)
|
||||
|
||||
05 Oct 2008; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/1.0.6-dmcrypt.confd, +files/1.0.6-r2-dm-crypt-start.sh,
|
||||
+cryptsetup-1.0.6-r2.ebuild:
|
||||
Do not bang directly on /dev/console so we dont break when running under X
|
||||
or something.
|
||||
|
||||
15 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
|
||||
cryptsetup-1.0.6-r1.ebuild:
|
||||
Bug #237714, make the udev dep for udevadm slightly wider.
|
||||
|
||||
14 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
|
||||
cryptsetup-1.0.6-r1.ebuild:
|
||||
Fix changelog removal, and ensure a min version of udev for new revision
|
||||
since some old versions did not contain the udevadm tool yet.
|
||||
|
||||
*cryptsetup-1.0.6-r1 (14 Sep 2008)
|
||||
|
||||
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
|
||||
|
||||
22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
|
||||
add GLEP 56 USE flag desc from use.local.desc
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Version bump stolen from 277990
|
||||
|
|
@ -1,10 +1,16 @@
|
|||
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 3141 RMD160 64d4d4d7df03d301632851bee5969d11a61d57b1 SHA1 e44c783fd42076c7976cdb9bbf2c5280382ffa31 SHA256 9a962e482ead52e7636c0b99145a420f817c73efb6d506cb8322e555e5515325
|
||||
AUX 1.0.5-dmcrypt.rc 601 RMD160 b6483b8f5d7726a4fb3ea39190af110eb5502453 SHA1 eaa6d125c83ddfcbd1806e12e2271e117928226a SHA256 0b58b18dc903d0d4a23e5e2df1e6f3c5db64c65b8884e24710e4b7528ea3f8dc
|
||||
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 dm-crypt-start.sh 3939 RMD160 b8e77d42b9f5df01cb04f320d7b983855626b39b SHA1 1af1421b687626dae63781f4d78736522d641984 SHA256 2a6114349008ce7d438dae7adcdcd35fdfafa7d54f73d811812c29938865f651
|
||||
AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0f9c13e12b4310a190d5db48d4fd32267b795094 SHA256 944e2227b1125902acfa322373dda67d13998ac2d0af075810986471fcbca5a9
|
||||
DIST cryptsetup-1.1.0-rc3.tar.bz2 438895 RMD160 0c1f5b730f496f412b52d9e53edd226d35742ab0 SHA1 c496915ea403283bdc089c17bd3b56ef3b218db1 SHA256 46cc2a1be431ba8f87b484e7f296ac9f4faae34c062f76764d504df58b6e1c1f
|
||||
EBUILD cryptsetup-1.1.0_rc3.ebuild 3121 RMD160 5acdc8494576fd13aaba96db93e59ab776374159 SHA1 c764622dbef54a1d639f91da9453d9bef54007fc SHA256 32f24427d29bda267c0b5c8d76a437831cc3c2655fc4ff03e0fae6383668db0b
|
||||
MISC Changelog 32 RMD160 0480dcdda9963f9cdefc2f67239bc4618be598bb SHA1 1781717f3be08f92f930cd753cab68618ca21f76 SHA256 fb1ca9bf1e4741e93a2027612e8091414e54745ce6a0c116f7e74cccfe90e07c
|
||||
AUX 1.1.3-dm-crypt-start.sh 9089 RMD160 650c0d6bc92a5b6e8a50d27c1b55926947bd6507 SHA1 a3d5e3b11007ca71b1dc3f2d1c3a00b2ef0a3764 SHA256 3686ebc776d9d28464d8078b30a5a88578369dc1aba5db49bb88e2c8fea12dc2
|
||||
AUX 1.1.3-dm-crypt-stop.sh 1261 RMD160 de4d71acd18466fdc27c8d31dc1c4a456684e809 SHA1 64ae75bc3926fccc5b13ee37e0cf475fd7db2e5d SHA256 37f548b4ff9a019d86e8e45cb89dadced2019e7ad262b40a449840b2cfec7d86
|
||||
AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
|
||||
AUX posix_shell.patch 7083 RMD160 83df232b92bfbaa41423b7b1b8504373d7a1b3ff SHA1 44b1aa7dc8f5dca6368af0ee3936b7b7610e4b81 SHA256 04d14e1e16ed47cf48acd78a7cc08e885a7e7a85f119c15655a53d22f722b073
|
||||
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
|
||||
EBUILD cryptsetup-1.1.3-r3.ebuild 3293 RMD160 c095aedd7be46ffa3790a5fb43d827abe592f09a SHA1 1a651539fb1c5420ce8b509e63c6b2acf9ac1934 SHA256 addcc2a265a66b33e7fe8be0b47c7da0593c16ff15026145913697134c7146e5
|
||||
EBUILD cryptsetup-1.2.0-r1.ebuild 3475 RMD160 07da1846e263590d4a4f2b9c69e8b5329c99e9d5 SHA1 1f5044776dc9d33df37a39130f87334dbf6c951d SHA256 2eac3faba9339ae689d4e06186c9018ffa3e69399e86932e82d16bbb97d50f2a
|
||||
MISC ChangeLog 16670 RMD160 d82748346df7d3faf9da87c86bab35cea0aa9c1f SHA1 92672b2eeb532cf37cac38a9b236debd589fec7b SHA256 f70ce6c1aab1e1c210b083208c982e8f863d018ac435d8b8c9765c20c43fe1b2
|
||||
MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# 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.0.6-r2.ebuild,v 1.14 2009/08/31 15:05:29 armin76 Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.5 2011/01/22 21:28:15 armin76 Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit linux-info eutils flag-o-matic multilib autotools
|
||||
inherit linux-info eutils multilib libtool
|
||||
|
||||
MY_P=${P/_rc/-rc}
|
||||
DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
|
||||
|
|
@ -13,15 +13,12 @@ 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"
|
||||
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.45
|
||||
>=sys-fs/device-mapper-1.00.07-r1
|
||||
)
|
||||
RDEPEND=">=sys-fs/lvm2-2.02.64
|
||||
>=dev-libs/libgcrypt-1.1.42
|
||||
>=dev-libs/libgpg-error-1.0-r1
|
||||
>=dev-libs/popt-1.7
|
||||
|
|
@ -29,29 +26,18 @@ DEPEND="|| (
|
|||
|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
|
||||
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
|
||||
}
|
||||
DEPEND="${RDEPEND}
|
||||
!dynamic? (
|
||||
|| ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
|
||||
dev-libs/libgcrypt[static-libs]
|
||||
)"
|
||||
|
||||
pkg_setup() {
|
||||
dm-crypt_check
|
||||
crypto_check
|
||||
cbc_check
|
||||
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"
|
||||
|
|
@ -61,30 +47,26 @@ pkg_setup() {
|
|||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
|
||||
eautoreconf
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--enable-shared \
|
||||
$(use_enable !dynamic static) \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable selinux) \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die
|
||||
$(use_enable selinux)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "install failed"
|
||||
rmdir "${D}"/usr/$(get_libdir)/cryptsetup
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc TODO ChangeLog # README NEWS # last ones are empty
|
||||
|
||||
insinto /$(get_libdir)/rcscripts/addons
|
||||
newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
|
||||
newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
|
||||
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
|
||||
}
|
||||
|
|
@ -105,4 +87,10 @@ pkg_postinst() {
|
|||
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"
|
||||
|
||||
}
|
||||
100
sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
Normal file
100
sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
# 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.2.0-r1.ebuild,v 1.5 2011/01/17 19:51:48 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="+static nls selinux"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
RDEPEND=">=sys-fs/lvm2-2.02.64
|
||||
>=dev-libs/libgcrypt-1.1.42
|
||||
!static? ( dev-libs/libgpg-error )
|
||||
>=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"
|
||||
DEPEND="${RDEPEND}
|
||||
static? (
|
||||
|| ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
|
||||
dev-libs/libgcrypt[static-libs]
|
||||
)"
|
||||
|
||||
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 '/enable_static_cryptsetup=yes/d' configure #350463
|
||||
sed -i '/^LOOPDEV=/s:=.*:=`losetup -f` || exit 0:' tests/{compat,mode}-test
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--enable-shared \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
$(use_enable static static-cryptsetup) \
|
||||
$(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
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }
|
||||
dodoc TODO ChangeLog README NEWS
|
||||
|
||||
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"
|
||||
}
|
||||
|
|
@ -1,13 +1,10 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.3 2008/02/01 12:38:44 flameeyes Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.4 2011/01/18 20:05:18 vapier Exp $
|
||||
|
||||
depend() {
|
||||
before checkfs fsck
|
||||
if [ -e /lib/librc.so ]; then
|
||||
need device-mapper
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
|
|
@ -27,4 +24,3 @@ stop() {
|
|||
|
||||
. /lib/rcscripts/addons/dm-crypt-stop.sh
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
# /etc/conf.d/cryptfs
|
||||
# /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
|
||||
|
|
|
|||
26
sys-fs/cryptsetup/files/1.1.0-libudev.patch
Normal file
26
sys-fs/cryptsetup/files/1.1.0-libudev.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff -ur cryptsetup-1.1.0.orig/configure.in cryptsetup-1.1.0/configure.in
|
||||
--- cryptsetup-1.1.0.orig/configure.in 2010-04-23 21:39:29.000000000 +0300
|
||||
+++ cryptsetup-1.1.0/configure.in 2010-04-23 21:38:18.000000000 +0300
|
||||
@@ -62,6 +62,11 @@
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
+saved_LIBS=$LIBS
|
||||
+AC_CHECK_LIB([udev], [udev_queue_get_udev_is_active])
|
||||
+AC_SUBST(UDEV_LIBS, $LIBS)
|
||||
+LIBS=$saved_LIBS
|
||||
+
|
||||
AC_ARG_ENABLE(shared-library,
|
||||
[ --disable-shared-library
|
||||
disable building of shared cryptsetup library],,
|
||||
diff -ur cryptsetup-1.1.0.orig/lib/Makefile.am cryptsetup-1.1.0/lib/Makefile.am
|
||||
--- cryptsetup-1.1.0.orig/lib/Makefile.am 2009-12-30 18:29:28.000000000 +0200
|
||||
+++ cryptsetup-1.1.0/lib/Makefile.am 2010-04-23 21:41:34.000000000 +0300
|
||||
@@ -33,6 +33,7 @@
|
||||
libcryptsetup_la_LIBADD = \
|
||||
@UUID_LIBS@ \
|
||||
@DEVMAPPER_LIBS@ \
|
||||
+ @UDEV_LIBS@ \
|
||||
@LIBGCRYPT_LIBS@ \
|
||||
../luks/libluks.la
|
||||
|
||||
330
sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
Normal file
330
sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
Normal file
|
|
@ -0,0 +1,330 @@
|
|||
# /lib/rcscripts/addons/dm-crypt-start.sh
|
||||
|
||||
# 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.
|
||||
dm_crypt_execute_dmcrypt() {
|
||||
local dev ret mode foo
|
||||
# some colors
|
||||
local red='\033[31;01m' green='\033[32;01m' off='\033[0;0m'
|
||||
|
||||
if [ -n "$target" ]; then
|
||||
# let user set options, otherwise leave empty
|
||||
: ${options:=' '}
|
||||
elif [ -n "$swap" ]; then
|
||||
einfo "Checking swap is not LUKS"
|
||||
cryptsetup isLuks ${source} 2>/dev/null
|
||||
foo="$?"
|
||||
if [ "${foo}" -eq 0 ]; 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}'}
|
||||
else
|
||||
return
|
||||
fi
|
||||
if [ -z "$source" ] && [ ! -e "$source" ]; then
|
||||
ewarn "source \"${source}\" for ${target} missing, skipping..."
|
||||
return
|
||||
fi
|
||||
|
||||
if [ -n "${loop_file}" ] ; then
|
||||
dev="/dev/mapper/${target}"
|
||||
ebegin " Setting up loop device ${source}"
|
||||
/sbin/losetup "${source}" "${loop_file}"
|
||||
fi
|
||||
|
||||
# cryptsetup:
|
||||
# luksOpen <device> <name> # <device> is $source
|
||||
# create <name> <device> # <name> is $target
|
||||
local arg1="create" arg2="$target" arg3="$source" luks=0
|
||||
|
||||
cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
|
||||
|
||||
# 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
|
||||
reset_stty() {
|
||||
stty ${savestty}
|
||||
trap - EXIT HUP INT TERM
|
||||
}
|
||||
read_abort() {
|
||||
local ans a b back
|
||||
printf " ${green}*${off} %s? (${red}yes${off}/${green}No${off}) " "$1"
|
||||
back=" * $1? (yes/No) "
|
||||
shift
|
||||
savestty=`stty -g`
|
||||
trap reset_stty EXIT HUP INT TERM
|
||||
stty -icanon -echo
|
||||
if [ "$1" = '-t' ] && [ "$2" -gt 0 ]; then
|
||||
stty min 0 time "$(( $2 * 10 ))"
|
||||
fi
|
||||
ans=`dd count=1 bs=1 2>/dev/null` || ans=''
|
||||
reset_stty
|
||||
if [ -z "${ans}" ]; then
|
||||
a=''
|
||||
b=''
|
||||
while [ -n "${back}" ]; do
|
||||
a="${a}"'\b'
|
||||
b="${b} "
|
||||
back=${back%?}
|
||||
done
|
||||
printf "${a}${b}${a}"
|
||||
return 1
|
||||
fi
|
||||
case "${ans}" in
|
||||
y*|Y*) printf "${red}YES${off}\n"; return 0;;
|
||||
esac
|
||||
printf "${green}No${off}\n"
|
||||
return 1
|
||||
}
|
||||
|
||||
# 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:-120} ] ; 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" ${read_timeout:--t 1} && return
|
||||
else
|
||||
key="${mntrem}${key}"
|
||||
break
|
||||
fi
|
||||
else
|
||||
[ -e "${remdev}" ] \
|
||||
&& foo="mount failed" \
|
||||
|| foo="mount source not found"
|
||||
fi
|
||||
i=$(( $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 "dm-crypt map ${target}"
|
||||
einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
|
||||
if [ "$mode" = "gpg" ]; then
|
||||
: ${gpg_options:='-q -d'}
|
||||
# gpg available ?
|
||||
if command -v gpg >/dev/null 2>&1; then
|
||||
local i=0
|
||||
while [ $i -lt 3 ]
|
||||
do
|
||||
# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
|
||||
# save stdin stdout stderr "values"
|
||||
gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
|
||||
ret="$?"
|
||||
[ "$ret" -eq 0 ] && break
|
||||
i=$(( $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}"
|
||||
ebegin " Running pre_mount commands for ${target}"
|
||||
eval "${pre_mount}" > /dev/null
|
||||
ewend $? || cryptfs_status=1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Run any post_mount commands for an individual mount
|
||||
#
|
||||
# Note: This relies on variables localized in the main body below.
|
||||
dm_crypt_execute_localmount() {
|
||||
local mount_point
|
||||
|
||||
[ -z "$target" ] && [ -z "$post_mount" ] && return
|
||||
|
||||
if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
|
||||
ewarn "Skipping unmapped target ${target}"
|
||||
cryptfs_status=1
|
||||
return
|
||||
fi
|
||||
|
||||
mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
|
||||
if [ -z "${mount_point}" ] ; then
|
||||
ewarn "Failed to find mount point for ${target}, skipping"
|
||||
cryptfs_status=1
|
||||
fi
|
||||
|
||||
if [ -n "${post_mount}" ] ; then
|
||||
ebegin "Running post_mount commands for target ${target}"
|
||||
eval "${post_mount}" >/dev/null
|
||||
eend $? || cryptfs_status=1
|
||||
fi
|
||||
}
|
||||
|
||||
# Determine string lengths
|
||||
strlen() {
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
echo "usage: strlen <variable_name>"
|
||||
die
|
||||
fi
|
||||
eval echo "\${#${1}}"
|
||||
}
|
||||
|
||||
# Lookup optional bootparams
|
||||
parse_opt() {
|
||||
case "$1" in
|
||||
*\=*)
|
||||
local key_name=${1%%=*}
|
||||
local key_len=`strlen key_name`
|
||||
local value_start=$(( $key_len + 2 ))
|
||||
echo "$1" | cut -c ${value_start}-
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
local cryptfs_status=0
|
||||
local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
|
||||
|
||||
CMDLINE="`cat /proc/cmdline`"
|
||||
for x in ${CMDLINE}
|
||||
do
|
||||
case "${x}" in
|
||||
key_timeout\=*)
|
||||
KEY_TIMEOUT=`parse_opt "${x}"`
|
||||
if [ ${KEY_TIMEOUT} -gt 0 ]; then
|
||||
read_timeout="-t ${KEY_TIMEOUT}"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -f "${conf_file}" ] && [ -x /sbin/cryptsetup ] ; then
|
||||
ebegin "Setting up dm-crypt mappings"
|
||||
|
||||
while read targetline <&3 ; do
|
||||
# skip comments and blank lines
|
||||
# [[ ${targetline}\# == \#* ]] && continue
|
||||
|
||||
# check for the start of a new target/swap
|
||||
case ${targetline} in
|
||||
''|'#'*)
|
||||
# skip comments and blank lines
|
||||
continue
|
||||
;;
|
||||
target=*|swap=*)
|
||||
# If we have a target queued up, then execute it
|
||||
${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
|
||||
;;
|
||||
|
||||
gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
|
||||
if [ -z "${target}" ] && [ -z "${swap}" ] ; then
|
||||
ewarn "Ignoring setting outside target/swap section: ${targetline}"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
|
||||
dmcrypt_max_timeout=*)
|
||||
# ignore global options
|
||||
continue
|
||||
;;
|
||||
|
||||
*)
|
||||
ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Queue this setting for the next call to dm_crypt_execute_xxx
|
||||
eval "${targetline}"
|
||||
done 3< "${conf_file}"
|
||||
|
||||
# If we have a target queued up, then execute it
|
||||
${execute_hook}
|
||||
|
||||
ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
|
||||
fi
|
||||
|
||||
# vim:ts=4
|
||||
53
sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
Normal file
53
sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
# /lib/rcscripts/addons/dm-crypt-stop.sh
|
||||
|
||||
# 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 "${conf_file}" ] && [ -x "$csetup" ]
|
||||
then
|
||||
einfo "Removing dm-crypt mappings"
|
||||
|
||||
/bin/egrep "^(target|swap)" "${conf_file}" | \
|
||||
while read targetline
|
||||
do
|
||||
target=
|
||||
swap=
|
||||
|
||||
eval ${targetline}
|
||||
|
||||
[ -n "${swap}" ] && target=${swap}
|
||||
[ -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 /bin/egrep -q -e "^(source=)./dev/loop" "${conf_file}"; then
|
||||
einfo "Taking down any dm-crypt loop devices"
|
||||
/bin/egrep -e "^(source)" "${conf_file}" | while read sourceline
|
||||
do
|
||||
source=
|
||||
eval "${sourceline}"
|
||||
case "${source}" in
|
||||
*/dev/loop*)
|
||||
ebegin " Taking down ${source}"
|
||||
/sbin/losetup -d ${source}
|
||||
eend $? " Failed to remove loop"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# vim:ts=4
|
||||
21
sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
Normal file
21
sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
2008-09-13 Doug Goldstein <cardoe@gentoo.org>
|
||||
* switch to udevadm settle since udevsettle has been deprecated
|
||||
and finally removed with udev 126.
|
||||
|
||||
--- cryptsetup-1.0.6/lib/libdevmapper.c
|
||||
+++ cryptsetup-1.0.6/lib/libdevmapper.c
|
||||
@@ -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,
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
# /lib/rcscripts/addons/dm-crypt-start.sh
|
||||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dm-crypt-start.sh,v 1.6 2006/04/12 02:52:43 vapier Exp $
|
||||
|
||||
# Setup mappings for an individual mount/swap
|
||||
#
|
||||
# Note: This relies on variables localized in the main body below.
|
||||
dm-crypt-execute-checkfs() {
|
||||
local dev target ret
|
||||
|
||||
if [[ -n ${loop_file} ]] ; then
|
||||
dev="/dev/mapper/${target}"
|
||||
ebegin " Setting up loop device ${source}"
|
||||
/sbin/losetup ${source} ${loop_file}
|
||||
fi
|
||||
|
||||
if [[ -n ${mount} ]] ; then
|
||||
target=${mount}
|
||||
: ${options:='-c aes -h sha1'}
|
||||
[[ -n ${key} ]] && : ${gpg_options:='-q -d'}
|
||||
elif [[ -n ${swap} ]] ; then
|
||||
target=${swap}
|
||||
: ${options:='-c aes -h sha1 -d /dev/urandom'}
|
||||
: ${pre_mount:='mkswap ${dev}'}
|
||||
else
|
||||
return
|
||||
fi
|
||||
|
||||
if /bin/cryptsetup status ${target} | egrep -q '\<active:' ; then
|
||||
einfo "dm-crypt mapping ${target} is already configured"
|
||||
return
|
||||
fi
|
||||
|
||||
splash svc_input_begin checkfs
|
||||
ebegin "dm-crypt map ${target}"
|
||||
if [[ -z ${key} ]] ; then
|
||||
/bin/cryptsetup ${options} create ${target} ${source} >/dev/console </dev/console
|
||||
ret=$?
|
||||
eend ${ret} "failure running cryptsetup"
|
||||
else
|
||||
if type -p gpg >/dev/null ; then
|
||||
ret=1
|
||||
while [[ ${ret} -gt 0 ]] ; do
|
||||
keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console)
|
||||
if [[ -z ${keystring} ]] ; then
|
||||
ret=5
|
||||
else
|
||||
echo ${keystring} | /bin/cryptsetup ${options} create ${target} ${source}
|
||||
ret=$?
|
||||
fi
|
||||
done
|
||||
eend ${ret}
|
||||
else
|
||||
einfo "You have to install app-crypt/gnupg first"
|
||||
fi
|
||||
fi
|
||||
splash svc_input_end checkfs
|
||||
|
||||
if [[ ${ret} != 0 ]] ; then
|
||||
cryptfs_status=1
|
||||
else
|
||||
if [[ -n ${pre_mount} ]] ; then
|
||||
dev="/dev/mapper/${target}"
|
||||
ebegin " Running pre_mount commands for ${target}"
|
||||
eval "${pre_mount}" > /dev/null
|
||||
ewend $? || cryptfs_status=1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Run any post_mount commands for an individual mount
|
||||
#
|
||||
# Note: This relies on variables localized in the main body below.
|
||||
dm-crypt-execute-localmount() {
|
||||
local mount_point target
|
||||
|
||||
if [[ -n ${mount} && -n ${post_mount} ]] ; then
|
||||
target=${mount}
|
||||
else
|
||||
return
|
||||
fi
|
||||
|
||||
if ! /bin/cryptsetup status ${target} | egrep -q '\<active:' ; then
|
||||
ewarn "Skipping unmapped target ${target}"
|
||||
cryptfs_status=1
|
||||
return
|
||||
fi
|
||||
|
||||
mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
|
||||
if [[ -z ${mount_point} ]] ; then
|
||||
ewarn "Failed to find mount point for ${target}, skipping"
|
||||
cryptfs_status=1
|
||||
fi
|
||||
|
||||
if [[ -n ${post_mount} ]] ; then
|
||||
ebegin "Running post_mount commands for target ${target}"
|
||||
eval "${post_mount}" >/dev/null
|
||||
eend $? || cryptfs_status=1
|
||||
fi
|
||||
}
|
||||
|
||||
local cryptfs_status=0
|
||||
local gpg_options key loop_file mount mountline options pre_mount post_mount source swap
|
||||
|
||||
if [[ -f /etc/conf.d/cryptfs ]] && [[ -x /bin/cryptsetup ]] ; then
|
||||
ebegin "Setting up dm-crypt mappings"
|
||||
|
||||
while read mountline ; do
|
||||
# skip comments and blank lines
|
||||
[[ ${mountline}\# == \#* ]] && continue
|
||||
|
||||
# check for the start of a new mount/swap
|
||||
case ${mountline} in
|
||||
mount=*|swap=*)
|
||||
# If we have a mount queued up, then execute it
|
||||
dm-crypt-execute-${myservice}
|
||||
|
||||
# Prepare for the next mount/swap by resetting variables
|
||||
unset gpg_options key loop_file mount options pre_mount post_mount source swap
|
||||
;;
|
||||
|
||||
gpg_options=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
|
||||
if [[ -z ${mount} && -z ${swap} ]] ; then
|
||||
ewarn "Ignoring setting outside mount/swap section: ${mountline}"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
ewarn "Skipping invalid line in /etc/conf.d/cryptfs: ${mountline}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Queue this setting for the next call to dm-crypt-execute-${myservice}
|
||||
eval "${mountline}"
|
||||
done < /etc/conf.d/cryptfs
|
||||
|
||||
# If we have a mount queued up, then execute it
|
||||
dm-crypt-execute-${myservice}
|
||||
|
||||
ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
|
||||
fi
|
||||
|
||||
|
||||
# vim:ts=4
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
# /lib/rcscripts/addons/dm-crypt-stop.sh
|
||||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dm-crypt-stop.sh,v 1.2 2005/03/02 15:16:39 vapier Exp $
|
||||
|
||||
# Try to remove any dm-crypt mappings
|
||||
if [ -f /etc/conf.d/cryptfs ] && [ -x /bin/cryptsetup ]
|
||||
then
|
||||
einfo "Removing dm-crypt mappings"
|
||||
|
||||
/bin/egrep "^(mount|swap)" /etc/conf.d/cryptfs | \
|
||||
while read mountline
|
||||
do
|
||||
mount=
|
||||
swap=
|
||||
target=
|
||||
|
||||
eval ${mountline}
|
||||
|
||||
if [ -n "${mount}" ]
|
||||
then
|
||||
target=${mount}
|
||||
elif [ -n "${swap}" ]
|
||||
then
|
||||
target=${swap}
|
||||
else
|
||||
ewarn "Invalid line in /etc/conf.d/cryptfs: ${mountline}"
|
||||
fi
|
||||
|
||||
ebegin "Removing dm-crypt mapping for: ${target}"
|
||||
/bin/cryptsetup remove ${target}
|
||||
eend $? "Failed to remove dm-crypt mapping for: ${target}"
|
||||
done
|
||||
|
||||
if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/cryptfs) ]] ; then
|
||||
einfo "Taking down any dm-crypt loop devices"
|
||||
/bin/egrep -e "^(source)" /etc/conf.d/cryptfs | while read sourceline
|
||||
do
|
||||
source=
|
||||
eval ${sourceline}
|
||||
if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
|
||||
ebegin " Taking down ${source}"
|
||||
/sbin/losetup -d ${source}
|
||||
eend $? " Failed to remove loop"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# vim:ts=4
|
||||
251
sys-fs/cryptsetup/files/posix_shell.patch
Normal file
251
sys-fs/cryptsetup/files/posix_shell.patch
Normal file
|
|
@ -0,0 +1,251 @@
|
|||
--- 1.1.3-dm-crypt-start.sh
|
||||
+++ 1.1.3-dm-crypt-start.sh
|
||||
@@ -20,7 +20,7 @@
|
||||
dm_crypt_execute_dmcrypt() {
|
||||
local dev ret mode foo
|
||||
# some colors
|
||||
- local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
|
||||
+ local red='\033[31;01m' green='\033[32;01m' off='\033[0;0m'
|
||||
|
||||
if [ -n "$target" ]; then
|
||||
# let user set options, otherwise leave empty
|
||||
@@ -46,10 +46,10 @@
|
||||
return
|
||||
fi
|
||||
|
||||
- if [[ -n ${loop_file} ]] ; then
|
||||
+ if [ -n "${loop_file}" ] ; then
|
||||
dev="/dev/mapper/${target}"
|
||||
ebegin " Setting up loop device ${source}"
|
||||
- /sbin/losetup ${source} ${loop_file}
|
||||
+ /sbin/losetup "${source}" "${loop_file}"
|
||||
fi
|
||||
|
||||
# cryptsetup:
|
||||
@@ -71,26 +71,44 @@
|
||||
|
||||
# Handle keys
|
||||
if [ -n "$key" ]; then
|
||||
+ reset_stty() {
|
||||
+ stty ${savestty}
|
||||
+ trap - EXIT HUP INT TERM
|
||||
+ }
|
||||
read_abort() {
|
||||
- local ans
|
||||
- local prompt=" ${green}*${off} $1? (${red}yes${off}/${green}No${off}) "
|
||||
+ local ans a b back
|
||||
+ printf " ${green}*${off} %s? (${red}yes${off}/${green}No${off}) " "$1"
|
||||
+ back=" * $1? (yes/No) "
|
||||
shift
|
||||
- echo -n -e "${prompt}"
|
||||
- if ! read -n 1 $* ans ; then
|
||||
- local back=${prompt//?/\\b}
|
||||
- echo -n -e "${back}"
|
||||
- else
|
||||
- echo
|
||||
+ savestty=`stty -g`
|
||||
+ trap reset_stty EXIT HUP INT TERM
|
||||
+ stty -icanon -echo
|
||||
+ if [ "$1" = '-t' ] && [ "$2" -gt 0 ]; then
|
||||
+ stty min 0 time "$(( $2 * 10 ))"
|
||||
+ fi
|
||||
+ ans=`dd count=1 bs=1 2>/dev/null` || ans=''
|
||||
+ reset_stty
|
||||
+ if [ -z "${ans}" ]; then
|
||||
+ a=''
|
||||
+ b=''
|
||||
+ while [ -n "${back}" ]; do
|
||||
+ a="${a}"'\b'
|
||||
+ b="${b} "
|
||||
+ back=${back%?}
|
||||
+ done
|
||||
+ printf "${a}${b}${a}"
|
||||
+ return 1
|
||||
fi
|
||||
- case $ans in
|
||||
- [yY]|[yY][eE][sS]) return 0;;
|
||||
- *) return 1;;
|
||||
+ case "${ans}" in
|
||||
+ y*|Y*) printf "${red}YES${off}\n"; return 0;;
|
||||
esac
|
||||
+ printf "${green}No${off}\n"
|
||||
+ return 1
|
||||
}
|
||||
|
||||
# Notes: sed not used to avoid case where /usr partition is encrypted.
|
||||
- mode=${key/*:/} && ( [ "$mode" == "$key" ] || [ -z "$mode" ] ) && mode=reg
|
||||
- key=${key/:*/}
|
||||
+ mode=${key##*:} && ( [ "$mode" = "$key" ] || [ -z "$mode" ] ) && mode=reg
|
||||
+ key=${key%%:*}
|
||||
case "$mode" in
|
||||
gpg|reg)
|
||||
# handle key on removable device
|
||||
@@ -124,7 +142,7 @@
|
||||
&& foo="mount failed" \
|
||||
|| foo="mount source not found"
|
||||
fi
|
||||
- ((++i))
|
||||
+ i=$(( $i + 1 ))
|
||||
read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
|
||||
done
|
||||
else # keyfile ! on removable device
|
||||
@@ -146,17 +164,19 @@
|
||||
fi
|
||||
ebegin "dm-crypt map ${target}"
|
||||
einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
|
||||
- if [ "$mode" == "gpg" ]; then
|
||||
+ if [ "$mode" = "gpg" ]; then
|
||||
: ${gpg_options:='-q -d'}
|
||||
# gpg available ?
|
||||
- if type -p gpg >/dev/null ; then
|
||||
- for (( i = 0 ; i < 3 ; i++ ))
|
||||
+ if command -v gpg >/dev/null 2>&1; then
|
||||
+ local i=0
|
||||
+ while [ $i -lt 3 ]
|
||||
do
|
||||
# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
|
||||
# save stdin stdout stderr "values"
|
||||
gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
|
||||
ret="$?"
|
||||
[ "$ret" -eq 0 ] && break
|
||||
+ i=$(( $i + 1 ))
|
||||
done
|
||||
eend "${ret}" "failure running cryptsetup"
|
||||
else
|
||||
@@ -166,7 +186,7 @@
|
||||
einfo "If you have /usr on its own partition, try copying gpg to /bin ."
|
||||
fi
|
||||
else
|
||||
- if [ "$mode" == "reg" ]; then
|
||||
+ if [ "$mode" = "reg" ]; then
|
||||
cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
|
||||
ret="$?"
|
||||
eend "${ret}" "failure running cryptsetup"
|
||||
@@ -177,15 +197,15 @@
|
||||
fi
|
||||
fi
|
||||
if [ -d "$mntrem" ]; then
|
||||
- umount -n ${mntrem} 2>/dev/null >/dev/null
|
||||
- rmdir ${mntrem} 2>/dev/null >/dev/null
|
||||
+ 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} != 0 ]] ; then
|
||||
+ if [ "${ret}" -ne 0 ] ; then
|
||||
cryptfs_status=1
|
||||
else
|
||||
- if [[ -n ${pre_mount} ]] ; then
|
||||
+ if [ -n "${pre_mount}" ] ; then
|
||||
dev="/dev/mapper/${target}"
|
||||
ebegin " Running pre_mount commands for ${target}"
|
||||
eval "${pre_mount}" > /dev/null
|
||||
@@ -209,12 +229,12 @@
|
||||
fi
|
||||
|
||||
mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
|
||||
- if [[ -z ${mount_point} ]] ; then
|
||||
+ if [ -z "${mount_point}" ] ; then
|
||||
ewarn "Failed to find mount point for ${target}, skipping"
|
||||
cryptfs_status=1
|
||||
fi
|
||||
|
||||
- if [[ -n ${post_mount} ]] ; then
|
||||
+ if [ -n "${post_mount}" ] ; then
|
||||
ebegin "Running post_mount commands for target ${target}"
|
||||
eval "${post_mount}" >/dev/null
|
||||
eend $? || cryptfs_status=1
|
||||
@@ -235,9 +255,9 @@
|
||||
parse_opt() {
|
||||
case "$1" in
|
||||
*\=*)
|
||||
- local key_name="`echo "$1" | cut -f1 -d=`"
|
||||
+ local key_name=${1%%=*}
|
||||
local key_len=`strlen key_name`
|
||||
- local value_start=$((key_len+2))
|
||||
+ local value_start=$(( $key_len + 2 ))
|
||||
echo "$1" | cut -c ${value_start}-
|
||||
;;
|
||||
esac
|
||||
@@ -259,15 +279,19 @@
|
||||
esac
|
||||
done
|
||||
|
||||
-if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then
|
||||
+if [ -f "${conf_file}" ] && [ -x /sbin/cryptsetup ] ; then
|
||||
ebegin "Setting up dm-crypt mappings"
|
||||
|
||||
- while read -u 3 targetline ; do
|
||||
+ while read targetline <&3 ; do
|
||||
# skip comments and blank lines
|
||||
[[ ${targetline}\# == \#* ]] && continue
|
||||
|
||||
# check for the start of a new target/swap
|
||||
case ${targetline} in
|
||||
+ ''|'#'*)
|
||||
+ # skip comments and blank lines
|
||||
+ continue
|
||||
+ ;;
|
||||
target=*|swap=*)
|
||||
# If we have a target queued up, then execute it
|
||||
${execute_hook}
|
||||
@@ -277,7 +301,7 @@
|
||||
;;
|
||||
|
||||
gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
|
||||
- if [[ -z ${target} && -z ${swap} ]] ; then
|
||||
+ if [ -z "${target}" ] && [ -z "${swap}" ] ; then
|
||||
ewarn "Ignoring setting outside target/swap section: ${targetline}"
|
||||
continue
|
||||
fi
|
||||
@@ -295,7 +319,7 @@
|
||||
|
||||
# Queue this setting for the next call to dm_crypt_execute_xxx
|
||||
eval "${targetline}"
|
||||
- done 3< ${conf_file}
|
||||
+ done 3< "${conf_file}"
|
||||
|
||||
# If we have a target queued up, then execute it
|
||||
${execute_hook}
|
||||
--- 1.1.3-dm-crypt-stop.sh
|
||||
+++ 1.1.3-dm-crypt-stop.sh
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
# Try to remove any dm-crypt mappings
|
||||
csetup=/sbin/cryptsetup
|
||||
-if [ -f ${conf_file} ] && [ -x "$csetup" ]
|
||||
+if [ -f "${conf_file}" ] && [ -x "$csetup" ]
|
||||
then
|
||||
einfo "Removing dm-crypt mappings"
|
||||
|
||||
- /bin/egrep "^(target|swap)" ${conf_file} | \
|
||||
+ /bin/egrep "^(target|swap)" "${conf_file}" | \
|
||||
while read targetline
|
||||
do
|
||||
target=
|
||||
@@ -33,17 +33,19 @@
|
||||
eend $? "Failed to remove dm-crypt mapping for: ${target}"
|
||||
done
|
||||
|
||||
- if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" ${conf_file}) ]] ; then
|
||||
+ if /bin/egrep -q -e "^(source=)./dev/loop" "${conf_file}"; then
|
||||
einfo "Taking down any dm-crypt loop devices"
|
||||
- /bin/egrep -e "^(source)" ${conf_file} | while read sourceline
|
||||
+ /bin/egrep -e "^(source)" "${conf_file}" | while read sourceline
|
||||
do
|
||||
source=
|
||||
- eval ${sourceline}
|
||||
- if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
|
||||
+ eval "${sourceline}"
|
||||
+ case "${source}" in
|
||||
+ */dev/loop*)
|
||||
ebegin " Taking down ${source}"
|
||||
/sbin/losetup -d ${source}
|
||||
eend $? " Failed to remove loop"
|
||||
- fi
|
||||
+ ;;
|
||||
+ esac
|
||||
done
|
||||
fi
|
||||
fi
|
||||
8
sys-fs/cryptsetup/metadata.xml
Normal file
8
sys-fs/cryptsetup/metadata.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>base-system</herd>
|
||||
<use>
|
||||
<flag name='dynamic'>Build cryptsetup dynamically</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in a new issue