diff options
Diffstat (limited to 'sys-cluster/ceph')
28 files changed, 171 insertions, 1600 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index cfac7f2599a0..49b24289e95d 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,19 +1,13 @@ AUX README.gentoo 1085 BLAKE2B 761a88dbcb3126a47ae6257409d47c3e936743d102430cfc71fac90ea4b8ed876af9815b445e06d88ef407a47963eacd8027cf912ab3fcde724af22fd6a43741 SHA512 cee1b5fb9823333eda0750c04db0c56d71cca1cbf6fed6887ac4ba68949114df74aace3861343bdacd2a1dc4fc38932de805cc03074f981d26891673e454f250 -AUX ceph-10.2.0-dont-use-virtualenvs.patch 3253 BLAKE2B 099d80efbccfb4ce8ac6c7809c70b2fb66b44f3c6ee5fbea64988576320df9b5ea6c420088fc4dba2d899c9410979dae3a7609676271c53b1eaef5187ab33cfa SHA512 f6351c97ca6766aa5eb4ebb91bc013aaf8222029743c95f5c88b9bd8a6caca48908315e8850ffc83651573377b48e5feb170c310b42e2447fec739379169b500 -AUX ceph-10.2.1-libzfs.patch 440 BLAKE2B 8d0c46d54917a0d8f61f913562b4e8f9a54efd04ccf548a2290832a765f69b4db120bab6e72b94295bf1fd3214512db8c598af6ec514b1e9e4361f964b7fe4d9 SHA512 5afe85113f310b86a13fb18ba57030d50ae5bd9afbf4d6f5aacd7cca415dd13544522c5d903eb58ec90cc0f6ae2cbb022941debe7036d1b7fa6c5af26af9b9db -AUX ceph-10.2.1-unbundle-jerasure.patch 16190 BLAKE2B 6a5969ca39389ae26ed83c7a76c69adf049f32d6f183d602a460d844427d18825846d034b9753a359fd18bb19828532ba770318fd8c9c0294954d68b10c1e0ff SHA512 8076a69bb81f89f8892576c4e2ceb03131cbd7ffee82a0d4d66016120f6c79b906172d1a1c30d7642a32ef7afd46d77d7311b65ca55d065995f305cb0e89485a -AUX ceph-10.2.3-CVE-2016-8626.patch 1102 BLAKE2B 394efc3b3cf743790ef46a1ed5941081f6c5da89fb6b72a7d0413f1ae0b90d0142f4d1a60b5f1986beafd7f3f77de45b00632f7c251c9801802bd821fe9b6c2b SHA512 e924b4719f0c4a0aa27ed383c816d0d24d7a979b73fb2962193dbdc31cd23c02061904a696222d73e58e1892b2ca51e9c6df6674fec5c17f013c2f4664790fbd -AUX ceph-10.2.3-build-without-openldap.patch 1209 BLAKE2B 5ba29095421ebbcc7362814627b3459ee364f7a2f5d4256b9b5b85d39c15aabbba8faf725e6a67cee77d4a391e09087f12d15a94b22ffd1124dfc08cc94c9c48 SHA512 2b0476eeb78246f252bd294eabc66c6fe5724d753d0cc2dde56720aada2517e42df3387eb368a53fa553617d436d18393a4e856d6fe7395022b249d522d1ec88 -AUX ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch 794 BLAKE2B d6448cfed9a67d38ed82fa7d7d3a5ba6aa26d629912cb5450cad628eb8c498b4934534404e70d2fea3db12c8e28e84e0c914e86d294071d7662a0fbee05c6cdd SHA512 1261d3f088ffc4514069e73e49f627c6f87e89683cedc0048dba6d0e18f53f9a784f6c558478ebe72dff70669e5a453809a720cde77f5b89675d92840e6609b7 -AUX ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch 2155 BLAKE2B 65ecae6fe095c9b61f26d80a5f12a6d5d22ea3f65d37837e382b24e608ef1bf47bb275183b136c49a95383c9d38e2839e2c7999d21708b95d1bb678a5e2ad729 SHA512 c64b4def2ee9cdc9109ff6c32391384980d5ac4e33d425454fe1ff59910ba622ecb458a6722a5ed0f988e021b83ace5d89cb3974a1cf65862e8766595d8cfb0e -AUX ceph-10.2.7-fix-compilation-with-zstd.patch 1782 BLAKE2B 35c63ded6f1a4740befe952e3685743f0f4cb2500f6451406133d3074179cba0703389c07a9936ecee7d2afc83db24aa212aaea3a856f240230bb6ea76fcb975 SHA512 5929217f64deb45fd803e33cd277443cbb5f5f956fc4be05490a07dae0b02467317426993c7fc44173a18955261e3a73e603775db12e788a93c851f992539ad6 -AUX ceph-10.2.9-cflags.patch 449 BLAKE2B a1fc3d1a1e5bb891932d0697631b9a604a47e4c564dc99ef1247cb9e5c26ba7bb5e421b4ca624e78b31d279c93db2965eab31d38f1d3b8fd93d247789ae9408c SHA512 17a165710b0effacc34257daf077f70f55e27f0bddd4dd58bbc8638653ebd13eeabffbb4ead40ddc3a69586c65e01f911ee5f8e1bde94576d66928f0928fa510 -AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 BLAKE2B 94e31ddba114ff798f3334c71df551fd267ca716a4aa4aa8e8ebf534a5e38d1b55d7a102306b60cb7dc7337ba009898c02f953a74b34580a85369788a7169018 SHA512 e97a0c2a40c886029bbff12f8591147b88d5eae86dc79a63b267f10745a465da62786cf41c9fd0f01f51805907633c1fe954ebe09b0730660cf690f2c53a8252 AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980adbaa2d68045e6378cb68904e939d8e7f7325fc5102151ea4e1f5133751b620885d1d0b3d6fe565291272b4b2a SHA512 9864da1a83c1145d143eedd73fd3ff142b354fd0bffa73a25f30eabd68d7eddee82208be7b7da74536ba4c996808aa77fc55bcf562a409240d69cbd249ef1d75 AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc AUX ceph-12.2.11-boost-sonames.patch 7971 BLAKE2B 259be2dd12c15d5951e0ea4f2da50a003352cef9e1228d70be0e62b426aa2e5e1ec8509707511986b9067dcb98d96b9b02ac9f5ddeca72bccdb162fdb20cf72b SHA512 03af0a0f2c287f3edc685857d51b8e8d370337f42a1e0630deb1f69c8bb2fad2aab065d43fa22ca099aa51d3b5b962e0aa63a5f7110bb2b39577df71b65c18e5 AUX ceph-12.2.11-fix-min-call.patch 692 BLAKE2B 636938a262cbf640531481f3f5030f1975c96253f56baf34a059c3c0b2d4dfa7c80cfbced41b8a832614a26532a6de497ab004950e0bc7b197d33040c0d38646 SHA512 9eece21ea40f785cbc1003f6af1d05ba764969a9c0ff275fd28b10bb4be5efab322bf9154d9bae575b45e9229572162901668c963333a00d8e98a48e0a6a3df9 +AUX ceph-12.2.12-civetweb-openssl-1.1.1.patch 383 BLAKE2B 77d2c5bde22b2239faf5d81ad6e8cc59b5d538e41cda50dc505c860421d392c9e3c53eeb9ad6c626fc3f610851b3ab03b013a33e88a5f28dedc7f7f9bd4f68bb SHA512 52a7fb10fed600e390d207e32aef7e1f53c7e3d0866e8cf607709cc233811a2ff697a342295f05b6787ea64b7e914487f1bbfd1f9f7d258a328d34ce2758be9f +AUX ceph-12.2.12-dont-use-bad-namespace.patch 416 BLAKE2B 10018739a4a726bdf4eef44904a1e0a95eb9e6ce43750606a4159c8577190d2cf07fe7a50cc41f9aff6135f1aecb3d0d836b49594322f443ddf8d92bb9941364 SHA512 50e6d0ddbac9380ddf68b259e99ec585e9b1b5b26ac813e9ed947f417706adcf128a9c49e36af0373762233a1020611addab05832effd7a4fce7bca928264bdc +AUX ceph-12.2.12-ncurses-tinfo.patch 573 BLAKE2B 87a2bb90dbebfeaa538697020a0d94d3b96a25e2d576a2b7b1281db81ee93db98c42b72f5cbda8b6a8b66e84b20429ceae9bb6a16110c1db371f6447c79a0287 SHA512 e0d24fe288f56fdb4ffabb25701a1b343083932fd97dc00fe66dda4c339409f922a4b3b5803534467b1138deaa5f8b886a1bbd9f10636c38fce7f656aede18f2 +AUX ceph-12.2.12-qa-warning.patch 494 BLAKE2B eeee0d451264390f8b6c712b08592b5dca5670b09771225833831c9a052cd227a5528d52521d6fd9420723bef291adb082970df58bdb0e1b14a964345098a315 SHA512 75ea26415a54a5e1c670adf1461516b01473728a9768429c4df6bdb9b9a28073acb7372167651dcc5680e268e5ef7641ef0643ea1ae90d4611feca912819581f AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48 @@ -32,17 +26,14 @@ AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d0 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214 AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38 +AUX ceph-14.2.1-ncurses-tinfo.patch 959 BLAKE2B f13e6fd85401cba869cc459568e731ff43176b75ff427ee7b16ed714cc0ac49437c4d8532cffd79e724dc2a48a142391f138c8669fda78a1091dcb98b9d8dd96 SHA512 7ea763a87ce14fc1a1a33f84e96d6fbd36af8833080e53eaa7ea674219e86c76a087766ef28091d6ea0667b170340a46ceca2300501a61265ae6cb66904eb82e AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300 AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02942590f90e41d646205c44c9d4c7778c844fcc268d69410a6e76ca825882a5e1d4b1e86b0123905b1d6c081de SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2 -AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862fd97b4250594fbf3fbd6739e4faf84c056a8b5402a9089250ea84ce504f2bf2453c09f34dc2fee SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa -AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496348ed155c97332ad6d1567a9c69a3c887fa0bdd184b98cbe7b73198db32aae248e31c7599857a96 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c AUX ceph.initd-r11 3070 BLAKE2B b8e875705720c323377dcedb2fddd76d199eb6430761a75d0da3b26a5a25295e33382ccc88843a894d81a7b07d76ec38faa9a292e67ec6102985d8002ecb3337 SHA512 e3b310a7f99b9226a80bbb9e0b4ed43b3bbe5b69e72f5c0dec5d2f9a7d5f5fc274b1f8e847183d92f27dd283511db8cf5428803bbc833708ce25a38a9da59a63 -AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0 -AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c AUX ceph.initd-r9 2435 BLAKE2B 2e1246f9d409bbe4d2895e9747490ddd108ef22c2060e151944ad2bda1e7ae13d61330cf9f33ec4900eb4fd4a26ff454dd081869901d21bff8309bf8db6d7533 SHA512 c7f0dd45bbada67e93b2e1acdafdb0ccd1de107d9d582b6b83889c5e0f91e524ea1324ab21e96d4c56d6016be6fed718a7791695c95c68813c6b9d6d3dc2a384 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b @@ -50,18 +41,14 @@ AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c5 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a -DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537 -DIST ceph-10.2.3.tar.gz 11596171 BLAKE2B c24c879649f0d42f58cfb1d03701797bc685d83c157031156d13308c731412a4a0149b658193722b358ebf0c4f9760d9664668cd797b69d207e81dc572f49700 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19 DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef +DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac -DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155205f13b118bd01be4ff78a8e1dde682425a24311822bb819ec8cf41a9d45245ffa3cb7a921d3269f6658bf920 SHA512 5055979067234ad7fd2774007d524ef4643d968bf7ce42fc8c3f8e469fd84cbd7afc163cd6ddda53584bd5677fdea2fecf8194a378d49724504f639b9f688ff7 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8 DIST ceph-14.2.0.tar.gz 118882504 BLAKE2B e650d99dceb11c7b035480c8cdd9f63ee4a5f81ffea27988e180a2956433e3e4b34e496a73bf5992c428eff859311c623b92a6f006eb694ebf928d8204dc9b06 SHA512 c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480 -EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638 -EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f -EBUILD ceph-12.2.11.ebuild 8056 BLAKE2B 33b201f83ef2371b154d155dc55769dfe8a4a4fc908eacacdedf56b247d0a1e2276af5499ce8797e7400e560dda06328f5ff74daf63cec8ad65d99a92cac18af SHA512 2c9b9485760727be5eb6bcdaebe1424baf6f3bc9f6e33d1f21e279bf91b7d43c1f160446411484a54bb6bbb5cfaea85134480056c84207c55211ab412974ca4e -EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5 -EBUILD ceph-13.2.4.ebuild 8681 BLAKE2B 8c0d1a86a68c47ffc7b370e31a3bda4c2ff39f1132f0e1418b19b44f4eb5b7f6b1313120b24bcc1a5fbda665b80a6957c96c1006887a7c0693c70e2146b565d0 SHA512 62420bd58b9a072eae10a44321e56f74e11a84db3c2913066e66dd5530f87cdd81b4933c973634e56b6f884f91486d9f8344e6a64ac107b1e5fbcd0dfc788600 -EBUILD ceph-13.2.5-r2.ebuild 8872 BLAKE2B 503074d72a7ebc721e54c245149dced8d3a5f49c28db8cd9f2e7a1514abc8f6160d6e2e00f223924d82a5ff194cf39d73dfc4322f60cf875c7de162294afa584 SHA512 e31c4522df6d4ddb5562ec4ba103dc04ca3025418e48598cb504ea945ea97c7cc119d695f2f4d2dbf684234027464f83f9ae15964596403293e21adde41c45a6 -EBUILD ceph-14.2.0-r4.ebuild 9051 BLAKE2B 76ae006c08bd0e10504a93771bad70cec94b96a8f5f73c154b74bca3e574ccd06c1374a7d55acbefac7934fdd78087209f3c1ffda3e92763d4847d73e933c07f SHA512 fb50e7b9f3328ad8a4a931124210db6194db69d12b77eb72dee97d21256c142ea36d7cff48c099fe15e65cc01b9e49dff0dd149e5acc62b15a8ad0652638c6f7 -MISC metadata.xml 1835 BLAKE2B c4f3c224c4a9f08f88b1eac1942f1fbc3244994c9d3924eabac2fda0dad6d1f4d0ffd41d372d7632d7b679a72346671695389bccf63cda1afe41bf50dd30567e SHA512 99f68c6250e02592d7cb5784e9ce5c2dc9ba31e7fc8e6283063f84d5891faa5b1eb5fdaca3a103cfabe7cb19fe131f75d37242fdbdf41f3ea206f10bf7f68bc5 +EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f +EBUILD ceph-12.2.12-r1.ebuild 8390 BLAKE2B 7cbb4f10b7deb154c6ad7a4e1796faedaa6a35d567f931d58a412329dfe5084c573112b46c20a1b7394d1c732cfc7e16a9638746f2b390f323ac95976f410160 SHA512 80001c80c09a9dc021e47d02f225778be34d1f5b1d218809bace78c9046f4c7ce1fcc78cf4e4618d905870a469020086484b19768e84a859cf867ab2fe0cd9ca +EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1 +EBUILD ceph-13.2.5-r3.ebuild 8988 BLAKE2B 7eeef2b9ebdc34167657126d2ef86e1ed204fcdd5ac8af2c004607f291106dd38e486e17a2d1044e7d4adfa9c6067dfa556504d54eb8b75c03f4fbd2820b6586 SHA512 ba79137aefa69c7320ba88f8a3409b752033aa89c8424863e8b21cf6d0c0079440daee98a338ce01314ce4969a5b7a3f074f7c006a2235aee856d7ad29ae9371 +EBUILD ceph-14.2.0-r5.ebuild 9111 BLAKE2B 9d2f2c126e5f715e83cfde6801875b7cbe29e8cef634ba5c1a89022ad7d3d325a499e4733034e0eb7ee301800062612c019c4ec3429358a029db7757257fb75e SHA512 2666e7e54405a3e7f2dc4b97fc9d41268d2dea87802d1dc32ae25fcf8daf5082f74b32fb4f22355a9ac4d1c1e303af877cd3fd07c2cd2723652fe52d8ee5a8f7 +MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250 diff --git a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild b/sys-cluster/ceph/ceph-10.2.10-r2.ebuild deleted file mode 100644 index 74ca90cef62b..000000000000 --- a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit check-reqs autotools eutils python-r1 udev user \ - readme.gentoo-r1 systemd versionator flag-o-matic toolchain-funcs - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git" - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio" -IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - app-arch/snappy:= - sys-libs/zlib:= - app-arch/lz4:= - app-arch/bzip2:= - app-arch/zstd:= - dev-libs/boost:=[threads] - dev-libs/libaio:= - dev-libs/leveldb:=[snappy] - nss? ( dev-libs/nss:= ) - libatomic? ( dev-libs/libatomic_ops:= ) - cryptopp? ( dev-libs/crypto++:= ) - sys-apps/keyutils - sys-apps/util-linux - dev-libs/libxml2:= - radosgw? ( dev-libs/fcgi:= ) - ldap? ( net-nds/openldap:= ) - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) - xfs? ( sys-fs/xfsprogs:= ) - zfs? ( sys-fs/zfs:= ) - gtk? ( - x11-libs/gtk+:2= - dev-cpp/gtkmm:2.4 - gnome-base/librsvg:= - ) - radosgw? ( - dev-libs/fcgi:= - dev-libs/expat:= - net-misc/curl:= - ) - jemalloc? ( dev-libs/jemalloc:= ) - !jemalloc? ( =dev-util/google-perftools-2.4*:= ) - lttng? ( dev-util/lttng-ust:= ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - dev-python/cython[${PYTHON_USEDEP}] - app-arch/cpio - dev-lang/yasm - virtual/pkgconfig - dev-python/sphinx - test? ( - sys-fs/btrfs-progs - sys-apps/grep[pcre] - dev-python/tox[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - )" -RDEPEND="${COMMON_DEPEND} - sys-apps/hdparm - sys-block/parted - sys-fs/cryptsetup - sys-apps/gptfdisk - !<sys-apps/openrc-0.26.3 - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - $(python_gen_useflags 'python2*') - ${PYTHON_REQUIRED_USE} - ^^ ( nss cryptopp ) - ?? ( jemalloc tcmalloc ) - " - -# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup') -REQUIRED_USE+=" radosgw" - -#RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -STRIP_MASK="/usr/lib*/rados-classes/*" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch" - #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch" - "${FILESDIR}/${PN}-10.2.1-libzfs.patch" - "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch" - "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch" - "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch" - "${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch" - "${FILESDIR}/${PN}-10.2.9-cflags.patch" - "${FILESDIR}/${PN}-10.2.9-dont-run-lsb_release.patch" -) - -check-reqs_export_vars() { - if use debug; then - CHECKREQS_DISK_BUILD="23G" - CHECKREQS_DISK_USR="7G" - elif use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="450M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -emake_python_bindings() { - local action="${1}" params binding module - shift - params=("${@}") - - __emake_python_bindings_do_impl() { - ceph_run_econf "${EPYTHON}" - emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" - - # these don't work and aren't needed on python3 - if [[ ${EBUILD_PHASE} == install ]]; then - for module in "${S}"/src/pybind/*.py; do - module_basename="$(basename "${module}")" - if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then - continue - elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then - python_domodule ${module} - fi - done - fi - } - - pushd "${S}/src" - for binding in rados rbd $(use cephfs && echo cephfs); do - python_foreach_impl __emake_python_bindings_do_impl - done - popd - - unset __emake_python_bindings_do_impl -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - default - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t - - #rm -rf "${UNBUNDLE_LIBS[@]}" - - append-flags -fPIC - - if tc-is-gcc && [[ $(gcc-fullversion) == "7.2.0" ]] && is-flag "-g*"; then - ewarn "Filtering out -g* flags since gcc-7.2 tends to ICE with them and ceph" - filter-flags "-g*" - fi - eautoreconf -} - -src_configure() { - ECONFARGS=( - --without-hadoop - --includedir=/usr/include - $(use_with cephfs) - $(use_with debug) - $(use_with fuse) - $(use_with libaio) - $(use_with libatomic libatomic-ops) - $(use_with nss) - $(use_with cryptopp) - $(use_with radosgw) - $(use_with gtk gtk2) - $(use_enable static-libs static) - $(use_with jemalloc) - $(use_with xfs libxfs) - $(use_with zfs libzfs) - $(use_with lttng ) - $(use_with babeltrace) - $(use_with ldap openldap) - $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") - --with-mon - --with-eventfd - --with-cython - --without-kinetic - --without-librocksdb - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - # we can only use python2.7 for building at the moment - ceph_run_econf "python2*" -} - -ceph_run_econf() { - [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset" - [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation" - - pushd "${S}" >/dev/null || die - # - # This generates a QA warning about running econf in src_compile - # and src_install. Unfortunately the only other way to do this would - # involve building all of for each python implementation times, which - # wastes a _lot_ of CPU time and disk space. This hack will no longer - # be needed with >=ceph-11.2. - # - python_setup "${1}" - econf "${ECONFARGS[@]}" - - popd >/dev/null || die -} - -src_compile() { - emake - emake_python_bindings all - - use test && emake check-local -} - -src_test() { - make check || die "make check failed" -} - -src_install() { - default - emake_python_bindings install-exec "DESTDIR=\"${D}\"" - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe src/init-ceph ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - - insinto /etc/sysctl.d - newins "${FILESDIR}"/sysctld 90-${PN}.conf - - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc - - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" - - udev_dorules udev/*.rules - - readme.gentoo_create_doc - - python_setup 'python2*' - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild deleted file mode 100644 index 74e61b4aceb4..000000000000 --- a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) - -inherit check-reqs autotools eutils python-r1 udev user \ - readme.gentoo-r1 systemd versionator flag-o-matic - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git" - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio" -IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - app-arch/snappy - app-arch/lz4:= - app-arch/bzip2 - dev-libs/boost:=[threads] - dev-libs/libaio - dev-libs/leveldb:=[snappy] - nss? ( dev-libs/nss ) - libatomic? ( dev-libs/libatomic_ops ) - cryptopp? ( dev-libs/crypto++:= ) - sys-apps/keyutils - sys-apps/util-linux - dev-libs/libxml2 - radosgw? ( dev-libs/fcgi ) - ldap? ( net-nds/openldap ) - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0 ) - xfs? ( sys-fs/xfsprogs ) - zfs? ( sys-fs/zfs ) - gtk? ( - x11-libs/gtk+:2 - dev-cpp/gtkmm:2.4 - gnome-base/librsvg - ) - radosgw? ( - dev-libs/fcgi - dev-libs/expat - net-misc/curl - ) - jemalloc? ( dev-libs/jemalloc ) - !jemalloc? ( dev-util/google-perftools ) - lttng? ( dev-util/lttng-ust ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - dev-python/cython[${PYTHON_USEDEP}] - app-arch/cpio - sys-apps/lsb-release - virtual/pkgconfig - dev-python/sphinx - test? ( - sys-fs/btrfs-progs - sys-apps/grep[pcre] - dev-python/tox[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - )" -RDEPEND="${COMMON_DEPEND} - sys-apps/hdparm - sys-block/parted - sys-fs/cryptsetup - sys-apps/gptfdisk - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - $(python_gen_useflags 'python2*') - ${PYTHON_REQUIRED_USE} - ^^ ( nss cryptopp ) - ?? ( jemalloc tcmalloc ) - " - -# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup') -REQUIRED_USE+=" radosgw" - -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -STRIP_MASK="/usr/lib*/rados-classes/*" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch" - #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch" - "${FILESDIR}/${PN}-10.2.1-libzfs.patch" - "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch" - "${FILESDIR}/${PN}-10.2.3-CVE-2016-8626.patch" -) - -check-reqs_export_vars() { - if use debug; then - CHECKREQS_DISK_BUILD="23G" - CHECKREQS_DISK_USR="7G" - elif use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="450M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -emake_python_bindings() { - local action="${1}" params binding - shift - params=("${@}") - - __emake_python_bindings_do_impl() { - emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" - - # these don't work and aren't needed on python3 - if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then - rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py - fi - } - - pushd "${S}/src" - for binding in rados rbd $(use cephfs && echo cephfs); do - python_foreach_impl __emake_python_bindings_do_impl - done - popd - - unset __emake_python_bindings_do_impl -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - default - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t - - #rm -rf "${UNBUNDLE_LIBS[@]}" - - append-flags -fPIC - eautoreconf -} - -src_configure() { - local myeconfargs=( - --without-hadoop - --includedir=/usr/include - $(use_with cephfs) - $(use_with debug) - $(use_with fuse) - $(use_with libaio) - $(use_with libatomic libatomic-ops) - $(use_with nss) - $(use_with cryptopp) - $(use_with radosgw) - $(use_with gtk gtk2) - $(use_enable static-libs static) - $(use_with jemalloc) - $(use_with xfs libxfs) - $(use_with zfs libzfs) - $(use_with lttng ) - $(use_with babeltrace) - $(use_with ldap openldap) - $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") - --with-mon - --with-eventfd - --with-cython - --without-kinetic - --without-librocksdb - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - # we can only use python2.7 for building at the moment - python_setup 'python2*' - econf "${myeconfargs[@]}" -} - -src_compile() { - emake - emake_python_bindings all - - use test && emake check-local -} - -src_test() { - make check || die "make check failed" -} - -src_install() { - default - emake_python_bindings install-exec "DESTDIR=\"${D}\"" - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe src/init-ceph ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" - - udev_dorules udev/*.rules - - readme.gentoo_create_doc - - python_setup 'python2*' - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild index 761d8f534952..7c67f5867f62 100644 --- a/sys-cluster/ceph/ceph-12.2.11.ebuild +++ b/sys-cluster/ceph/ceph-12.2.11.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) DISTUTILS_OPTIONAL=1 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" @@ -53,10 +53,7 @@ COMMON_DEPEND=" fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) - ssl? ( - <dev-libs/openssl-1.1:=[static-libs?] - !dev-libs/openssl:1.0.0 - ) + ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild index f0e6c5adacdf..783210078a84 100644 --- a/sys-cluster/ceph/ceph-13.2.4.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) DISTUTILS_OPTIONAL=1 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ - systemd +inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ + python-r1 udev user readme.gentoo-r1 systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" @@ -26,9 +25,8 @@ SLOT="0" CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr" -IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test" -IUSE+=" xfs zfs" +IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl" +IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" # unbundling code commented out pending bugs 584056 and 584058 @@ -41,58 +39,45 @@ COMMON_DEPEND=" app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] + <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) + nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) + ssl? ( dev-libs/openssl:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) + <dev-libs/openssl-1.1:=[static-libs?] + net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( - >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) ${PYTHON_DEPS} " DEPEND="${COMMON_DEPEND} + app-arch/cpio amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) - app-arch/cpio dev-python/cython[${PYTHON_USEDEP}] dev-python/sphinx - dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -101,10 +86,10 @@ RDEPEND="${COMMON_DEPEND} net-misc/socat sys-apps/gptfdisk sys-block/parted + sys-fs/e2fsprogs sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 - dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] @@ -115,12 +100,12 @@ RDEPEND="${COMMON_DEPEND} dev-python/werkzeug[${PYTHON_USEDEP}] " REQUIRED_USE=" + $(python_gen_useflags 'python2*') ${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python3*') ) + ?? ( ssl nss ) ?? ( jemalloc tcmalloc ) " -# the tests need root access RESTRICT="test? ( userpriv )" # distribution tarball does not include everything needed for tests @@ -129,7 +114,8 @@ RESTRICT+=" test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI="no" -STRIP_MASK="/usr/lib*/rados-classes/*" +# ninja does not work at all +CMAKE_MAKEFILE_GENERATOR="emake" UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure @@ -139,12 +125,17 @@ UNBUNDLE_LIBS=( PATCHES=( "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" "${FILESDIR}/ceph-12.2.0-cflags.patch" + "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch" "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-13.2.0-cflags.patch" + "${FILESDIR}/ceph-12.2.4-cflags.patch" "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" - "${FILESDIR}/ceph-13.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch" + "${FILESDIR}/ceph-12.2.5-no-werror.patch" "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" + "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" + "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch" + "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch" + "${FILESDIR}/ceph-12.2.12-qa-warning.patch" + "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) check-reqs_export_vars() { @@ -170,7 +161,7 @@ pkg_pretend() { } pkg_setup() { - python_setup 'python3*' + python_setup 'python2*' check-reqs_export_vars check-reqs_pkg_setup user_setup @@ -180,14 +171,11 @@ src_prepare() { cmake-utils_src_prepare if use system-boost; then - eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch" + eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" fi - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die + rm src/test/cli/ceph-authtool/cap*.t #rm -rf "${UNBUNDLE_LIBS[@]}" } @@ -195,13 +183,14 @@ src_prepare() { ceph_src_configure() { local flag local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" -DWITH_BABELTRACE=$(usex babeltrace) -DWITH_CEPHFS=$(usex cephfs) - -DWITH_DPDK=$(usex dpdk) -DWITH_FUSE=$(usex fuse) -DWITH_LTTNG=$(usex lttng) -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO + -DWITH_NSS=$(usex nss) -DWITH_OPENLDAP=$(usex ldap) -DWITH_RADOSGW=$(usex radosgw) -DWITH_SSL=$(usex ssl) @@ -216,9 +205,6 @@ ceph_src_configure() { -DWITH_RDMA=no -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -Wno-dev ) if use amd64 || use x86; then for flag in ${CPU_FLAGS_X86[@]}; do @@ -231,7 +217,7 @@ ceph_src_configure() { # bug #630232 sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ + "${BUILD_DIR:--${S}}"/include/acconfig.h \ || die "sed failed" } @@ -241,12 +227,9 @@ src_configure() { python_compile() { local CMAKE_USE_DIR="${S}" - ceph_src_configure - - rm -r "${BUILD_DIR}/lib/cython_modules" || die + ceph_src_configure pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - emake VERBOSE=1 clean emake VERBOSE=1 all # python modules are only compiled with "make install" so we need to do this to @@ -256,10 +239,10 @@ python_compile() { } src_compile() { - cmake-utils_src_make VERBOSE=1 all + cmake-utils_src_make all # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources + python_copy_sources python_foreach_impl python_compile } @@ -278,10 +261,10 @@ src_install() { cmake-utils_src_install python_foreach_impl python_install - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die exeinto /usr/$(get_libdir)/ceph - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh + newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh insinto /etc/logrotate.d/ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} @@ -313,7 +296,7 @@ src_install() { readme.gentoo_create_doc - python_setup 'python3*' + python_setup 'python2*' # bug #630232 sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ @@ -324,6 +307,9 @@ src_install() { # python_fix_shebang apparently is not idempotent sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild index 5ccb12358e2f..9a0d16e9f3ae 100644 --- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) DISTUTILS_OPTIONAL=1 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ @@ -51,12 +51,12 @@ COMMON_DEPEND=" lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) - ssl? ( dev-libs/openssl:=[static-libs?] ) + ssl? ( dev-libs/openssl:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] - dev-libs/openssl:=[static-libs?] + dev-libs/openssl:0=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( diff --git a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild index 2ef0f19a4010..d6e08fe9ba96 100644 --- a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild +++ b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) DISTUTILS_OPTIONAL=1 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ - systemd +inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ + python-r1 udev user readme.gentoo-r1 systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -93,7 +92,6 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig test? ( dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -103,7 +101,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] @@ -130,7 +128,8 @@ RESTRICT+=" test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI="no" -STRIP_MASK="/usr/lib*/rados-classes/*" +# ninja does not work at all +CMAKE_MAKEFILE_GENERATOR="emake" UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure @@ -148,6 +147,7 @@ PATCHES=( "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" "${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch" "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) check-reqs_export_vars() { @@ -236,7 +236,7 @@ ceph_src_configure() { # bug #630232 sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ + "${BUILD_DIR:--${S}}"/include/acconfig.h \ || die "sed failed" } @@ -283,10 +283,10 @@ src_install() { cmake-utils_src_install python_foreach_impl python_install - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die exeinto /usr/$(get_libdir)/ceph - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh + newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh insinto /etc/logrotate.d/ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} @@ -329,6 +329,9 @@ src_install() { # python_fix_shebang apparently is not idempotent sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild index 61c4b21e9f8b..52a0a5582aba 100644 --- a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild +++ b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" @@ -72,7 +72,7 @@ COMMON_DEPEND=" ) ) system-boost? ( - >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ~dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) @@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND} dev-util/cunit test? ( dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -105,7 +104,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] @@ -133,8 +132,6 @@ RESTRICT+=" test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI="no" -STRIP_MASK="/usr/lib*/rados-classes/*" - UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure src/erasure-code/jerasure/gf-complete @@ -151,6 +148,7 @@ PATCHES=( "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-14.2.1-ncurses-tinfo.patch" ) # dpdk and ninja don't get along @@ -245,7 +243,7 @@ ceph_src_configure() { # bug #630232 sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ || die "sed failed" } @@ -271,7 +269,7 @@ src_compile() { cmake-utils_src_make VERBOSE=1 all # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources + python_copy_sources python_foreach_impl python_compile } @@ -336,6 +334,9 @@ src_install() { # python_fix_shebang apparently is not idempotent sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch b/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch deleted file mode 100644 index f3627636aeb9..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 7734be2..ba33bda 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -79,7 +79,6 @@ clean-local: - cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi - -- @rm -rf src/test/virtualenv - @rm -rf install-deps-* - - -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index df225d6..ca030cf 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -297,10 +297,6 @@ LIBCIVETWEB_DEPS = - DENCODER_SOURCES = - DENCODER_DEPS = - --# put virtualenvs in this directory --# otherwise it may overflow #! 80 kernel limit --# beware that some build environments might not be able to write to /tmp - export TMPDIR ?= /tmp --export CEPH_BUILD_VIRTUALENV = $(TMPDIR) - - radoslibdir = $(libdir)/rados-classes -diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am -index 8ddcb1e..52dd5d5 100644 ---- a/src/ceph-detect-init/Makefile.am -+++ b/src/ceph-detect-init/Makefile.am -@@ -53,15 +53,10 @@ EXTRA_DIST += \ - ceph-detect-init/tests/test_all.py \ - ceph-detect-init/tox.ini - --export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv -- --ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV} -- --${CEPH_DETECT_INIT_VIRTUALENV}: -- cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . -+ceph-detect-init-all: - - ceph-detect-init-clean: -- cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info -+ cd $(srcdir)/ceph-detect-init - - ceph-detect-init-install-data: - cd $(srcdir)/ceph-detect-init ; \ -diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am -index 9006303..0b35b0f 100644 ---- a/src/ceph-disk/Makefile.am -+++ b/src/ceph-disk/Makefile.am -@@ -29,15 +29,10 @@ EXTRA_DIST += \ - ceph-disk/tests/test_main.py \ - ceph-disk/tox.ini - --export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv -- --ceph-disk-all: ${CEPH_DISK_VIRTUALENV} -- --${CEPH_DISK_VIRTUALENV}: -- cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . -+ceph-disk-all: - - ceph-disk-clean: -- cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info -+ cd $(srcdir)/ceph-disk - - ceph-disk-install-data: - cd $(srcdir)/ceph-disk ; \ -diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am -index e730850..9569947 100644 ---- a/src/tools/Makefile.am -+++ b/src/tools/Makefile.am -@@ -45,6 +45,3 @@ noinst_HEADERS += \ - tools/rados/PoolDump.h \ - tools/cephfs/DataScan.h \ - tools/cephfs/RoleSelector.h -- --EXTRA_DIST += \ -- tools/setup-virtualenv.sh -diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh -index 9ff2d26..b6fca0a 100755 ---- a/src/tools/setup-virtualenv.sh -+++ b/src/tools/setup-virtualenv.sh -@@ -15,6 +15,8 @@ - # GNU Library Public License for more details. - # - -+exit 0 -+ - DIR=$1 - rm -fr $DIR - mkdir -p $DIR diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch deleted file mode 100644 index 34f8eb84beee..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ceph-10.2.1/configure.ac -+++ ceph-10.2.1/configure.ac -@@ -908,7 +908,7 @@ - , - [with_libzfs=no]) - AS_IF([test "x$with_libzfs" = xyes], -- [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])]) -+ [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])]) - AS_IF([test "x$with_libzfs" = xyes], - [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])]) - AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ]) diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch deleted file mode 100644 index 8340b4d18bfd..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch +++ /dev/null @@ -1,355 +0,0 @@ -diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am -index adcb95d..8099208 100644 ---- a/src/erasure-code/jerasure/Makefile.am -+++ b/src/erasure-code/jerasure/Makefile.am -@@ -1,52 +1,17 @@ - # jerasure plugin - noinst_HEADERS += \ -- erasure-code/jerasure/gf-complete/include/gf_complete.h \ -- erasure-code/jerasure/gf-complete/include/gf_general.h \ -- erasure-code/jerasure/gf-complete/include/gf_int.h \ -- erasure-code/jerasure/gf-complete/include/gf_method.h \ -- erasure-code/jerasure/gf-complete/include/gf_rand.h \ -- erasure-code/jerasure/gf-complete/include/gf_w16.h \ -- erasure-code/jerasure/gf-complete/include/gf_w32.h \ -- erasure-code/jerasure/gf-complete/include/gf_w4.h \ -- erasure-code/jerasure/gf-complete/include/gf_w64.h \ -- erasure-code/jerasure/gf-complete/include/gf_w8.h \ -- erasure-code/jerasure/jerasure/include/cauchy.h \ -- erasure-code/jerasure/jerasure/include/galois.h \ -- erasure-code/jerasure/jerasure/include/jerasure.h \ -- erasure-code/jerasure/jerasure/include/liberation.h \ -- erasure-code/jerasure/jerasure/include/reed_sol.h \ - erasure-code/jerasure/ErasureCodeJerasure.h - - jerasure_sources = \ - erasure-code/ErasureCode.cc \ -- erasure-code/jerasure/jerasure/src/cauchy.c \ -- erasure-code/jerasure/jerasure/src/galois.c \ -- erasure-code/jerasure/jerasure/src/jerasure.c \ -- erasure-code/jerasure/jerasure/src/liberation.c \ -- erasure-code/jerasure/jerasure/src/reed_sol.c \ -- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ -- erasure-code/jerasure/gf-complete/src/gf_method.c \ -- erasure-code/jerasure/gf-complete/src/gf_w16.c \ -- erasure-code/jerasure/gf-complete/src/gf.c \ -- erasure-code/jerasure/gf-complete/src/gf_w32.c \ -- erasure-code/jerasure/gf-complete/src/gf_w64.c \ -- erasure-code/jerasure/gf-complete/src/gf_w128.c \ -- erasure-code/jerasure/gf-complete/src/gf_general.c \ -- erasure-code/jerasure/gf-complete/src/gf_w4.c \ -- erasure-code/jerasure/gf-complete/src/gf_rand.c \ -- erasure-code/jerasure/gf-complete/src/gf_w8.c \ - erasure-code/jerasure/ErasureCodePluginJerasure.cc \ - erasure-code/jerasure/ErasureCodeJerasure.cc - - erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h - - libec_jerasure_generic_la_SOURCES = ${jerasure_sources} --libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include --libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} -+libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} - libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) - libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared - if LINUX -@@ -55,20 +20,11 @@ endif - - erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la - --libec_jerasure_neon_la_SOURCES = ${jerasure_sources} \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c -+libec_jerasure_neon_la_SOURCES = ${jerasure_sources} - libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS} \ -- ${ARM_NEON_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${ARM_NEON_FLAGS} - libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ -- ${ARM_NEON_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${ARM_NEON_FLAGS} - libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) - libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared - if LINUX -@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ -- ${INTEL_SSSE3_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${INTEL_SSSE3_FLAGS} - libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ -- ${INTEL_SSSE3_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${INTEL_SSSE3_FLAGS} - libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) - libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared - if LINUX -@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ -- ${INTEL_SSE4_2_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${INTEL_SSE4_2_FLAGS} - libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ -- ${INTEL_SSE4_2_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include -+ ${INTEL_SSE4_2_FLAGS} - libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) - libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared - if LINUX -diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc -index d2b72f5..acbd172 100644 ---- a/src/erasure-code/shec/ErasureCodePluginShec.cc -+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc -@@ -71,7 +71,7 @@ public: - }; - - extern "C" { --#include "jerasure/include/galois.h" -+#include "galois.h" - - extern gf_t *gfp_array[]; - extern int gfp_is_composite[]; -diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc -index 2180328..c84ffc7 100644 ---- a/src/erasure-code/shec/ErasureCodeShec.cc -+++ b/src/erasure-code/shec/ErasureCodeShec.cc -@@ -28,8 +28,8 @@ - #include "crush/CrushWrapper.h" - #include "osd/osd_types.h" - extern "C" { --#include "jerasure/include/jerasure.h" --#include "jerasure/include/galois.h" -+#include "jerasure.h" -+#include "galois.h" - - extern int calc_determinant(int *matrix, int dim); - extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w); -diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am -index 6b658d5..3281c60 100644 ---- a/src/erasure-code/shec/Makefile.am -+++ b/src/erasure-code/shec/Makefile.am -@@ -4,49 +4,19 @@ shec_sources = \ - erasure-code/shec/ErasureCodePluginShec.cc \ - erasure-code/shec/ErasureCodeShec.cc \ - erasure-code/shec/ErasureCodeShecTableCache.cc \ -- erasure-code/shec/determinant.c \ -- erasure-code/jerasure/jerasure/src/cauchy.c \ -- erasure-code/jerasure/jerasure/src/galois.c \ -- erasure-code/jerasure/jerasure/src/jerasure.c \ -- erasure-code/jerasure/jerasure/src/liberation.c \ -- erasure-code/jerasure/jerasure/src/reed_sol.c \ -- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ -- erasure-code/jerasure/gf-complete/src/gf_method.c \ -- erasure-code/jerasure/gf-complete/src/gf_w16.c \ -- erasure-code/jerasure/gf-complete/src/gf.c \ -- erasure-code/jerasure/gf-complete/src/gf_w32.c \ -- erasure-code/jerasure/gf-complete/src/gf_w64.c \ -- erasure-code/jerasure/gf-complete/src/gf_w128.c \ -- erasure-code/jerasure/gf-complete/src/gf_general.c \ -- erasure-code/jerasure/gf-complete/src/gf_w4.c \ -- erasure-code/jerasure/gf-complete/src/gf_rand.c \ -- erasure-code/jerasure/gf-complete/src/gf_w8.c -+ erasure-code/shec/determinant.c - - noinst_HEADERS += \ - erasure-code/shec/ErasureCodeShec.h \ -- erasure-code/shec/ErasureCodeShecTableCache.h \ -- erasure-code/jerasure/jerasure/include/cauchy.h \ -- erasure-code/jerasure/jerasure/include/galois.h \ -- erasure-code/jerasure/jerasure/include/jerasure.h \ -- erasure-code/jerasure/jerasure/include/liberation.h \ -- erasure-code/jerasure/jerasure/include/reed_sol.h \ -- erasure-code/jerasure/gf-complete/include/gf_int.h \ -- erasure-code/jerasure/gf-complete/include/gf_complete.h \ -- erasure-code/jerasure/gf-complete/include/gf_rand.h \ -- erasure-code/jerasure/gf-complete/include/gf_method.h \ -- erasure-code/jerasure/gf-complete/include/gf_general.h -+ erasure-code/shec/ErasureCodeShecTableCache.h - - erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h - - libec_shec_generic_la_SOURCES = ${shec_sources} - libec_shec_generic_la_CFLAGS = ${AM_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -@@ -57,22 +27,13 @@ endif - - erasure_codelib_LTLIBRARIES += libec_shec_generic.la - --libec_shec_neon_la_SOURCES = ${shec_sources} \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ -- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c -+libec_shec_neon_la_SOURCES = ${shec_sources} - libec_shec_neon_la_CFLAGS = ${AM_CFLAGS} \ - ${ARM_NEON_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${ARM_NEON_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ -@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ - ${INTEL_SSE4_2_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ -@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ - ${INTEL_SSE4_2_FLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c -index 15b62c9..bf5d290 100755 ---- a/src/erasure-code/shec/determinant.c -+++ b/src/erasure-code/shec/determinant.c -@@ -19,7 +19,7 @@ - #include <stdlib.h> - #include <string.h> - --#include "jerasure/include/galois.h" -+#include "galois.h" - - void print_matrix(int *mat, int dim) - { -diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am -index bdce080..11895ae 100644 ---- a/src/test/erasure-code/Makefile.am -+++ b/src/test/erasure-code/Makefile.am -@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code - unittest_erasure_code_jerasure_SOURCES = \ - test/erasure-code/TestErasureCodeJerasure.cc \ - ${jerasure_sources} --unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \ -- -Ierasure-code/jerasure/gf-complete/include \ -- -Ierasure-code/jerasure/jerasure/include --unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ -- -Ierasure-code/jerasure/gf-complete/include \ -- -Ierasure-code/jerasure/jerasure/include -+unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) -+unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) - unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) - if LINUX - unittest_erasure_code_jerasure_LDADD += -ldl -@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \ - test/erasure-code/TestErasureCodeShec.cc \ - ${shec_sources} - unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \ - test/erasure-code/TestErasureCodeShec_all.cc \ - ${shec_sources} - unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \ - test/erasure-code/TestErasureCodeShec_thread.cc \ - ${shec_sources} - unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \ - test/erasure-code/TestErasureCodeShec_arguments.cc \ - ${shec_sources} - unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ -- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ -- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec - unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) diff --git a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch b/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch deleted file mode 100644 index d767d8170dfa..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit dc2ffda7819d2ebeed3526d9e6da8f53221818de -Author: Yehuda Sadeh <yehuda@redhat.com> -Date: Thu Oct 20 10:17:36 2016 -0700 - - rgw: handle empty POST condition - - Fixes: http://tracker.ceph.com/issues/17635 - - Before accessing json entity, need to check that iterator is valid. - If there is no entry return appropriate error code. - - Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> - (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12) - -diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc -index 3843511..8af70a8 100644 ---- a/src/rgw/rgw_policy_s3.cc -+++ b/src/rgw/rgw_policy_s3.cc -@@ -286,11 +286,13 @@ int RGWPolicy::from_json(bufferlist& bl, string& err_msg) - int r = add_condition(v[0], v[1], v[2], err_msg); - if (r < 0) - return r; -- } else { -+ } else if (!citer.end()) { - JSONObj *c = *citer; - dout(0) << "adding simple_check: " << c->get_name() << " : " << c->get_data() << dendl; - - add_simple_check(c->get_name(), c->get_data()); -+ } else { -+ return -EINVAL; - } - } - return 0; diff --git a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch b/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch deleted file mode 100644 index ffc164536048..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc -index c476129..cad54b8 100644 ---- a/src/rgw/librgw.cc -+++ b/src/rgw/librgw.cc -@@ -470,7 +470,11 @@ namespace rgw { - const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn; - const string& ldap_dnattr = - store->ctx()->_conf->rgw_ldap_dnattr; -+#ifdef HAVE_OPENLDAP - std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx()); -+#else -+ std::string ldap_bindpw; -+#endif /* HAVE_OPENLDAP */ - - ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(), - ldap_searchdn, ldap_dnattr); -diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc -index e9f24f3..7291e69 100644 ---- a/src/rgw/rgw_rest_s3.cc -+++ b/src/rgw/rgw_rest_s3.cc -@@ -3091,7 +3091,11 @@ void RGW_Auth_S3::init_impl(RGWRados* store) - const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn; - const string& ldap_dnattr = - store->ctx()->_conf->rgw_ldap_dnattr; -+#ifdef HAVE_OPENLDAP - std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx()); -+#else -+ std::string ldap_bindpw; -+#endif /* HAVE_OPENLDAP */ - - ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw, - ldap_searchdn, ldap_dnattr); diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch deleted file mode 100644 index 08a7920035aa..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit e1dc386f93eb4613dc7e89cc76a031aeee5022ba -Author: Oleh Prypin <oleh@pryp.in> -Date: Thu Jul 21 18:33:25 2016 +0300 - - pybind: Make CephFS bindings and tests compatible with Python 3 - - Signed-off-by: Oleh Prypin <oleh@pryp.in> - -diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx -index ac17ada1a1..bd14de3b16 100644 ---- a/src/pybind/cephfs/cephfs.pyx -+++ b/src/pybind/cephfs/cephfs.pyx -@@ -613,8 +613,7 @@ cdef class LibCephFS(object): - - if not isinstance(mode, int): - raise TypeError('mode must be an int') -- if isinstance(flags, basestring): -- flags = cstr(flags, 'flags') -+ if isinstance(flags, str_type): - cephfs_flags = 0 - if flags == '': - cephfs_flags = os.O_RDONLY diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch deleted file mode 100644 index a81aae6e7ce8..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 773e01294da518c6ec18f0a8b72e05def85fef6c -Author: Oleh Prypin <oleh@pryp.in> -Date: Fri Jun 24 15:48:57 2016 +0300 - - pybind: Make RBD Python bindings compatible with Python 3 - - Signed-off-by: Oleh Prypin <oleh@pryp.in> - -diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx -index 52727bf39e..8f25dfbee0 100644 ---- a/src/pybind/rbd/rbd.pyx -+++ b/src/pybind/rbd/rbd.pyx -@@ -745,7 +745,7 @@ class RBD(object): - break - elif ret != -errno.ERANGE: - raise make_ex(ret, 'error listing images') -- return [decode_cstr(name) for name in c_names[:ret].split('\0') -+ return [decode_cstr(name) for name in c_names[:ret].split(b'\0') - if name] - finally: - free(c_names) -@@ -1885,8 +1885,8 @@ written." % (self.name, ret, length)) - raise make_ex(ret, 'error listing images') - if ret == 0: - return [] -- pools = map(decode_cstr, c_pools[:pools_size - 1].split('\0')) -- images = map(decode_cstr, c_images[:images_size - 1].split('\0')) -+ pools = map(decode_cstr, c_pools[:pools_size - 1].split(b'\0')) -+ images = map(decode_cstr, c_images[:images_size - 1].split(b'\0')) - return list(zip(pools, images)) - finally: - free(c_pools) -@@ -1933,9 +1933,9 @@ written." % (self.name, ret, length)) - raise make_ex(ret, 'error listing images') - if ret == 0: - return [] -- clients = map(decode_cstr, c_clients[:clients_size - 1].split('\0')) -- cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split('\0')) -- addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split('\0')) -+ clients = map(decode_cstr, c_clients[:clients_size - 1].split(b'\0')) -+ cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split(b'\0')) -+ addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split(b'\0')) - return { - 'tag' : decode_cstr(c_tag), - 'exclusive' : exclusive == 1, diff --git a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch b/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch deleted file mode 100644 index 4e76deabe65f..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a11f31aac4fa6a5c5ebb4fa0964e1c07a420e8c Mon Sep 17 00:00:00 2001 -From: Zac Medico <zmedico@gentoo.org> -Date: Wed, 12 Apr 2017 01:49:09 -0700 -Subject: [PATCH] configure: link against zstd if detected - -https://bugs.gentoo.org/show_bug.cgi?id=601610 ---- - configure.ac | 6 ++++-- - src/Makefile-env.am | 3 +++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 51daf91..8914b71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -851,12 +851,14 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"], - AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ]) - AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ]) - --# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same. -+# rocksdb detects headers in its Makefile, which forces us to do the same. - AS_IF([test "x$with_librocksdb_static" = "xyes"], [ - AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes]) -- AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]) -+ AC_CHECK_HEADER([lz4.h], [have_lz4=yes])] -+ AC_CHECK_HEADER([zstd.h], [have_zstd=yes])]) - AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"]) - AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"]) -+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"]) - - # needs libcurl and libxml2 - if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index 4771bad..0ee42f8 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -280,6 +280,9 @@ endif - if HAVE_LZ4 - LIBKV += -llz4 - endif -+if HAVE_ZSTD -+LIBKV += -lzstd -+endif - endif # WITH_SLIBROCKSDB - LIBKV += -lz -lleveldb -lsnappy - LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS) --- -2.10.2 - diff --git a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch b/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch deleted file mode 100644 index 31221ae2f994..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index 4771bad02d..f92e20479b 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -53,10 +53,6 @@ endif - ## automake environment - - HARDENING_CFLAGS = \ -- -O2 \ -- -g \ -- -pipe \ -- -Wall \ - -Wp,-U_FORTIFY_SOURCE \ - -Wp,-D_FORTIFY_SOURCE=2 \ - -fexceptions \ diff --git a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch b/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch deleted file mode 100644 index a6b5515cee28..000000000000 --- a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am -index 3926ac4bec..90e2eae50c 100644 ---- a/src/ceph-detect-init/Makefile.am -+++ b/src/ceph-detect-init/Makefile.am -@@ -67,7 +67,7 @@ ceph-detect-init-clean: - ceph-detect-init-install-data: - cd $(srcdir)/ceph-detect-init ; \ - if test "$(DESTDIR)" ; then \ -- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ -+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ -diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am -index a8532878c8..d908b1649a 100644 ---- a/src/ceph-disk/Makefile.am -+++ b/src/ceph-disk/Makefile.am -@@ -43,7 +43,7 @@ ceph-disk-clean: - ceph-disk-install-data: - cd $(srcdir)/ceph-disk ; \ - if test "$(DESTDIR)" ; then \ -- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ -+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ -diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am -index 698522daa4..c49c190986 100644 ---- a/src/pybind/cephfs/Makefile.am -+++ b/src/pybind/cephfs/Makefile.am -@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h - - cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ -- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ -+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ -diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am -index a4145bf0f4..960395fee8 100644 ---- a/src/pybind/rados/Makefile.am -+++ b/src/pybind/rados/Makefile.am -@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h - - rados-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ -- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ -+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ -diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am -index 7dd49333fa..fbb940d07d 100644 ---- a/src/pybind/rbd/Makefile.am -+++ b/src/pybind/rbd/Makefile.am -@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h - - rbd-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ -- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ -+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch new file mode 100644 index 000000000000..a21bcc9325d8 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch @@ -0,0 +1,10 @@ +--- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700 ++++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700 +@@ -851,6 +851,7 @@ + #include <openssl/crypto.h> + #include <openssl/x509.h> + #include <openssl/pem.h> ++#include <openssl/engine.h> + #else + /* SSL loaded dynamically from DLL. + * I put the prototypes here to be independent from OpenSSL source diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch new file mode 100644 index 000000000000..9a23e1ee60a4 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch @@ -0,0 +1,13 @@ +diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc +index cf4e38995e..7a4089fca9 100644 +--- a/src/rgw/rgw_crypt.cc ++++ b/src/rgw/rgw_crypt.cc +@@ -31,7 +31,7 @@ using namespace CryptoPP; + #define dout_subsys ceph_subsys_rgw + + using namespace rgw; +-using ceph::crypto::PK11_ImportSymKey_FIPS; ++//using ceph::crypto::PK11_ImportSymKey_FIPS; + + /** + * Encryption in CTR mode. offset is used as IV for each block. diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch new file mode 100644 index 000000000000..1b72e5447dbe --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch @@ -0,0 +1,20 @@ +diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt +index 7aa42e9efd..66186b159f 100644 +--- a/src/tools/rbd/CMakeLists.txt ++++ b/src/tools/rbd/CMakeLists.txt +@@ -1,3 +1,6 @@ ++set(CURSES_NEED_NCURSES TRUE) ++find_package(Curses REQUIRED) ++ + set(rbd_srcs + rbd.cc + ArgumentTypes.cc +@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados + cls_journal_client cls_rbd_client + rbd_types + journal +- ceph-common global ++ ceph-common global ${CURSES_LIBRARIES} + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + if(WITH_KRBD) + target_link_libraries(rbd diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch new file mode 100644 index 000000000000..1b63d6e21ba5 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc +index d95a397a84..d2cbf4b7b9 100644 +--- a/src/common/blkdev.cc ++++ b/src/common/blkdev.cc +@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition, + rc = get_block_device_base(partition, basename, + sizeof(basename)); + if (rc >= 0) { +- strncpy(device, basename, sizeof(basename)); ++ strncpy(device, basename, sizeof(device)); + rc = 0; + } else { + rc = -ENODEV; diff --git a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch new file mode 100644 index 000000000000..7f74a102d777 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch @@ -0,0 +1,30 @@ +From b7bf406cff5e0f82fc87f19d5987cd4e719919e1 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 8 Apr 2019 16:34:53 +0200 +Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + src/tools/rbd/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt +index 36b2408a8d28..0e38a033ff55 100644 +--- a/src/tools/rbd/CMakeLists.txt ++++ b/src/tools/rbd/CMakeLists.txt +@@ -1,3 +1,6 @@ ++set(CURSES_NEED_NCURSES TRUE) ++find_package(Curses REQUIRED) ++ + set(rbd_srcs + rbd.cc + ArgumentTypes.cc +@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados + cls_journal_client cls_rbd_client + rbd_types + journal +- ceph-common global ncurses ++ ceph-common global ${CURSES_LIBRARIES} + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + if(WITH_KRBD) + target_link_libraries(rbd diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1 deleted file mode 100644 index 3bdb8b485ed8..000000000000 --- a/sys-cluster/ceph/files/ceph.confd-r1 +++ /dev/null @@ -1,4 +0,0 @@ -# Example - -# default ceph conf file -#ceph_conf="/etc/ceph/ceph.conf" diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3 deleted file mode 100644 index 281037c59982..000000000000 --- a/sys-cluster/ceph/files/ceph.confd-r3 +++ /dev/null @@ -1,63 +0,0 @@ -# /etc/conf.d/ceph: startup configurations for ceph - -# default ceph conf file -#ceph_conf="/etc/ceph/ceph.conf" - -# Set ulimits for Ceph services. -#rc_ulimit="-n 131072 -u 257256" - -# the directory under /run to store runtime information in -#rundir=/run/ceph - -# the user and group to run ceph as - -# settings for openrc supervisor for various ceph daemons -# -# defaults (can be overidden for each daemon) -# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value -# -#respawn_delay=20 -#respawn_max=5 -#respawn_period=1800 -#stdout="/dev/null" -#stderr="/dev/null" - -# radosgw -#radosgw_respawn_max -#radosgw_respawn_delay=20 -#radosgw_respawn_period=1800 -#radosgw_stdout="/dev/null" -#radosgw_stderr="/dev/null" - -# mon -#mon_respawn_max=5 -#mon_respawn_delay=20 -#mon_respawn_period=1800 -#mon_stdout="/dev/null" -#mon_stderr="/dev/null" - -# osd -#osd_respawn_max=5 -#osd_respawn_delay=30 -#osd_respawn_period=1800 -#osd_stdout="/dev/null" -#osd_stderr="/dev/null" - -# mds -#mds_respawn_max=5 -#mds_respawn_delay=20 -#mds_respawn_period=1800 -#mds_stdout="/dev/null" -#mds_stderr="/dev/null" - -# mgr -#mgr_respawn_max=5 -#mgr_respawn_delay=20 -#mgr_respawn_period=1800 -#mgr_stdout="/dev/null" -#mgr_stderr="/dev/null" - -# initd stop timeout. -#CEPH_TERMTIMEOUT="TERM/120/KILL/5" -# -# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/files/ceph.initd-r2 b/sys-cluster/ceph/files/ceph.initd-r2 deleted file mode 100644 index 16267c58a139..000000000000 --- a/sys-cluster/ceph/files/ceph.initd-r2 +++ /dev/null @@ -1,40 +0,0 @@ -#!/sbin/openrc-run - -ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" -extra_commands="reload" -daemon_type="${RC_SVCNAME#ceph-}" -daemon_type="${daemon_type%.*}" -daemon_id="${RC_SVCNAME#ceph-*.}" -daemon_id="${daemon_id:-0}" -command="/usr/bin/ceph-${daemon_type}" -pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid" -command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}" -start_stop_daemon_args="--user ceph --group ceph" - -depend() { - after net ntpd ntp-client chronyd - before netmount -} - -is_type_valid() { - case ${daemon_type} in - mon|mds|osd) return 0;; - *) return 1;; - esac -} - -start_pre() { - checkpath -d -q -o ceph "$(dirname "${pidfile}")" - if ! is_type_valid ;then - eerror "Please give valid Ceph Server Type: mds, mon, osd" - return 1 - fi -} - -reload() { - ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" - start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}" - eend $? -} - -# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/files/ceph.initd-r7 b/sys-cluster/ceph/files/ceph.initd-r7 deleted file mode 100644 index 110d7bd0b635..000000000000 --- a/sys-cluster/ceph/files/ceph.initd-r7 +++ /dev/null @@ -1,87 +0,0 @@ -#!/sbin/openrc-run - -ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" -extra_commands="reload" -daemon_type="${RC_SVCNAME#ceph-}" -daemon_type="${daemon_type%%.*}" -daemon_id="${RC_SVCNAME#ceph-*.}" -daemon_id="${daemon_id:-0}" -: ${rundir:=/run/ceph} -: ${user:=ceph} -: ${group:=ceph} -: ${rc_ulimit:=-n 1048576 -u 1048576} - -pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" -daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" - -command="/usr/bin/${RC_SVCNAME%%.*}" -command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" -command_args_foreground="--foreground" - -retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" -start_stop_daemon_args="--user ${user} --group ${group}" -supervise_daemon_args="--user ${user} --group ${group}" - -: ${supervisor:=supervise-daemon} -: ${stdout:=/var/log/ceph/ceph} -: ${stderr:=/var/log/ceph/ceph} -: ${respawn_delay:=10} -: ${respawn_max:=5} -: ${respawn_period:=1800} - -: ${osd_respawn_delay:=15} -: ${osd_respawn_max:=10} - -: ${radosgw_respawn_max:=5} -: ${radosgw_respawn_period:=30} - -depend() { - use dns logger - after net ntpd ntp-client chronyd - before netmount -} - -is_type_valid() { - case ${daemon_type} in - mon|mds|osd|mgr|radosgw) return 0;; - *) return 1;; - esac -} - -start_pre() { - export CEPH_CONF="${ceph_conf}" - - checkpath -d -q -o "${user}:${group}" "${rundir}" - - if ! is_type_valid ;then - eerror "Please give valid Ceph Server Type: mds, mon, osd" - return 1 - - elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then - eerror "${daemon_type}.${daemon_id} is still running, refusing to start" - return 1 - fi - - local arg_name arg_val - for arg_name in std{out,err} respawn_{delay,max,period}; do - eval arg_val="\${${daemon_type}_${arg_name}}" - - if [ -z "${arg_val}" ]; then - eval arg_val="\${${arg_name}}" - else - eval "${arg_name}=\"${arg_val}\"" - fi - - if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then - supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log" - fi - done -} - -reload() { - ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" - start-stop-daemon --signal 1 "${start_stop_daemon_args}" - eend ${?} -} - -# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml index 03215bde3fda..bfbf70b7a303 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -18,13 +18,10 @@ </longdescription> <use> <flag name="babeltrace">Add support for LTTng babeltrace</flag> - <flag name="cryptopp">Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag> <flag name="cephfs">Build support for cephfs, a POSIX compatible filesystem built on top of ceph</flag> <flag name="dpdk">Enable DPDK messaging</flag> <flag name="fuse">Build fuse client</flag> <flag name="grafana">Install grafana dashboards</flag> - <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag> - <flag name="libaio">Use libaio as asynchronous input/output library</flag> <flag name="lttng">Add support for LTTng</flag> <flag name="mgr">Build the ceph-mgr daemon</flag> <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag> |