diff options
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/botan/botan-2.19.2.ebuild | 180 | ||||
| -rw-r--r-- | dev-libs/botan/botan-3.0.0-r2.ebuild | 194 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch | 68 |
4 files changed, 0 insertions, 449 deletions
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 9a4179cd4118..a4be797c2686 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,14 +1,7 @@ -AUX botan-3.0.0-getentropy-includes.patch 2105 BLAKE2B 989ca3a08673bf3d9492d25b41c3a3f8a67d35f377d750f1f53fcbafcc881b560a3ac48e175a9b4b243c8dbc4b3b08a8e31560c867683d561ce661d4e4af084b SHA512 8c5cccdec61a2ce52ba8f1377f538bb29523fdbfd8d732ad6cc009d4e06a52f45d9ab06ac6d2447cbc1c55009e4d11a2a36e40a9e719f5d909d45a91705302a9 -DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4cc5e42aec04fd22932ecdbfa2b755cae53c125eee8248ecae237671ec6f0533f99289068ed81e6cd34886d8b88 SHA512 52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf -DIST Botan-2.19.2.tar.xz.asc 488 BLAKE2B 94d22dff9de02871560649b1d961f4c7ae5fa37a847141554f8da9f0a726d4497cd23e0d84197beb4d176f29aa3a478118d94cd52d2c04733d115828f85d400d SHA512 e25a03ac437a08737ecde541ead4b841ccb507d3198683a1755dab1d4f82e9ce0278473db7c7041a4b808f9dff9927106e30bbad79b1674615254ee78f0b6a06 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-3.0.0.tar.xz 8752380 BLAKE2B 06ac29dc0cbaef43a38cc30185f431e1b1f4083469fdea19ee5d77ada6633022746b8ae2419bd00872f9b3892af9c61a455bc88f77bef84f451938dffd27bde3 SHA512 d67ac0f9d67f6869b7a35d4a7c5e96ffcc619f7e44ead36b4cd0906f3d925d12181566aace03ac719ef54d819ae1158febc0b25839beed5f92eade06d510b594 -DIST Botan-3.0.0.tar.xz.asc 488 BLAKE2B 6a34817ec4700983151f97d2e278870736860ac72f3936fcc63e241d89ba758bdf7765d3c877d88019055562a6067c278ecbac263e8d87cc310790089e47f662 SHA512 46ff64bb4d215a48b0549d90ae2461ae39ae5ecf588a7e130876759ec30561c5a2db77ee9cdc7a3dab990927b51ea732f5b56592bdc150062ca25690378ab817 DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795 DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744 SHA512 f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9 -EBUILD botan-2.19.2.ebuild 4452 BLAKE2B 6f20db33003277c4705690d5aedb9878ad10d24ae01be837d7c0a1c5276b5a8463197b78c1879560ef45369167abe11ed6d10443427505bddd641a2b9fae5ffc SHA512 5e2ea6890d06e9c7999ecb7103bd79e7052a508d8bc94cabf7154afe9a17616f88ff053086980afa2ecf98b2521a7fed4ddd511e01345ea675d85f3038f80984 EBUILD botan-2.19.3-r2.ebuild 4822 BLAKE2B 78f05a4a8832e5eee611da509d40243c57f39e41e39119d07647f94843689052583867c3150fce437cd322369ad6e0d5e0ab03ab7ec19300fb961b269db0e2a1 SHA512 4c0e0eb0e35285af725816edd2c414cf054d7dd06aab9b1c550d70fa892fe603c2e6c20283ee964e1c53a35b87e5177c74c8b4ace5aaa661bc24c73eb72935be -EBUILD botan-3.0.0-r2.ebuild 4881 BLAKE2B bf499274424a18f242b47bdc961dc6a52b49b51cefc1d4ff46848cf7dbc7a7347e16d68056cf405de91c89529ad4ef2357357d26841a29236abeae1cc9b4511a SHA512 5e2e494eed8ffee0ef3f39684a57cccf90c05844558ac9c0fd5da07881866ceb0758bb28effafb4e7ffd87ac4ceee91f9055f53e2e0434b7447837e3e9c1ded2 EBUILD botan-3.1.1.ebuild 5703 BLAKE2B ea6b59cfa80842a3dd9364bba6118439880d9731fb00afaeb28d78d95d0d23e9b067ac70b93fc55b834c7eb7665930c1c0809d15b0e62a18ad55cda5e32f03bf SHA512 7636b43a92eaaaadd17dc641af79ff689014e9654ebb083ffbc8f8ef1493332f0da604ffccb39d0e0ecfa19c721e0750463e9a432ef3e34a5d60a34ae089804e MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d diff --git a/dev-libs/botan/botan-2.19.2.ebuild b/dev-libs/botan/botan-2.19.2.ebuild deleted file mode 100644 index 9001823c1c74..000000000000 --- a/dev-libs/botan/botan-2.19.2.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo multiprocessing python-r1 toolchain-funcs verify-sig - -MY_P="Botan-${PV}" -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2" -SLOT="2/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" -IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" -RESTRICT="!test? ( test )" - -CPU_USE=( - cpu_flags_arm_{aes,neon} - cpu_flags_ppc_altivec - cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} -) - -IUSE+=" ${CPU_USE[@]}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# NOTE: Boost is needed at runtime too for the CLI tool. -DEPEND=" - boost? ( dev-libs/boost:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ') - verify-sig? ( sec-keys/openpgp-keys-botan ) -" - -# NOTE: Considering patching Botan? -# Please see upstream's guidance: -# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches - -python_check_deps() { - use doc || return 0 - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -src_configure() { - python_setup - - local disable_modules=( - $(usev !boost 'boost') - ) - - if [[ -z "${DISABLE_MODULES}" ]] ; then - elog "Disabling module(s): ${disable_modules[@]}" - fi - - local chostarch="${CHOST%%-*}" - - # Arch specific wrangling - local myos= - case ${CHOST} in - *-darwin*) - myos=darwin - ;; - *) - myos=linux - - if [[ ${CHOST} == *hppa* ]] ; then - chostarch=parisc - elif [[ ${ABI} == sparc64 ]] ; then - chostarch="sparc64" - elif [[ ${ABI} == sparc32 ]] ; then - chostarch="sparc32" - fi - ;; - esac - - local pythonvers=() - if use python ; then - _append() { - pythonvers+=( ${EPYTHON/python/} ) - } - - python_foreach_impl _append - fi - - local myargs=( - # Intrinsics - # TODO: x86 RDSEED (new CPU_FLAGS_X86?) - # TODO: POWER Crypto (new CPU_FLAGS_PPC?) - $(usev !cpu_flags_arm_aes '--disable-armv8crypto') - $(usev !cpu_flags_arm_neon '--disable-neon') - $(usev !cpu_flags_ppc_altivec '--disable-altivec') - $(usev !cpu_flags_x86_aes '--disable-aes-ni') - $(usev !cpu_flags_x86_avx2 '--disable-avx2') - $(usev !cpu_flags_x86_popcnt '--disable-bmi2') - $(usev !cpu_flags_x86_rdrand '--disable-rdrand') - $(usev !cpu_flags_x86_sha '--disable-sha-ni') - $(usev !cpu_flags_x86_sse2 '--disable-sse2') - $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') - $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') - $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - - # HPPA's GCC doesn't support SSP (presumably due to stack direction) - $(usev hppa '--without-stack-protector') - - $(use_with boost) - $(use_with bzip2) - $(use_with doc documentation) - $(use_with doc sphinx) - $(use_with lzma) - $(use_enable static-libs static-library) - $(use_with sqlite sqlite3) - $(use_with zlib) - - --cpu=${chostarch} - --docdir=share/doc - --disable-modules=$(IFS=","; echo "${disable_modules[*]}") - --distribution-info="Gentoo ${PVR}" - --libdir="$(get_libdir)" - - # Don't install Python bindings automatically - # (do it manually later in the right place) - # bug #723096 - --no-install-python-module - - --os=${myos} - --prefix="${EPREFIX}"/usr - --with-endian="$(tc-endian)" - --with-python-version=$(IFS=","; echo "${pythonvers[*]}") - ) - - local build_targets=( - shared - $(usev static-libs static) - $(usev tools cli) - $(usev test tests) - ) - - myargs+=( - --build-targets=$(IFS=","; echo "${build_targets[*]}") - ) - - if use elibc_glibc && use kernel_linux ; then - myargs+=( - --with-os-features=getrandom,getentropy - ) - fi - - tc-export AR CC CXX - - edo ${EPYTHON} configure.py --verbose "${myargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}" edo ./botan-test --test-threads="$(makeopts_jobs)" -} - -src_install() { - default - - # Manually install the Python bindings (bug #723096) - if use python ; then - python_foreach_impl python_domodule src/python/botan2.py - fi -} diff --git a/dev-libs/botan/botan-3.0.0-r2.ebuild b/dev-libs/botan/botan-3.0.0-r2.ebuild deleted file mode 100644 index 29f6c986af69..000000000000 --- a/dev-libs/botan/botan-3.0.0-r2.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo multiprocessing python-r1 toolchain-funcs verify-sig - -MY_P="Botan-${PV}" -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2" -# New major versions are parallel-installable -SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" -IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" -RESTRICT="!test? ( test )" - -CPU_USE=( - cpu_flags_arm_{aes,neon} - cpu_flags_ppc_altivec - cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} -) - -IUSE+=" ${CPU_USE[@]}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# NOTE: Boost is needed at runtime too for the CLI tool. -DEPEND=" - boost? ( dev-libs/boost:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -RDEPEND=" - ${DEPEND} - !<dev-libs/botan-2.19.3-r1:2[tools] -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ') - verify-sig? ( sec-keys/openpgp-keys-botan ) -" - -# NOTE: Considering patching Botan? -# Please see upstream's guidance: -# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches -PATCHES=( - "${FILESDIR}"/${P}-getentropy-includes.patch -) - -python_check_deps() { - use doc || return 0 - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -src_configure() { - python_setup - - local disable_modules=( - $(usev !boost 'boost') - ) - - if [[ -z "${DISABLE_MODULES}" ]] ; then - elog "Disabling module(s): ${disable_modules[@]}" - fi - - local chostarch="${CHOST%%-*}" - - # Arch specific wrangling - local myos= - case ${CHOST} in - *-darwin*) - myos=darwin - ;; - *) - myos=linux - - if [[ ${CHOST} == *hppa* ]] ; then - chostarch=parisc - elif [[ ${ABI} == sparc64 ]] ; then - chostarch="sparc64" - elif [[ ${ABI} == sparc32 ]] ; then - chostarch="sparc32" - fi - ;; - esac - - local pythonvers=() - if use python ; then - _append() { - pythonvers+=( ${EPYTHON/python/} ) - } - - python_foreach_impl _append - fi - - local myargs=( - # Intrinsics - # TODO: x86 RDSEED (new CPU_FLAGS_X86?) - # TODO: POWER Crypto (new CPU_FLAGS_PPC?) - $(usev !cpu_flags_arm_aes '--disable-armv8crypto') - $(usev !cpu_flags_arm_neon '--disable-neon') - $(usev !cpu_flags_ppc_altivec '--disable-altivec') - $(usev !cpu_flags_x86_aes '--disable-aes-ni') - $(usev !cpu_flags_x86_avx2 '--disable-avx2') - $(usev !cpu_flags_x86_popcnt '--disable-bmi2') - $(usev !cpu_flags_x86_rdrand '--disable-rdrand') - $(usev !cpu_flags_x86_sha '--disable-sha-ni') - $(usev !cpu_flags_x86_sse2 '--disable-sse2') - $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') - $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') - $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - - # HPPA's GCC doesn't support SSP - $(usev hppa '--without-stack-protector') - - $(use_with boost) - $(use_with bzip2) - $(use_with doc documentation) - $(use_with doc sphinx) - $(use_with lzma) - $(use_enable static-libs static-library) - $(use_with sqlite sqlite3) - $(use_with zlib) - - --cpu=${chostarch} - --docdir=share/doc - --disable-modules=$(IFS=","; echo "${disable_modules[*]}") - --distribution-info="Gentoo ${PVR}" - --libdir="$(get_libdir)" - # Avoid collisions between slots for tools (bug #905700) - --program-suffix=$(ver_cut 1) - - # Don't install Python bindings automatically - # (do it manually later in the right place) - # bug #723096 - --no-install-python-module - - --os=${myos} - --prefix="${EPREFIX}"/usr - --with-endian="$(tc-endian)" - --with-python-version=$(IFS=","; echo "${pythonvers[*]}") - ) - - local build_targets=( - shared - $(usev static-libs static) - $(usev tools cli) - $(usev test tests) - ) - - myargs+=( - --build-targets=$(IFS=","; echo "${build_targets[*]}") - ) - - if use elibc_glibc && use kernel_linux ; then - myargs+=( - --with-os-features=getrandom,getentropy - ) - fi - - tc-export AR CC CXX - - edo ${EPYTHON} configure.py --verbose "${myargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" -} - -src_install() { - default - - if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then - # --docdir in configure controls the parent directory unfortunately - mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die - fi - - # Manually install the Python bindings (bug #723096) - if use python ; then - python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py - fi -} diff --git a/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch b/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch deleted file mode 100644 index d8b99ba0f4c5..000000000000 --- a/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://bugs.gentoo.org/909422 -https://github.com/randombit/botan/commit/3f87e1eef7dbfe231d833ffbf06f7a85b070b600 (cherry-picked getentropy.cpp bit) -https://github.com/randombit/botan/commit/562ea8da8ab34985b4b3dfefc1bea57829213ace - ---- a/src/lib/entropy/getentropy/getentropy.cpp -+++ b/src/lib/entropy/getentropy/getentropy.cpp -@@ -10,8 +10,8 @@ - #if defined(BOTAN_TARGET_OS_IS_OPENBSD) || defined(BOTAN_TARGET_OS_IS_FREEBSD) || defined(BOTAN_TARGET_OS_IS_SOLARIS) - #include <unistd.h> - #else -- #include <sys/types.h> // older macOS needs this before sys/random.h - #include <sys/random.h> -+ #include <sys/types.h> // older macOS needs this before sys/random.h - #endif - - namespace Botan { -@@ -21,16 +21,14 @@ namespace Botan { - * buffer size is limited to 256 bytes. On OpenBSD this does neither - * block nor fail. - */ --size_t Getentropy::poll(RandomNumberGenerator& rng) -- { -+size_t Getentropy::poll(RandomNumberGenerator& rng) { - secure_vector<uint8_t> buf(256); - -- if(::getentropy(buf.data(), buf.size()) == 0) -- { -+ if(::getentropy(buf.data(), buf.size()) == 0) { - rng.add_entropy(buf.data(), buf.size()); - return buf.size() * 8; -- } -+ } - - return 0; -- } - } -+} // namespace Botan - -From 562ea8da8ab34985b4b3dfefc1bea57829213ace Mon Sep 17 00:00:00 2001 -From: Jack Lloyd <jack@randombit.net> -Date: Mon, 29 May 2023 10:10:54 -0400 -Subject: [PATCH] Clean up getentropy includes - ---- a/src/lib/entropy/getentropy/getentropy.cpp -+++ b/src/lib/entropy/getentropy/getentropy.cpp -@@ -6,12 +6,11 @@ - */ - - #include <botan/internal/getentropy.h> -+#include <unistd.h> - --#if defined(BOTAN_TARGET_OS_IS_OPENBSD) || defined(BOTAN_TARGET_OS_IS_FREEBSD) || defined(BOTAN_TARGET_OS_IS_SOLARIS) -- #include <unistd.h> --#else -+// macOS and Android include it in sys/random.h instead -+#if __has_include(<sys/random.h>) - #include <sys/random.h> -- #include <sys/types.h> // older macOS needs this before sys/random.h - #endif - - namespace Botan { -@@ -31,4 +30,5 @@ size_t Getentropy::poll(RandomNumberGenerator& rng) { - - return 0; - } -+ - } // namespace Botan - |