diff options
| -rw-r--r-- | app-admin/scylla-jmx/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild (renamed from app-admin/scylla-jmx/scylla-jmx-2.1.5.ebuild) | 0 | ||||
| -rw-r--r-- | app-admin/scylla-tools/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-tools/scylla-tools-2.2.0.ebuild (renamed from app-admin/scylla-tools/scylla-tools-2.1.5.ebuild) | 0 | ||||
| -rw-r--r-- | dev-db/scylla/Manifest | 16 | ||||
| -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/files/boost-1.65.0-icl-ttp-matching.patch | 37 | ||||
| -rw-r--r-- | dev-db/scylla/scylla-2.2.0.ebuild (renamed from dev-db/scylla/scylla-2.1.5.ebuild) | 24 | ||||
| -rw-r--r-- | dev-db/scylla/scylla-9999.ebuild | 14 |
10 files changed, 72 insertions, 98 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 99c3b9e..96a7b9c 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.5.tar.gz 98649 BLAKE2B 74a752d04cb430df3efae91816faf6d399117290091b9c45cd26d804594e19526ceb0a53fe1a644c2e0690dde61dee0bc704ba6c5406817d705fd6536ff7feb1 SHA512 8dc72c22a04db92dcd3160d88bf6e0c75ba1ee79179efba3fefbffea492354ba612b1f2cc2989534266bf2c8351eca6e4de4fd8985e6275e866fe9cb00afa4de -EBUILD scylla-jmx-2.1.5.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49 +DIST scylla-jmx-2.2.0.tar.gz 98666 BLAKE2B bb024576bf3eff4188b4aa8654932cb6521ff492f4d227c43b810c70b0df26ea7a76ec8eacadb1d82c1d79e1ee887b03ab12ad55b4fb3bddcc0dccfaeefcdfd0 SHA512 b1bd6906930504d887a804c81af748318e0e84482669ef69b8ed795d7047e66064eb6d69bc2fd786c303252ca78599e23b483b1c740e00540e34d932afde7f83 +EBUILD scylla-jmx-2.2.0.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.5.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild index 001ec6f..001ec6f 100644 --- a/app-admin/scylla-jmx/scylla-jmx-2.1.5.ebuild +++ b/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index 2aa5e51..a90b9a2 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -1,4 +1,4 @@ -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 +DIST scylla-tools-2.2.0.tar.gz 26860019 BLAKE2B f06311a5faae7ca9d03a073e18e3a1db21d35910a4edd1ac06e28a42710d605acd5cdf99735e5c9055940defaffa8be06e4b82089225f14bb396a12b1b14f597 SHA512 a7fda34bcfe60eabc741de8cae4f50bada2d59510d9ddb4a030f95fe05b352eaea7d496dac39e9c8f1a45d877f14e36b41e01448cfb8573ca0acedf6bf1a1a4f +EBUILD scylla-tools-2.2.0.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.5.ebuild b/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild index 9d41e14..9d41e14 100644 --- a/app-admin/scylla-tools/scylla-tools-2.1.5.ebuild +++ b/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest index 61fc8dd..38a7335 100644 --- a/dev-db/scylla/Manifest +++ b/dev-db/scylla/Manifest @@ -1,15 +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 boost-1.65.0-icl-ttp-matching.patch 1427 BLAKE2B de9c77253963656f85ed2d05babd600bc5b59b567bc889ed815dfba97f2a1334df48dbb1e67879dea1419fb439c513c54a66531d4e8ec28a7848385f70471334 SHA512 aaa7959df631c17a80486e5b6724d76bf2193694f5559443350c74567506f36c133f740adcbb1b2d3a5a2760730f498f0fd655ec6eff6d20393b6e49549c6ec8 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 dpdk-a1774652fbbb1fe7c0ff392d5e66de60a0154df6.tar.gz 12197001 BLAKE2B 3030c2894dbfb6dd2f9259e6d05bb4ce340182ee59291dd66c3f73d6e45787ca417cda90776a916b156566b7cb3f5778d5561f57bd5d3dfa1e9b6854e59027a7 SHA512 90b3b7ef24cf088582bad7444196816a322d4f38a78f627e10f65f22896b897b6b89fc451c9d16c04bd5565c8e3d60fc05aac35e6520ff6075c174a5bc0d4fee DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0 -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-2.2.0.tar.gz 2650641 BLAKE2B fffc0a18178a2c8011a150ee7b802f1bcd3daa613db127a9ddce5266a265384124b1d61c31c0d0401915ad9e7d1b6de978053ed78217a9c21ea9588d17415091 SHA512 d84b3098d585a6eb931cdb439b17863fc8036cefc66f4c4f354f8a904f8e6b2db9452eac8e9f09bd6e0b33188d17d39bc7b37a41a7148c62fe9f244dd89ef237 +DIST scylla-ami-6ed71a3126170d32fa1712370da6945c161b4bd8.tar.gz 10340 BLAKE2B dd9cd55be1b4da28676300961f4fc2046cbb2acf6a6648a61a954c8fa8cc7ae4acacdcff44b2ffcc9b7c471872e499c8ffb806892df209abd861924879a0e19e SHA512 59bb9c601f82577ee7fe988f4095d141e5082a4352b6dd2b90522a830a21afaa24573f60fc7d994e9ea3036e58160f88b97add5cebc4b04b94fbddf339b8ddd8 +DIST scylla-seastar-6f61d7456e0a9969193106a0cc0e044ffead2126.tar.gz 804553 BLAKE2B d48a371083e63fcaec8c77038d5d9d8e9fba0d954fc217aae593831dc0f1c0202d5ac0d36b0528896a572586caaf61c4729063dbbb952cd53491964fa3d18d60 SHA512 d1e16097f0fb1a55dd72ac85e63be2df92254bb42c6034b97d6683d01c382bf2f60ae5e6099890ad3c6db40e2e1fa7bc7d0034770b467fe05dee7d428c3f734c DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 BLAKE2B 5f358f44051a2fa9a10d83fce9cab9e57b56505c4270f089a4d12aaa4e9c45a205665b342a0abb5cf314a9fd24b4186f3a176c58328cc627edc73cc854a30079 SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99 -EBUILD scylla-2.1.5.ebuild 7719 BLAKE2B 346b5cc2474b7818240e4ead704198124c9875b2ced75a60b4ec7fe4c9e82ab790187390aebedc190b82bf8294656594f007ec579f9b4abfc8f04e009170b879 SHA512 c8b23892e7ef02716201283c04982d9389aab1cb20c83defc6dc2f7efa019a69b305d5554701f4f1f528532b601d4ede1c7afc5f29579fdb4772f3cdbd5a0186 -EBUILD scylla-9999.ebuild 7425 BLAKE2B ac282dac409c27abc952300227b9464fb720d03151b6ab69bc4c5a6afe0745bf8e9d181c5d6a2a0b0409060d99cc4d8033d39e22b2da969b2cfdcf54604a4c6a SHA512 7f330b747e2f2409b0d90e6f655aa6453e132c9747ddf47f96836e37ca9e228211a7ea6193fa80ecb274e3f85905c626aa49471e04dc1c922b2ccde1adc4e203 +DIST xxhash-744892b802dcf61a78a3f2f1311d542577c16d66.tar.gz 29205 BLAKE2B 594f09421030809ed456ba7af906adfbf1243f7ded4161e7777ec2ef2b9ab24c653923f784a2e00b22731be0378aea76263e39614941432cb0128d972e9ff488 SHA512 f94b1b19d1c232c2e59058514be34ee169f2f11722a088ab401a38dcd75ae693bb0fbe87180060207ebff29f7b3c2a4444db54e4f57c61cac0438c4db1f118f3 +EBUILD scylla-2.2.0.ebuild 7955 BLAKE2B 4ff9607fc7e551ad74242419977fea9b85d87a7291a0c1cd851032a95c6dc89985cba592ea9f9da5f4fc3c11d936c156a29a9e1d81d0970c43086f5feacce628 SHA512 6734b89f6671d3961de838f6c09803eb69a48bad0a6236295a317aefad6b51e30acc5b887fcac9a83cada66ea38de77cb1879076bc23c2261734702040e8f3ba +EBUILD scylla-9999.ebuild 7485 BLAKE2B ddad46a83a1646584b984c6ba75f5b0c926a172a178f919a2c70f67ee643e8e6d14b9ffef0b65b306d6ef71fdb141770cf919270be5a1f0562cc37f0466215a3 SHA512 81517a05ef100d4036343682c2d7b41664c23f3336551e0594038f847821773b8b3ab0af68da20e8603972c0ced446ef6b2c1e007967f8ae02f854213f2fa3b9 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 deleted file mode 100644 index 2130861..0000000 --- a/dev-db/scylla/files/0001-Fix-Scylla-compilation-with-Crypto-v6.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 394b7dc..0000000 --- a/dev-db/scylla/files/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/files/boost-1.65.0-icl-ttp-matching.patch b/dev-db/scylla/files/boost-1.65.0-icl-ttp-matching.patch new file mode 100644 index 0000000..f3c60a6 --- /dev/null +++ b/dev-db/scylla/files/boost-1.65.0-icl-ttp-matching.patch @@ -0,0 +1,37 @@ +From 32178e147a976419b9ac846d3c40c3ab4d1e0ff6 Mon Sep 17 00:00:00 2001 +From: Mathias Gaunard <mathias@gaunard.com> +Date: Thu, 4 May 2017 17:18:22 +0100 +Subject: [PATCH] Compatibility with GCC 7.1 + +The libstdc++ shipped with GCC 7.1 uses a unary class template for std::string. +type_to_string needs to be adapted to deal with this properly. +--- + boost/icl/type_traits/type_to_string.hpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/boost/icl/type_traits/type_to_string.hpp b/boost/icl/type_traits/type_to_string.hpp +index 80c473a..994711b 100644 +--- a/boost/icl/type_traits/type_to_string.hpp ++++ b/boost/icl/type_traits/type_to_string.hpp +@@ -43,7 +43,6 @@ namespace boost{ namespace icl + + template<>inline std::string type_to_string<float>::apply() { return "flt"; } + template<>inline std::string type_to_string<double>::apply() { return "dbl"; } +- template<>inline std::string type_to_string<std::string>::apply() { return "string"; } + + //------------------------------------------------------------------------- + template<template<class> class Templ> +@@ -78,6 +77,13 @@ namespace boost{ namespace icl + } + }; + ++ // --------------------------------------------------------------------------- ++ template<> ++ struct type_to_string<std::string> ++ { ++ static std::string apply() { return "string"; } ++ }; ++ + }} // namespace boost icl + + #endif diff --git a/dev-db/scylla/scylla-2.1.5.ebuild b/dev-db/scylla/scylla-2.2.0.ebuild index 5932e3a..de84571 100644 --- a/dev-db/scylla/scylla-2.1.5.ebuild +++ b/dev-db/scylla/scylla-2.2.0.ebuild @@ -11,12 +11,13 @@ if [[ ${PV} == "9999" ]] ; then else MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" - AMI_COMMIT="0df779dcca3dc36ec7a6e91295a2f96828b07dc8" + AMI_COMMIT="6ed71a3126170d32fa1712370da6945c161b4bd8" C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533" - DPDK_COMMIT="8aa1d694919fb63211ed625539250008f5d7df9a" + DPDK_COMMIT="a1774652fbbb1fe7c0ff392d5e66de60a0154df6" FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa" - SEASTAR_COMMIT="2a2c1d2708bda22087cb04442caebf2e2fe61ef2" + SEASTAR_COMMIT="6f61d7456e0a9969193106a0cc0e044ffead2126" SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2" + XXHASH_COMMIT="744892b802dcf61a78a3f2f1311d542577c16d66" SRC_URI=" https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz https://github.com/scylladb/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_COMMIT}.tar.gz @@ -25,6 +26,7 @@ else https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz + https://github.com/scylladb/xxHash/archive/${XXHASH_COMMIT}.tar.gz -> xxhash-${XXHASH_COMMIT}.tar.gz " KEYWORDS="~amd64" S="${WORKDIR}/scylla-${MY_P}" @@ -53,8 +55,8 @@ RESTRICT="test" RDEPEND=" <dev-libs/thrift-0.11.0 <dev-util/ragel-7.0 - =app-admin/scylla-jmx-${PV} - =app-admin/scylla-tools-${PV} + ~app-admin/scylla-jmx-${PV} + ~app-admin/scylla-tools-${PV} app-arch/lz4 app-arch/snappy dev-cpp/antlr-cpp:3.5 @@ -98,10 +100,7 @@ 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=( - "${FILESDIR}/0001-Fix-Scylla-compilation-with-Crypto-v6.patch" - "${FILESDIR}/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch" -) +PATCHES=() pkg_pretend() { if tc-is-gcc ; then @@ -109,6 +108,10 @@ pkg_pretend() { die "You need at least sys-devel/gcc-7.3" fi fi + ewarn "" + ewarn "IMPORTANT!!" + ewarn "dev-libs/boost-1.65 needs to be patched with provided boost-1.65.0-icl-ttp-matching.patch" + ewarn "" } pkg_setup() { @@ -144,6 +147,9 @@ src_prepare() { rmdir dist/ami/files/scylla-ami || die mv "${WORKDIR}/scylla-ami-${AMI_COMMIT}" dist/ami/files/scylla-ami || die + rmdir xxHash || die + mv "${WORKDIR}/xxHash-${XXHASH_COMMIT}" xxHash || die + # set version echo "${MY_PV}-gentoo" > version fi diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild index 0b9a624..f3dfb32 100644 --- a/dev-db/scylla/scylla-9999.ebuild +++ b/dev-db/scylla/scylla-9999.ebuild @@ -16,6 +16,7 @@ else FMT_COMMIT="" SEASTAR_COMMIT="" SWAGGER_COMMIT="" + XXHASH_COMMIT="" SRC_URI=" https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz https://github.com/scylladb/seastar/archive/${SEASTAR_COMMIT}.tar.gz -> seastar-${SEASTAR_COMMIT}.tar.gz @@ -24,6 +25,7 @@ else https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz + https://github.com/scylladb/xxHash/archive/${AMI_COMMIT}.tar.gz -> scylla-xxhash-${XXHASH_COMMIT}.tar.gz " KEYWORDS="~amd64" S="${WORKDIR}/scylla-${MY_P}" @@ -52,8 +54,8 @@ RESTRICT="test" RDEPEND=" <dev-libs/thrift-0.11.0 <dev-util/ragel-7.0 - =app-admin/scylla-jmx-${PV} - =app-admin/scylla-tools-${PV} + ~app-admin/scylla-jmx-${PV} + ~app-admin/scylla-tools-${PV} app-arch/lz4 app-arch/snappy dev-cpp/antlr-cpp:3.5 @@ -97,10 +99,7 @@ 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=( - "${FILESDIR}/0001-Fix-Scylla-compilation-with-Crypto-v6.patch" - "${FILESDIR}/0001-Inject-CryptoPP-namespace-where-Crypto-byte-typedef-.patch" -) +PATCHES=() pkg_pretend() { if tc-is-gcc ; then @@ -143,6 +142,9 @@ src_prepare() { rmdir dist/ami/files/scylla-ami || die mv "${WORKDIR}/scylla-ami-${AMI_COMMIT}" dist/ami/files/scylla-ami || die + rmdir xxHash || die + mv "${WORKDIR}/xxHash-${XXHASH_COMMIT}" xxHash || die + # set version echo "${MY_PV}-gentoo" > version fi |