diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-06 01:47:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-06 01:47:29 +0000 |
| commit | 6b169dc8a63e094ff63b908e7600488f2ce4283a (patch) | |
| tree | 5f955318387c7ed83b909f35d232d8d5cc83ee1f /sys-fs/cryptsetup | |
| parent | Patch to prevent html docs installation with -doc (diff) | |
| download | historical-6b169dc8a63e094ff63b908e7600488f2ce4283a.tar.gz historical-6b169dc8a63e094ff63b908e7600488f2ce4283a.tar.bz2 historical-6b169dc8a63e094ff63b908e7600488f2ce4283a.zip | |
Do not warn about global options #329437 by Marcin Mirosław.
Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 10 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index cce2ba9979f3..8b3d6983c217 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.95 2010/09/30 01:35:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.96 2010/10/06 01:47:29 vapier Exp $ + + 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) diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 14c9cc88319c..8299fab2f05d 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -9,7 +9,7 @@ AUX 1.0.6-dmcrypt.confd 3309 RMD160 23a1a91ae2b2fd4d743bf8e0427cf40e4b24ecd8 SHA 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 8056 RMD160 abde93caba4baa0c19f2b06f56124267f1e45d2f SHA1 cd95a1babad12d2e33ede83ad9fb8f473fed8978 SHA256 848d6ebbf4b66b5b11cc7e0485f4ff0bfb6386fcf1042fa598f682471d92aad1 +AUX 1.1.3-dm-crypt-start.sh 8131 RMD160 f81286cbd07155c743fd679c19e531ff3a228461 SHA1 e67d2bd2df95ad098cc67a5bbeba7da4426d4014 SHA256 f671be89b8d0d005dfc4aadc6d9a9a3bf80e720d54574515632d63ac8dd27ab7 AUX 1.1.3-dm-crypt-stop.sh 1107 RMD160 6920a2f701f7c80adafa6a10918e51d896867faa SHA1 81ece35ca41bae4d1737c706de1b07cc8a530773 SHA256 497c381871d38de1d47052c08c89e42b9489784c5f878472303a4bdaf402e450 AUX cryptfs.confd 1337 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 SHA1 5e7b239e549b6def07af968d02b300ec36d8aac1 SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60 @@ -25,12 +25,12 @@ EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2 EBUILD cryptsetup-1.1.2.ebuild 3387 RMD160 85af8bf703ba0de8e0d551e13d38ea50c8ffe0ee SHA1 84cb3dda0a0171cf8521def6553c41244268d12e SHA256 c35b0a8a6f8ec3d6269d9d5f187811bcb5d336719b28566a53829c9adeeaeb37 EBUILD cryptsetup-1.1.3-r1.ebuild 3153 RMD160 85b5644a340943d6a3c35698ea16c4852ab1220b SHA1 995b80ae8fca61d0fac9cba0fe78afba405505b4 SHA256 041645e8c23e7f0f5defbcb38f3de8da8467561c63b0adb269cbddfabc8aa936 EBUILD cryptsetup-1.1.3.ebuild 3397 RMD160 40eab87e9d566cf807d7d7c1d274cb82a3f19812 SHA1 0bcbb75cf10c9221432b8aae34d67993bbe74ea3 SHA256 1270c0f6df14ffb46cb97760863743160ae1520e18c133a2969661e9a3b1d1e4 -MISC ChangeLog 13787 RMD160 3405f94fe4c89e0af838e931a259615f164d46b1 SHA1 ff6d52a5619c132811ec705e4ed6528a188d318a SHA256 59fd9de5794f7f1ed6614e4d0597b8e2b1f18b0673c32c396bf221a8593811e4 +MISC ChangeLog 13935 RMD160 dc83db93b3b22607101a67dd6e76110811b0d201 SHA1 61ce063341d7b622d9ed84c88ce9e44a3e67f402 SHA256 52d515146ff4f1584380962ca69df2bb6b000fff1e7637c6eca25233a487e057 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAkyj6UQACgkQTwhj9JtAlp5dDwD+KYybzvDsNrqYXyy2KTHDSdeI -l/BjtQqG6Ee2ga5MCdsBALRDr7b4idamYUFCoZzlYEKkEUpngYRwtnLp+39g2VqN -=JrE7 +iF4EAREIAAYFAkyr1O8ACgkQTwhj9JtAlp6ALwEAkxJKysF9ytS7NiFyQe5oqHqr +ANZAG6Tl/8gZuE6qi2YA/2evjTs3OohzX/WFL4WQ/bcdswCJ8TdJsLWrDuc6XOkQ +=dc/1 -----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 084701c33750..6b0d1c1f077d 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 @@ -274,6 +274,11 @@ if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then fi ;; + dmcrypt_max_timeout=*) + # ignore global options + continue + ;; + *) ewarn "Skipping invalid line in /etc/conf.d/${SVCNAME}: ${targetline}" ;; |