diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2014-12-02 15:00:35 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2014-12-02 15:00:35 +0000 |
| commit | 7c30cf5d057cbe6db72c3124a4a9130c0da689df (patch) | |
| tree | a80174fa074dbd8079053abd2849cd0256fc3c46 | |
| parent | version bump for security bug 531408 (diff) | |
| download | historical-7c30cf5d057cbe6db72c3124a4a9130c0da689df.tar.gz historical-7c30cf5d057cbe6db72c3124a4a9130c0da689df.tar.bz2 historical-7c30cf5d057cbe6db72c3124a4a9130c0da689df.zip | |
fix #524486
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13
| -rw-r--r-- | sys-cluster/drbd/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/drbd/Manifest | 22 | ||||
| -rw-r--r-- | sys-cluster/drbd/files/drbd-8.0.rc | 8 |
3 files changed, 13 insertions, 22 deletions
diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog index 6a27997c1b8e..89d8f90c8f7e 100644 --- a/sys-cluster/drbd/ChangeLog +++ b/sys-cluster/drbd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/drbd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.133 2014/08/28 16:55:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.134 2014/12/02 15:00:25 ultrabug Exp $ + + 02 Dec 2014; Ultrabug <ultrabug@gentoo.org> files/drbd-8.0.rc: + remove bashism from init script fix #524486 28 Aug 2014; Michał Górny <mgorny@gentoo.org> drbd-8.4.3.ebuild: Install the bash completion file to the correct location using bash- diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest index 98553e3ebc08..0cbfee7931e5 100644 --- a/sys-cluster/drbd/Manifest +++ b/sys-cluster/drbd/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX drbd-8.0.rc 3165 SHA256 548b14d6b15c39779f2723e6caf61ee8fce5c18767fb7c940de733c760393ce2 SHA512 9497004b73db57ecb569ced7712937434ef180707fc7c3e822ac5e5dc17fa30f1cef4ce37b2c7439bedb779f9c27c96c0bce6bb61f8ddb3d1045ed3e6e5c38fa WHIRLPOOL 04e90ce05f6fb8c7b350b62dc1a25afc5c59d0aa13e4f9729e68bbb380fbb1da3ee02642125f7b402f9234d1462a6ad2e19948125f99d51e144749f53a8318c5 +AUX drbd-8.0.rc 3148 SHA256 c5bd56590335117160ea9b7d8248a18a5cf54568bc0f10336389155bb701f646 SHA512 99d97a709bf21f397e1d696172157901c3042504b35b8b5420101922dcdbb8bf2951a8daf4db7a181029b978124ce77c134f4e34b301090fa2fea14a8da64816 WHIRLPOOL 32f30816d9369fa05cdb65b92079d74a931fefc6b2dd3a11a926a1b8c226582e5ba0fd0926405335a36dc1c187ba621a5f4af4ebda26ae25899860c4098149a5 AUX drbd-8.3.11-kernel3.patch 762 SHA256 cec36f41078c6c5824733731c82532cfbc0cdbff97f1995345e8266b755985b5 SHA512 b6760bec81d86c09544ad366a73eec84fd486fa1dd10f278cfbacf18be33aec9a132108a9fb8cdccae3840da868548cbe9e6c5799bb2049f2f75fa9e0fe6293f WHIRLPOOL 5ecf2e4de4f0abfbfbc5f962b17a0bbd1c10b27e7eb5b2b2dcb281c097bbdd98715072c422b46814b79359cc0fd15333f3f84ebe5f56cca6d82fe13b4adce6bc AUX drbd-8.3.8.1-implicits.patch 288 SHA256 f45801ebdeb0a2de56b9ee0adf296d5271f644648208587aa32adab6cc6ae148 SHA512 9cf9ae1d1f9716a3553b91d3a3fe1c5490b4aec017b6d4175a91d351245201d8f925fe3af2a7974d66f1cb22583678d669e38005d64a41a0971f2bcffe55a974 WHIRLPOOL 73bcf90237fb302a674787108e5ee628bf983b3f81bb14259b5b5c9b6656c38a43da414f5f8dbf73803497b50593036b9f4ab6b1e35bd7570bcfd4395d6dc962 DIST drbd-8.0.16.tar.gz 322758 SHA256 3bdb662663d308da9d871cc66ddc9e807a10ad5ab510a33b62877231150bc059 @@ -27,24 +27,12 @@ EBUILD drbd-8.3.8.1.ebuild 2077 SHA256 0df38c540790269dd245ab02738b1f1a47f712fb9 EBUILD drbd-8.4.0.ebuild 2213 SHA256 28f96788c6150a204f6c2c976a92d3a5fc5e7aba54d2abbbe0773aa79736aa09 SHA512 0085f4fd4d920b0efe8728ad3726850e29a1b9a5ec7ef06a68d252b7a6870170814841192a1ead072bafada04952f90c841aa39c1fbe2d258f7beb3b7b80cf06 WHIRLPOOL 97b7d9e4a1800628668198c3a739999bb47345813f796fd41869731fa95345385980779222bcf6f78f705d71048fee3b74b0f04f93c1fa89bf4fe3668820bc0e EBUILD drbd-8.4.2.ebuild 2295 SHA256 721c476a5814f775cd9925bbbc038a32c7e4ff30a409d7c32258d5907e761644 SHA512 842acdf83778a4f1662fc4afc8b584a8717fc9f4bbd6d9d5a30af860d9a8f869dcb231cf3cca4d1c96cbc2662777225259860548f1e43a6727cf334a39a1a8e8 WHIRLPOOL 9a4c9c0f3cea0a8bc87b2609293b91e05d0b8377725559c327c557bbba869914325c72ffcd1a2c908f408d2a6b8db5b286607e7c6a51a66afef57a1fe702e507 EBUILD drbd-8.4.3.ebuild 2316 SHA256 9d1500bc23fefc67ab19015f1d6f9140afa00aaaf2a37d5edb37529963bf3b67 SHA512 ab01f6ee63bd4880ceecc7a3d5a3e9b3228aba02427bf88e28c2484f331bb190f9c0d82eb3a40cdc3a54cabbbbf6f372a811e5580a96999f2776b4fccb8603b1 WHIRLPOOL 4c7806c73db2e243a148089f29ffa482cc4174cf3fe329a774a005cf3f0ad3b19c1ffd632f1b0468e58255167aab334c3256f04de7d322d6fa4ed4021be345ed -MISC ChangeLog 21234 SHA256 3f2c75d92319ec381d61c1ef1b5cbb0dcac17f57b8d0d4442be3e61191bd2aa0 SHA512 2d3b00b2c8809bea569ab6378ed6d1497c7d9cf1ae93b513562ad68110e3b02ed27eae7c7e88d8e18c4d9fb138663e540f46789c637eb64cb7fb09c35b5e94ab WHIRLPOOL 2426c187b24b3bff7e68993c5f70c83d22e9a7ac8a2507b8d7ec83a965f67390d730c19c77ab0b7700327055c3f5a415d9aa89aa03aa6a59342a114be590e2ef +MISC ChangeLog 21348 SHA256 e0a1adbb7be5363aec129bc649fa7644cee0fe15c1d772e85c5d8da35c5c936d SHA512 0a04a29401ed5a464706ca86b2bce2110c8b2ee800d95ce4dc7216bf17d273a8f918645e2c2d22ad2fa651090a2ae88359f7d67437f05561ed89ab6ef262f77e WHIRLPOOL 1a9273b9bf53ec7c2df7ede59c2cecb91eafd10b6b809c563c13d98531e5093d980c7c2ad17f2b97addb893453e4b2aed29d65e458d572321841479ee92788ad MISC metadata.xml 584 SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d SHA512 415c5c3564723b61e7e30c849a3bde17e36c85eede46b2baa8b0f34d0c024f7dae9e9b89942c8de84c1c454e3152d809c5d2d45d31378ae299287dabb9806e02 WHIRLPOOL c23f13e1a4bc663bedc07fdd0f63cd63d589fb355aba6d5d1102b6924fffa363dee3ce39b8b27189f3adc1bfaded75ae3d6bfda223f020bf813047f4e6d6991b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJT/18GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBAAP/j6h+R6f6uGqm+rjnlavKZ0X -Tc5UK6t0uX2Bdqvw1xecPUEOXyDpMgkRLiYytVp3qrvOyTiqZDVKaviaTUNH/yjV -wF3X65oZSTyAD973hbl3GfI2EZKozBGPFVG8d6m4CDcbGmHMvllYEaZSoo7E4x6u -BLImXMtigmQyVvvUg6IYIZzQJW+VVim6Ag5D9f3s9NITLNPUofVoFxzi0pLjPGR4 -qbRlMETKr6r0oWepZz5L4IQqLRYS16VlGOF501ASanLK7gRTW7TUoOqIvxGKHtdV -WB8yb4mD6Y7JCbd19VzYdKIbjta6YiwosxgNU6CLKZ7J4QqbJbcmBm6wz6SXaXzd -1f/gBN05jR8R9SrRtwcc5wCmiSPMlccO70CE42deoLtLZyyOSU/vhwrsUkEFI88r -D3DfhfklawrWLj41WrEZZcVUI0uPtElJgf085t7WLnbVV4sX+9L7fjB/xElFPbV2 -re3Rc7+j0rJsveCiWbo4df3wAszYQpHOwXUcVyIQKsc+y3777MsWA5WqiZKxaY2D -lEBN5stjimNhKykMEG8kWGvVEHxjXoHkCY5t1smNI/e0Z9VC8+5CXCfDJ0xPsC1b -V9GumxVfXslEzFY3e+HnryWsybfleeJKoEX7aAwiOhYUd/0dQIonr+xbcfjpDHIg -InRZJ5vbz8dygJ3n4Qy2 -=2Xme +iF4EAREIAAYFAlR91A8ACgkQKiQSS7ZY+hMQigD/eTozm6Noow5e74Qgc+29oJKO +SF574Evz5vnVOnTS2D0BAJFmWWTIxRVoEKN3/XaGMf4hnLTUUi6dmamiz0V5Jl8L +=TD71 -----END PGP SIGNATURE----- diff --git a/sys-cluster/drbd/files/drbd-8.0.rc b/sys-cluster/drbd/files/drbd-8.0.rc index d5ce7d8e3205..5ed9ab200596 100644 --- a/sys-cluster/drbd/files/drbd-8.0.rc +++ b/sys-cluster/drbd/files/drbd-8.0.rc @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v 1.8 2013/01/17 19:09:04 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v 1.9 2014/12/02 15:00:25 ultrabug Exp $ extra_started_commands="reload" @@ -30,7 +30,7 @@ fi # redirection. $DRBDADM sh-nop -function assure_module_is_loaded() { +assure_module_is_loaded() { [ -e "$PROC_DRBD" ] && return ebegin "Loading drbd module" ret=0 @@ -40,7 +40,7 @@ function assure_module_is_loaded() { return $ret } -function adjust_with_progress() { +adjust_with_progress() { IFS_O=$IFS NEWLINE=' ' |