diff options
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/botan/botan-2.19.5.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/botan/botan-3.6.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch | 40 |
4 files changed, 46 insertions, 4 deletions
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 60493935c7e2..091926d1a5dc 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -3,6 +3,7 @@ AUX botan-2.19.5-cloudflare.patch 3012 BLAKE2B 066cd7a5d1e384ebd0596e2af0f00f98c AUX botan-2.19.5-no-distutils.patch 2597 BLAKE2B 5d2cf7e89939abdbf97cb01f6364809782c504c22a613b0fb0fdd112beda35b7f824fb9756a5782b55de775926c4447f3cbf5cc2803844acdd115e6ac1db8cce SHA512 171400cffbefb1d6a50bd0cd134083c6e63efd439a9f0129152637dcc4d3ec00d06494e6d8d3a526a71198a2f3e3a87951e23bcf8f647b3e9e7e3e59c9370c98 AUX botan-3.2.0-ninja.patch 575 BLAKE2B f75eb0a16fadfae6e0a1bb554262d8d902152c054fd97c19a1c4eda31a780138efd42ce05992896d16d98415c555a7cfa01b6dfa201c7e97ad971deab851e7b7 SHA512 ff9078ae1a43404680cf757da15bd17541f51f8de02a1a8d02f075676a1e35ff9a78adba0f3b84847634bc4904ed7b5824df6c708785865a4d01d4f9139e617b AUX botan-3.6.1-boost-1.87.patch 14585 BLAKE2B 175d0a7e0bd16fb1e8f1d2493ad41e6633ec32284704cfb182892acf35695adb38f142ebf557697a422b40b11a0b7842f9852b45022168ffa691ddd84f8334a3 SHA512 f4adea3772b7bff4304c3189f3be38c75c2a3ddcfeb451f7578e2f0e1487e2d1eedef0c7dd782a699cf966931a7ab32f0ca4079d9145b7c43495a6281bf68bea +AUX botan-3.6.1-tests-glibcxx_assertions.patch 1989 BLAKE2B 21ecc6ac95f228c648da3b14927392378691078a67a2aeebaac18895646c03d531bf98342f6a10d40ae5eefbe5e65b565cb62ea860f70a8875673a21164d36d5 SHA512 41a8fcb9a7c865aceb70393f0ccbf5ac8bd7387cd6ec99e4806dbe02a6b90ddb016914bc6f14a5ae742c4989bfd68a0e28ec36b06cc1cb065a27aa62c0cced0d DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23 DIST Botan-2.19.4.tar.xz 6099528 BLAKE2B c35dfec5aad13c76fe09b33f97a72d15f84bfd6c434cae89be13c3fd3e6f7deaa9ea21474890bb6a1f4fa7d23369c32b9fc747862233eac33c8c88dbc912d31f SHA512 2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8 @@ -19,10 +20,10 @@ DIST Botan-3.6.1.tar.xz 7581864 BLAKE2B 744eed158e021d26b9414b3a098e017e6e2c2160 DIST Botan-3.6.1.tar.xz.asc 488 BLAKE2B 3538c941f707a182f86226dfdbb8222570671e0bce3ca61137a5d978c2b1f5e658ffc1168d7e73a1861210adfac8aa661124c9cbc4950973f7b1e2c3360aab90 SHA512 871c6d91368d8a080e704afb53b1339c6d06aa57aaa45f260bccf1cb1ed31c635587ba930f954ab55668a7ca13b89b2f2acba3c0f1723e3f7190c6ebe9dc2e0b EBUILD botan-2.19.3-r2.ebuild 5084 BLAKE2B 4e38d5f419f00e83691cc0eabf70679ef9c2b3ca6583de89bdd629ff047b7ed2fb42e8a577b4352bd5702925de8df0c4c1694562d2fa7b37a3599e13af276da9 SHA512 018dc521bc66d71373865307debdf1bd556b8c663fde27a8e2abb1ab96ce783851024255d8059b0c0146f6ea33d8c43469e77d07996bf3c4ccc7b69a90c0c65a EBUILD botan-2.19.4.ebuild 5158 BLAKE2B 851298f127c510589a3f1a19fef3485318e8ec7bc90f197101cc8d0950cfd935b9f8299d8994135d1d1c6790da5ef5d9492322d6ec2f193b50f7ef6dcd20b05e SHA512 1f3c042a943b5e51d2c10d62ea96e6772457423667f8803ea39e8443f74641be99893eb0015f179c2a9a0440d1a8fccf81134eb963fae5d03ec289ad5a032a4d -EBUILD botan-2.19.5.ebuild 5211 BLAKE2B 680b22edc892be863fdab189b2b9c753d41c31dcd39f999b4d039e0a9f2b1f73575c7aee72a860e2f3e74fc5dbfeba4fa057d9039e351c647ded82a1094ba74c SHA512 f3260993c3149bba2ec86bb782919ecc2c7cd8e3fc20ba544aaf56ec6e17f64e63d0d7a6adc12ad53bed977f3af1880a57f3be9554d24d032af838ec6c8ac8a0 +EBUILD botan-2.19.5.ebuild 5228 BLAKE2B 4c058bdca20c9c31ad2287d71686820d211011228183c0ee448b9ee41132d1593e29a950f436c58b3a0bbb360eeccb6673f0b2b2a4210988249d1da4290afbc5 SHA512 79981d9c133f0df7c5bbf494d8eca30c47295ab44759eb60f567978a879ecdd3ed3c7537b968a7c5a933b3ed794d34b3c9102d435bf3b950a3784ce5ed153e8c EBUILD botan-3.1.1.ebuild 5687 BLAKE2B 2a54f03f4c60f34a426306a440c961d8c670d353dc309eece4b89c251e280a3025faf8c46d76b5f3c2778678fb5302bffa4d13192b7c49b83ff2c4830bd53cf9 SHA512 039403784b9e5314fbf44491a075337e82b88a872965d9c4ec230c9e62b72d2758fb22c0270232faaf07c6de85bc6c9476986f5a264b5253cdb147f8d6c0fd09 EBUILD botan-3.2.0-r1.ebuild 5949 BLAKE2B d3896126f123289ba540718729e96b72fb5c40527be15fe3b7921040210014efdb65748c4dc601130949bf48fced3864f746915ee9ada72f77d85120fbf85a10 SHA512 623175e58b1b045757ff939c05b1cc55357e0d32b76485027ab45179adc5278eb01f46bac5b944ebbb00e0fcb6963da4ae7202721546c306dc0355e7bb747161 EBUILD botan-3.2.0-r2.ebuild 5974 BLAKE2B 0d13e2fd6b89cd5cd4254b0d4d109ce1df29f7e191df73c453786db9e2c134fc79a7faa592147c0bd780e1ea2e0d0c230b51402e028ea1b45f6fa188e20cd8a5 SHA512 d1ec5f53985ddcd8ef65439385a9fa4b33be4686e8fbcedf1c7c3b15eeb74dc635bf46bbba39195e6a5487297ac71e68b9442c129ab36d92c60b8d366dfde1f3 EBUILD botan-3.3.0.ebuild 6000 BLAKE2B 536ec0d6f2b6d832bcd2bfe5a8ecc9f1656ec644fb023dafd0592a5b1492b13fdb9ee75d5c9a6589b822a3882aec19ca35dc737766d4cd073cac7357e1225acb SHA512 179a8f6c557b4d797bb2508d409c0bfff23d35b7d46cc398a888f7f0a6a4e05049800f0dfc62505b7b1448b92a81c3b53001645dd4fd0395848b79336f268009 -EBUILD botan-3.6.1.ebuild 5984 BLAKE2B e88d6380a0ff866a1c2cd5da3898f550de57f74453bbc71c83a2b38b544ed64ee6b4f29ab246d5240720dc9c37ed8371b62198a6bea324b42a687fa79c15aea8 SHA512 78e32e4a696549b39ca7d798cc0767f7c17edd55e5a9c3c251abe748772c95de6acfcb2e59572e4fac8e2a9a0cf5c9f356d8c556050a9a3ea4a7f475f815ddfc +EBUILD botan-3.6.1.ebuild 6028 BLAKE2B 7d0f1b20d19aa9a621884c68ff8bfd3b03490fa73c419e500f671fb569ffecd5b87c2872a7c32833886a6801563b2ddfa2f240c2e5241b4010d9f6395504080e SHA512 b3bc760fe23468bd88abe86b8ffbc1bc45a24dc5ad09cf3e5bf12cb2cc22115743e84c49e6c0e870f68a235ac79cce391a1f8ca2d13d937e1da3b139ff899592 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d diff --git a/dev-libs/botan/botan-2.19.5.ebuild b/dev-libs/botan/botan-2.19.5.ebuild index bece06dd2ab4..f042f0f6df33 100644 --- a/dev-libs/botan/botan-2.19.5.ebuild +++ b/dev-libs/botan/botan-2.19.5.ebuild @@ -194,7 +194,7 @@ src_test() { src_install() { default - if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then + if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then # --docdir in configure controls the parent directory unfortunately mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die fi diff --git a/dev-libs/botan/botan-3.6.1.ebuild b/dev-libs/botan/botan-3.6.1.ebuild index a74ebb175427..e47afaa7b00d 100644 --- a/dev-libs/botan/botan-3.6.1.ebuild +++ b/dev-libs/botan/botan-3.6.1.ebuild @@ -56,7 +56,8 @@ BDEPEND=" # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches PATCHES=( - "${FILESDIR}"/${PN}-3.6.1-boost-1.87.patch + "${FILESDIR}"/${P}-boost-1.87.patch + "${FILESDIR}"/${P}-tests-glibcxx_assertions.patch ) python_check_deps() { diff --git a/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch b/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch new file mode 100644 index 000000000000..204adbc15825 --- /dev/null +++ b/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch @@ -0,0 +1,40 @@ +https://github.com/randombit/botan/issues/4491 +https://github.com/randombit/botan/commit/3e0cb45cc94764e3ff221ceb141421a83eb27aef + +From 3e0cb45cc94764e3ff221ceb141421a83eb27aef Mon Sep 17 00:00:00 2001 +From: Jack Lloyd <jack@randombit.net> +Date: Mon, 28 Oct 2024 18:13:52 -0400 +Subject: [PATCH] Workaround apparent libstdc++ bug in Ubuntu 24.04 + +The iterator checks failed when we attempted to use first to extract +ideal_granularity bytes out of dummy_buffer, but on testing it failed +exactly when ideal_granularity was 256 bytes, the same size as +dummy_buffer itself. + +Increase the size and add an assert that the buffer is large enough. +--- + src/tests/test_ffi.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp +index 647e6ad10b..592435b142 100644 +--- a/src/tests/test_ffi.cpp ++++ b/src/tests/test_ffi.cpp +@@ -1381,7 +1381,7 @@ class FFI_AEAD_Test final : public FFI_Test { + std::vector<uint8_t> ciphertext(ideal_granularity * pt_multiplier + taglen); + TEST_FFI_OK(botan_rng_get, (rng, plaintext.data(), plaintext.size())); + +- std::vector<uint8_t> dummy_buffer(256); ++ std::vector<uint8_t> dummy_buffer(1024); + TEST_FFI_OK(botan_rng_get, (rng, dummy_buffer.data(), dummy_buffer.size())); + std::vector<uint8_t> dummy_buffer_reference = dummy_buffer; + +@@ -1405,6 +1405,7 @@ class FFI_AEAD_Test final : public FFI_Test { + // input if there is no space in the output buffer. Even when + // the cipher is a mode that won't produce any output until the + // entire message is processed. Hence, give it some dummy buffer. ++ BOTAN_ASSERT_NOMSG(dummy_buffer.size() > ideal_granularity); + auto ct_chunk = (requires_entire_message) ? std::span(dummy_buffer).first(ideal_granularity) + : ct_stuffer.first(ideal_granularity); + + |