diff options
Diffstat (limited to 'sys-cluster/ceph')
| -rw-r--r-- | sys-cluster/ceph/Manifest | 3 | ||||
| -rw-r--r-- | sys-cluster/ceph/ceph-14.2.22-r1.ebuild (renamed from sys-cluster/ceph/ceph-14.2.22.ebuild) | 3 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 3dec053fe4a8..16f36d2496c2 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -12,6 +12,7 @@ AUX ceph-14.2.11-systemd-unit-fix.patch 1110 BLAKE2B 6964fb2e9e09fef25020b8c0f3b AUX ceph-14.2.22-build-without-mgr.patch 880 BLAKE2B e18113744dd499e773f730564fc97ae1d4d194b6a88f99aa6a1a47035047aa9491221ca292eaed850db0a5a808380ddc2f3b373e6688472b4e4abf797042ac25 SHA512 d261f641b3ef0298efa622a8eb7db152e617584cfcf5f92a6b61c732de50a3a9c76fe98440e8459aff191a69d87f3bd042663001f505bfef6498b1fb1f409c70 AUX ceph-14.2.22-cflags.patch 981 BLAKE2B be9729419323db95927264b6ba8db6243bea812889a61041fa5d27e453a5c7b153a4adf322fc6fa5eb91b18dc8907cff50eb2da099fdad10b42fa80947ff1bc7 SHA512 bc9957948d538bf7a014053f588b0162aad2d8ffdf61f20fbcebe3f163c695d46cb7b485941f91e03c2dcedc691133babd55e1ba060eb0a571a72e735edbba22 AUX ceph-14.2.22-no-virtualenvs.patch 2166 BLAKE2B ef890bbe39597774577d11873004038888d83bd81abfd81ea959d00225f826bec712d32cc5c36b5e1d1588d9364fded4dcdb7fd17836379ff5f0a5c7979d9f1e SHA512 c5dcc5183a889ac8a5ecb25b0c5345dbeba388a8a31fb5eddb7531a72c6a3dd018c53b2ec95140c124d6025285b345c0c5541e8055f9b4d91bd678dfbbaf2cd7 +AUX ceph-14.2.22-snappy-uint32.patch 575 BLAKE2B c3c34518055ef723a4e56f10f2c410f3d614bfa5af79e1e4290f090b74de3ff1b1d4fd2f0d26b712f0d4107fda8196e942a07f3a730ffc9b241c65dcfc76f52d SHA512 7af984f4c211f25cf4d819e928269a2e2dc861048f80f16ed63325cc71fb3354391d94a2858874c59c6fd7d7ab72e497072e23e487da8939807b871d5cdbcf4a AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2 AUX ceph-14.2.4-undefined-behaviour.patch 1990 BLAKE2B 4f9839bc05c95d40c870f346ebb1856f2846adb26fcbbed67e260f47def9b7167bac4a15917262e8c9dbb99cb83892da2aa315b6d9ee8cd60eb222876dc56482 SHA512 15e4df7cadb02e65144dffea3c287e853e27a04c18281c13282409f1bc28184f31b80d505123a3a29e5394fa0b5e3e3f1246bb70353f142e52e19939149a341e @@ -48,7 +49,7 @@ DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad1 DIST ceph-15.2.15.tar.gz 148584988 BLAKE2B 6ff629846a74c9b30c7e5d54731e2c85c67942f1871194cc8e704c56826b86cdd6163d6693805d9d6210bc0e3fc4d84fada12b9d81a5640e34d76be83cfe6e47 SHA512 e4d929ffda5c3e31767d93340fb97b5d49ca1d5641f6c30134ce5542486fc4f72684aef2ef47cb940a332e8b9144d8cec63ce8a9f86c773dbc0ccebdd8e7fb19 DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0 SHA512 5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a DIST ceph-16.2.6.tar.gz 156087762 BLAKE2B e2595d1a958200e4f1877e4597c53319a9eee2e95606ea1b3ba2966a0d17f1cfcf52e05cca59752cc6ac383e32d944c380920d111aec840631235aef273a4de1 SHA512 f01e29088ae566d4111c21b5d0c173ddb02badaa0d8272f7f1548eb8e66a95dc7052b3945d9fb342e6c97a65c57648fda394317340d1f4236a57af7580073658 -EBUILD ceph-14.2.22.ebuild 10408 BLAKE2B f1cf94e11b52be223be81070f9186db8073adc6c397ef8e71298724e2098d1a0e6742c292c68e75207aa8aef40be5bb2d45eccd015407520fde469840724870f SHA512 9ef62b42dd7977926461adfbe4f32518e4f788cf05ae33a17f00fa9ef106dc165ce3f612e790fdf07b00df71374b48077a156aa83657411ad19f1ea6cc21cf7e +EBUILD ceph-14.2.22-r1.ebuild 10462 BLAKE2B ac59404f02b137daea912fc891a3a77e420829b79656161268190402e5020e1a4ce19400c2a97fedb5148347f26cce24fad8e70629c3ba2e29f68665002016bd SHA512 283caeefb71e9911a735b6fb9db7314f263627da58650b3a68d26857b5f4dd7d489bf305289c7bab15a814178b1d5130142e0e85f0d4f7e2cd5c33a90117920c EBUILD ceph-15.2.15.ebuild 10770 BLAKE2B 3d079cf7f1ebc1fd6d5ea02b360cfa90715f098d4d5b667dcb940582f4dd1e4610e0203480cfc0098c2c9eb3c623c40c5eda6cb5774a988ccb479412fc0db41b SHA512 405ce9a34e2df9fe6610e5f2a126719908fcfb4782e1478ce2d10a2b7d4daa12f9e2c20149637cf14a91576c6c92fdd17f537f37b1f69fd44ccbd376a353d13e EBUILD ceph-16.2.5.ebuild 12020 BLAKE2B 07add334a77f2da4c6c5f2b0fe564aea99d0a3d6be09360155873179e29271fc0844a62f33c279eaa9ad35b8b86f6b7d3dd96f21ecbf0ce2070193870ca14270 SHA512 15ae3d05777b333d4ec8ff5d80ed81e384fc2313b533d9a2b71c889543d0072ed1e65b2acc1ecb52a1af79cccb5e6a670c50785e7b94674ce54fe87a14578842 EBUILD ceph-16.2.6-r1.ebuild 12154 BLAKE2B e512abddfb819adeb1cdd02705f407b7a6e18012144a4d1b4a59dee212946aa2b5262a5acfda645fea17402b6cb59e971eea25260830792b2e9b57921e85063c SHA512 5a12294037bc0fbdbcdb54d5d49f6eca152913f4ff4a12483f8b6c4b8ffd73d6b68e0468b1f51dd45a5ea3dabb11682fb3f8abe57ee6bef92cddb658541e5c10 diff --git a/sys-cluster/ceph/ceph-14.2.22.ebuild b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild index 1288ebd6a786..c0be9260aa23 100644 --- a/sys-cluster/ceph/ceph-14.2.22.ebuild +++ b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild @@ -44,7 +44,7 @@ DEPEND=" app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= - dev-libs/leveldb:=[snappy,tcmalloc(-)?] + <dev-libs/leveldb-1.21:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= @@ -185,6 +185,7 @@ PATCHES=( "${FILESDIR}/ceph-14.2.22-build-without-mgr.patch" "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch" "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" + "${FILESDIR}/ceph-14.2.22-snappy-uint32.patch" ) check-reqs_export_vars() { diff --git a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch new file mode 100644 index 000000000000..c783558a1758 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch @@ -0,0 +1,13 @@ +diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h +index 0291a923112..352ab9a9bcf 100644 +--- a/src/compressor/snappy/SnappyCompressor.h ++++ b/src/compressor/snappy/SnappyCompressor.h +@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1; |