diff options
| -rw-r--r-- | app-admin/scylla-jmx/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-jmx/scylla-jmx-2.1.5.ebuild (renamed from app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild) | 0 | ||||
| -rw-r--r-- | app-admin/scylla-tools/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-tools/scylla-tools-2.1.5.ebuild (renamed from app-admin/scylla-tools/scylla-tools-2.1.3.ebuild) | 0 | ||||
| -rw-r--r-- | dev-db/scylla/Manifest | 12 | ||||
| -rw-r--r-- | dev-db/scylla/files/0001-Fix-Scylla-compilation-with-Crypto-v6.patch | 34 | ||||
| -rw-r--r-- | dev-db/scylla/files/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch | 37 | ||||
| -rw-r--r-- | dev-db/scylla/scylla-2.1.5.ebuild (renamed from dev-db/scylla/scylla-2.1.3.ebuild) | 21 | ||||
| -rw-r--r-- | dev-db/scylla/scylla-9999.ebuild | 15 |
9 files changed, 93 insertions, 34 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 6e12ea5..99c3b9e 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -1,6 +1,6 @@ AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 -DIST scylla-jmx-2.1.3.tar.gz 98644 BLAKE2B 8e63e26ccc88a628095f3512d70e84204e91bfaa79f5f67daac89c126f503ec72328dddea2b235fcbd7e629bf59dd8393a5c2a7b676bc5001245e79f2fde04bf SHA512 448dccda4b38dbcaff808eeb20f6d99c15aff141dc51c6399e93106541c27c5cb3cc07960370d74df754338fef51cab2ff7b37b42a248d147449c3e196009772 -EBUILD scylla-jmx-2.1.3.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49 +DIST scylla-jmx-2.1.5.tar.gz 98649 BLAKE2B 74a752d04cb430df3efae91816faf6d399117290091b9c45cd26d804594e19526ceb0a53fe1a644c2e0690dde61dee0bc704ba6c5406817d705fd6536ff7feb1 SHA512 8dc72c22a04db92dcd3160d88bf6e0c75ba1ee79179efba3fefbffea492354ba612b1f2cc2989534266bf2c8351eca6e4de4fd8985e6275e866fe9cb00afa4de +EBUILD scylla-jmx-2.1.5.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49 EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c diff --git a/app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.1.5.ebuild index 001ec6f..001ec6f 100644 --- a/app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild +++ b/app-admin/scylla-jmx/scylla-jmx-2.1.5.ebuild diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index b3a3cd2..2aa5e51 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -1,4 +1,4 @@ -DIST scylla-tools-2.1.3.tar.gz 26860638 BLAKE2B f4bd4984b92a3d24cdcfaca87b68f9858c3bed00c17502e21ce2caa8fb2000bf2627c912ba2727a42c09df2771001758464b0156e584986caf73b3b273d18b53 SHA512 807ed1ff419f3f6b4c779d2d1e0c6895c6a0c120f2a32e98141231ea9f05333fdcc0112a0a5a1386924658e17c10479c6dc76694f856a74d2550a473f9ef0583 -EBUILD scylla-tools-2.1.3.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5 +DIST scylla-tools-2.1.5.tar.gz 26860685 BLAKE2B 43348de242bbd7c55832501cc61e2c4843b1786b3f7f28bb1810145aa4906d6c65aaf92fff2cf986380611e7308a43bf2536719c31a851c49c7718cccbe7a165 SHA512 7360a8c5391d5246caa452f38f560d2bc002401eb9a65ee8e4cb7a2398647b0e23488e17c7095bd8b5528ea52c5397c28918e1f0daa4c8f934c7ed2f83b4339c +EBUILD scylla-tools-2.1.5.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5 EBUILD scylla-tools-9999.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c diff --git a/app-admin/scylla-tools/scylla-tools-2.1.3.ebuild b/app-admin/scylla-tools/scylla-tools-2.1.5.ebuild index 9d41e14..9d41e14 100644 --- a/app-admin/scylla-tools/scylla-tools-2.1.3.ebuild +++ b/app-admin/scylla-tools/scylla-tools-2.1.5.ebuild diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest index ae2ac58..448b3f6 100644 --- a/dev-db/scylla/Manifest +++ b/dev-db/scylla/Manifest @@ -1,13 +1,15 @@ +AUX 0001-Fix-Scylla-compilation-with-Crypto-v6.patch 1172 BLAKE2B fb54ebc4a1092d56a98bfef2cd6bd7de1257fd2dc8b2849d0d2e1d8cb591d787084029bcf3d5510b86952230b7ba8836c12d69b722412b1bdb43c725f55c1ce1 SHA512 975f9b953b509baa341232019ca897ed47112d8722a525342caff78a221ef0a9f2bf762ac6b4b9181c55d59ee6b376bdc1ceaa3b4976a213d6bd78c644a3bfb7 +AUX 0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch 1396 BLAKE2B d57b67332cbf26abcf19dae2b2c4b316fd32927a6424809aed3c59713a79d44fbaa0583d721dac7904763ddb0644913dd7376876eac95df14ace9c48664fd932 SHA512 e5295826ad8d64a2f49cadee514627d4d8b56281f44e9701451d7ca471631f02bacca4f5f1dc8654e54c8824b894dd4c0a239637345a05b1b0b199c68e3c591d AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23ad753c98c5e4fd7fbb89b0f79703ea4dcf1f6233e7929268365eeaab1b4e2e7b31553aa7928a969 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82 AUX scylla-server.confd 386 BLAKE2B e075e8f5cac2ac373a43a637a4080fde5cbd402b5bef2a3865980f3f9d123366315d994ebf9abbd749167db6e1fa9c840295171add7c5507120be70020aaefa1 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87 AUX scylla-server.initd 964 BLAKE2B 46ec149dc24f33773bba1f5edd36d4cab8f4248346e56752ba6fd4b149d056d28cf3297e889adcc0c776da46cd347d25d4b16bb91f545779dc14f59bd8dfcc5d SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760 DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310 DIST dpdk-8aa1d694919fb63211ed625539250008f5d7df9a.tar.gz 12197171 BLAKE2B 7888e11329403d44d3ccd30b7c3616b4e13b59931a2755e9451c011e1da951d74d713052ddf01a9f4ede6e8d82b8df7b08584aae540b214bdd117e2f23a2d150 SHA512 b5e41140c87100cb74196bdd9991eae660ef40c2bbad5c530cc7de7e0aeb523383d35df14214af941f86df36f22cabcf86eec013f127a578ffdf110c2c80f1d3 DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0 -DIST scylla-2.1.3.tar.gz 2524757 BLAKE2B 50035393a333c9381520dc76ca847b0513f027fd5dd83a793c8002c77f5de4ffce76cd4d1257be51cfab2a3da7f39a65fb7425c60ea7114adc09fde6b7c82f56 SHA512 c2d052a0a28d34cccbc3874f3e6abb3ab3b521bfa4f8007e1656c6c3505e9b9d9057e5664418c404a1ddc122aab3b112e60e0e32f7e3460caa0ad0bbd4a2b9c0 -DIST scylla-ami-c5d9e9645b71561c44451a58d33333a6c96bb2ed.tar.gz 9862 BLAKE2B 519736563aadbf177e727dfeae2971b61fb499334e19c6bd7fb67d850ce0338d8796c67eb8ce86e371683925d06896582319774331c30c1d2acde314815c144f SHA512 75a5bbed050b0ccc7f740b0a09789c0c099a03e9d70c58d3385b197b676be7bfd45c3a728ccdddd780a79c3c2fc8a0506d84da961f438b9d8e63a4b3143a43a9 -DIST scylla-seastar-0e6dcd5cfd145c87149caeedd9caea2e06b0c794.tar.gz 759523 BLAKE2B 0eca2ae54a38466595b936d4848eadcc287de10c9b3c1497cc682257cba177aee0d9a1426ec3a6edcc73924171fb39bd0af6396125712d7cb3ddf8d109e1d2d9 SHA512 79108eb98d90cc5b88df30710af46607d110e1358d41e434ae8ec6042128a4afbaa5b2cddd5f7e04c176dfffa189cb9103faf47a6e98daa57bae84d029994c3a +DIST scylla-2.1.5.tar.gz 2524691 BLAKE2B d3b4ca7ff0c4ee862b23923cea35f683f0a89b6793dbb27746809c5827549aa9ec87828fa6fa64b69e2f0bf42b3f546fc31a4d6a8d86727b54cf4312bd1aa41e SHA512 12959cabb776c9facf452de46a9fced8e146c32093e18d900f5b2cadd147f23da2a4cd9dd19cf1dca4b9999d2f1166e07a3d01d888a723dcd6a0491425070882 +DIST scylla-ami-0df779dcca3dc36ec7a6e91295a2f96828b07dc8.tar.gz 9866 BLAKE2B 8891e0eca1aa70684f5caeb4b9b111b7f6b91815b676b0182f9248f073827b9dd65b0e11805edf8132a43a7571d73bbda7c905f6a3140de02c686981fbd8a878 SHA512 20b48b28b054dbddec887f78ca18f17182cf0207f3918ae3c1378f0aeb2875daedee628058f6e6b5b8bea4ea42f6b041ac47cbb09b8d4fa9fd1dbb71f050ff84 +DIST scylla-seastar-2a2c1d2708bda22087cb04442caebf2e2fe61ef2.tar.gz 759801 BLAKE2B 1c80b691bd6fceb74a5663bfbbf138d2984ca1e034d51621a70690039ee26c9a23693e8a2019690c2e95a638261e68469311642ea194c7883a7336f428baea8d SHA512 11aebd70a66657cd97978f93d2c66c7942c8c2b6d40a9d2cc86d6bd178cf5a1d3ead0987553149006c2d655ab7141d484f233e33e6249bf5b86db3afb832e2b4 DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 BLAKE2B 5f358f44051a2fa9a10d83fce9cab9e57b56505c4270f089a4d12aaa4e9c45a205665b342a0abb5cf314a9fd24b4186f3a176c58328cc627edc73cc854a30079 SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99 -EBUILD scylla-2.1.3.ebuild 7903 BLAKE2B 57c929d81d2de22749cb9816af291de71d2678752989c19c84c128a09cc5b6c21f432db0834e0ddfa7d84583dfc8832b26909ba73cbd1955c7e47916e44ed650 SHA512 1184d20da0ab4233a3b63e1daa856e113c3d25b5c2c9dd3a51b14084112e1106cd1970e581f3fb20d312713cc2de3a8d49891beeb56a58878abab6dbf96d1e67 -EBUILD scylla-9999.ebuild 7609 BLAKE2B 7348f6e2dd2351b405abfd97d09b34c4f2913b28ddf942ab31c087f16fa2005699ea98cd932467d4ff4967a3ac2273288efc86531640757d7cbd7b0e059fe83e SHA512 5416f39326433592d29495282f4b3d7da849a5ebcd07542c91a300dc5d4d678feaeaf97c9bfbb25cd129a30189d037cdc36ecdf54707fcd143a012b26dd2d384 +EBUILD scylla-2.1.5.ebuild 7712 BLAKE2B 79e2f2352326f47b0ac071b2c9794a3810a2d6a35d54fe923ff5aaef723c1af7ce00ae497a9ed91977965717d0282173d2e39e14f5412ae794c1a8af9343b35c SHA512 14a9ca714abfe0fc18cd318cc5d9df79a8d705755c7fede15d9e2f45269889c9b036ae3c3b9e43115532b330384df4570d16ebc472cc42020d9011c9d7a48a87 +EBUILD scylla-9999.ebuild 7418 BLAKE2B e53cb021e1d5f7d10d64030b85ac72224dce6c0d056971c80df76eb3682eb6b322898dc5d17709f3b2f35ba84d3cfdb530753056c6fe23805e29b1017803aaef SHA512 9faa38f5ca8c79c2631174bbfa95cd8031b4906cf15840c04972daee20a10efd5c76a045db077151ae266a4b7be63b6333d24d353d43b45831fb9aa169e1d462 MISC metadata.xml 362 BLAKE2B 233a4e81e481316723b29ce80ff2b45e492f5d040bbfc8b99f36b418b19af807e5570e720e1ae0a995fd31cb0b8e24d4c05d9fbe69920daeb50565f66ef7c454 SHA512 611d9b41d70a9bf5dd8a68efac896cab6f4af2fea5a129c2e1f33379a5e128786d0c2d7517b6f178d56316b32fb549111788736f067411b8a34795f28ce88769 diff --git a/dev-db/scylla/files/0001-Fix-Scylla-compilation-with-Crypto-v6.patch b/dev-db/scylla/files/0001-Fix-Scylla-compilation-with-Crypto-v6.patch new file mode 100644 index 0000000..2130861 --- /dev/null +++ b/dev-db/scylla/files/0001-Fix-Scylla-compilation-with-Crypto-v6.patch @@ -0,0 +1,34 @@ +From 99bd5180ba048f1cdd1ebd76c1e58ff78595e20d Mon Sep 17 00:00:00 2001 +From: Vladimir Krivopalov <vladimir@scylladb.com> +Date: Sat, 3 Mar 2018 17:11:54 -0800 +Subject: [PATCH] Fix Scylla compilation with Crypto++ v6. + +In Crypto++ v6, the `byte` typedef has been moved from the global +namespace to the `CryptoPP::` namespace. + +This fix brings in the CryptoPP namespace so that the `byte` typedef is +seen with both old and new versions of Crypto++. + +Fixes #3252. + +Signed-off-by: Vladimir Krivopalov <vladimir@scylladb.com> +Message-Id: <799d055be710231884d101a52c0be8ed8b0a9806.1520125889.git.vladimir@scylladb.com> +--- + md5_hasher.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/md5_hasher.hh b/md5_hasher.hh +index 379aff14a..723bc1c71 100644 +--- a/md5_hasher.hh ++++ b/md5_hasher.hh +@@ -33,6 +33,7 @@ class md5_hasher { + static constexpr size_t size = CryptoPP::Weak::MD5::DIGESTSIZE; + + void update(const char* ptr, size_t length) { ++ using namespace CryptoPP; + static_assert(sizeof(char) == sizeof(byte), "Assuming lengths will be the same"); + hash.Update(reinterpret_cast<const byte*>(ptr), length * sizeof(byte)); + } +-- +2.17.1 + diff --git a/dev-db/scylla/files/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch b/dev-db/scylla/files/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch new file mode 100644 index 0000000..394b7dc --- /dev/null +++ b/dev-db/scylla/files/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch @@ -0,0 +1,37 @@ +From acdce55572b9bdeeddbf946c827f4eb05767a468 Mon Sep 17 00:00:00 2001 +From: Vladimir Krivopalov <vladimir@scylladb.com> +Date: Mon, 5 Mar 2018 09:50:20 -0800 +Subject: [PATCH] Inject CryptoPP namespace where Crypto++ `byte` typedef is + used. + +In Crypto++ v6, the `byte` typedef has been moved from the global +namespace to the CryptoPP:: namespace. +To make Scylla code compile with both old and new versions, bring the +namespace in so that the code works regardless of the scope of `byte` +definition. + +Fixes #3252 + +Signed-off-by: Vladimir Krivopalov <vladimir@scylladb.com> +Message-Id: <60e7bfe868b778b1c9bbe15d7247db64b61bd406.1520272198.git.vladimir@scylladb.com> +--- + repair/repair.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/repair/repair.cc b/repair/repair.cc +index 6d31ade7c..9f66a7279 100644 +--- a/repair/repair.cc ++++ b/repair/repair.cc +@@ -454,6 +454,9 @@ class sha256_hasher { + CryptoPP::SHA256 hash{}; + public: + void update(const char* ptr, size_t length) { ++ // In Crypto++ v6, the `byte` typedef has been moved to CryptoPP:: namespace ++ // We bring the namespace in to make the same code work for both 5.x and 6.x versions ++ using namespace CryptoPP; + static_assert(sizeof(char) == sizeof(byte), "Assuming lengths will be the same"); + hash.Update(reinterpret_cast<const byte*>(ptr), length * sizeof(byte)); + } +-- +2.17.1 + diff --git a/dev-db/scylla/scylla-2.1.3.ebuild b/dev-db/scylla/scylla-2.1.5.ebuild index 5d697ca..4b715c5 100644 --- a/dev-db/scylla/scylla-2.1.3.ebuild +++ b/dev-db/scylla/scylla-2.1.5.ebuild @@ -11,11 +11,11 @@ if [[ ${PV} == "9999" ]] ; then else MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" - AMI_COMMIT="c5d9e9645b71561c44451a58d33333a6c96bb2ed" + AMI_COMMIT="0df779dcca3dc36ec7a6e91295a2f96828b07dc8" C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533" DPDK_COMMIT="8aa1d694919fb63211ed625539250008f5d7df9a" FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa" - SEASTAR_COMMIT="0e6dcd5cfd145c87149caeedd9caea2e06b0c794" + SEASTAR_COMMIT="2a2c1d2708bda22087cb04442caebf2e2fe61ef2" SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2" SRC_URI=" https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz @@ -98,7 +98,10 @@ ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (T ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)." DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md ) -PATCHES=() +PATCHES=( + "${FILESDIR}/0001-Fix-Scylla-compilation-with-Crypto-v6.patch" + "${FILESDIR}/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch" +) pkg_pretend() { if tc-is-gcc ; then @@ -156,13 +159,6 @@ src_prepare() { cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die - # fix seastar -Werror crashing build - # sed -e 's/ -Werror//g' -i seastar/configure.py || die - - # fix dpdk for >=glibc-2.25 - # https://github.com/scylladb/dpdk/issues/3 - sed -e '42i #include <sys/sysmacros.h>' -i seastar/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c || die - # run a clean autoreconf on c-ares pushd seastar/c-ares eautoreconf || die @@ -181,7 +177,7 @@ src_configure() { src_compile() { # force number of parallel builds because ninja does a bad job in guessing # and the default build will kill your RAM/Swap in no time - ninja -v build/release/scylla build/release/iotune -j4 || die + ninja -v build/release/scylla build/release/iotune -j2 || die } src_install() { @@ -204,9 +200,6 @@ src_install() { doins dist/common/sysctl.d/*.conf doins dist/debian/sysctl.d/*.conf - insinto /etc/modprobe.d - doins dist/common/modprobe.d/* - insinto /etc/scylla doins conf/* diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild index 82ff6a1..a4a27c3 100644 --- a/dev-db/scylla/scylla-9999.ebuild +++ b/dev-db/scylla/scylla-9999.ebuild @@ -97,7 +97,10 @@ ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (T ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)." DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md ) -PATCHES=() +PATCHES=( + "${FILESDIR}/0001-Fix-Scylla-compilation-with-Crypto-v6.patch" + "${FILESDIR}/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch" +) pkg_pretend() { if tc-is-gcc ; then @@ -155,13 +158,6 @@ src_prepare() { cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die - # fix seastar -Werror crashing build - # sed -e 's/ -Werror//g' -i seastar/configure.py || die - - # fix dpdk for >=glibc-2.25 - # https://github.com/scylladb/dpdk/issues/3 - sed -e '42i #include <sys/sysmacros.h>' -i seastar/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c || die - # run a clean autoreconf on c-ares pushd seastar/c-ares eautoreconf || die @@ -203,9 +199,6 @@ src_install() { doins dist/common/sysctl.d/*.conf doins dist/debian/sysctl.d/*.conf - insinto /etc/modprobe.d - doins dist/common/modprobe.d/* - insinto /etc/scylla doins conf/* |