diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-08-07 23:41:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-08-07 23:41:05 +0000 |
| commit | df95d72e4580093ddaf55c2ebb5bf509c5dc587f (patch) | |
| tree | a0248a32faaa552a0d7ef7e73f5c8d5204c013ce /sys-fs | |
| parent | Fix building with libpng15 wrt #378147 by Diego Elio Pettenò (diff) | |
| download | historical-df95d72e4580093ddaf55c2ebb5bf509c5dc587f.tar.gz historical-df95d72e4580093ddaf55c2ebb5bf509c5dc587f.tar.bz2 historical-df95d72e4580093ddaf55c2ebb5bf509c5dc587f.zip | |
Patch by ekass to skip service-specific openrc configs #377927.
Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 14 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh | 3 |
3 files changed, 20 insertions, 3 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 294d42c641c7..f60c90f1a4f3 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # 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.115 2011/03/17 16:25:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.116 2011/08/07 23:41:05 vapier Exp $ + + 07 Aug 2011; Mike Frysinger <vapier@gentoo.org> + files/1.1.3-dm-crypt-start.sh: + Patch by ekass to skip service-specific openrc configs #377927. 17 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild: diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 368a478bdd19..2086539402d1 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -1,10 +1,13 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4 AUX 1.0.5-dmcrypt.rc 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 1.1.3-dm-crypt-start.sh 8559 RMD160 31eb847cdffae59d6106640d903d4a4868b8733b SHA1 3997577a46268bb42cfe636a1c6ab95957d38678 SHA256 b071aa4fd11ae5ee848d6d4d4cef66fe7ccc5fd4a2c8e709c2be74f7f3dfbaf3 +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 cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd @@ -15,5 +18,12 @@ EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452 EBUILD cryptsetup-1.1.3-r3.ebuild 3364 RMD160 a4e497ae62cc974350460446b173fb3d092afc28 SHA1 e640b856ab39e456ed194da62fe0cf0dc11d76ab SHA256 54733ac01c0e2ec02c02ec6f13e50a24452cf1d7c93135a5bf8141129687ab52 EBUILD cryptsetup-1.2.0-r1.ebuild 3551 RMD160 3504879074c3bcb321366d1d5364feba5e60fe21 SHA1 06d2b1fd114ea580fbe43338fdd98f3fd4020a08 SHA256 b0f240059a16b29b2f134159e4fce3265074d44ddaf9f041c2b54bef771c8bf3 -MISC ChangeLog 16829 RMD160 c956ad97c6d97595a64c856054c8690806bf2de0 SHA1 e539557419fc7f944fe9e45829b0e81bbbb404c6 SHA256 12e84253deb1051c8f438a6d5236ec82bceeff5ed8429a142c4a7aba7cd498a5 +MISC ChangeLog 16976 RMD160 b4216acaa00cc2f2ea82cf950c6153cb36f07dca SHA1 4e433b277a9908d795e9e7069dff0dba6e2292a2 SHA256 f456e09123ad94cb333a50169896560ed14ee7c0e2431e4a6bbc0e90900b6ea5 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk4/IooACgkQaC/OocHi7JZ/rgD9HTDMrCNoTeorMqhOONzRg3SF +k5eU09lQM/+uNRgGZDQA/3q19w3cdQUoMN7VGRvrEbPNSCWcp8FPTVd0UA1obv0d +=im4W +-----END PGP SIGNATURE----- diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh index c78f0bcaedaf..e56dbc97815d 100644 --- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh +++ b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh @@ -266,6 +266,9 @@ if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then # skip comments and blank lines [[ ${targetline}\# == \#* ]] && continue + # skip service-specific openrc configs #377927 + [[ ${targetline} == rc_* ]] && continue + # check for the start of a new target/swap case ${targetline} in target=*|swap=*) |