From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- dev-libs/botan/Manifest | 7 - dev-libs/botan/botan-1.10.17-r2.ebuild | 160 ---------------------- dev-libs/botan/botan-2.11.0.ebuild | 102 -------------- dev-libs/botan/botan-2.14.0.ebuild | 102 -------------- dev-libs/botan/files/botan-1.10.17-build.patch | 25 ---- dev-libs/botan/files/botan-1.10.17-libressl.patch | 40 ------ 6 files changed, 436 deletions(-) delete mode 100644 dev-libs/botan/botan-1.10.17-r2.ebuild delete mode 100644 dev-libs/botan/botan-2.11.0.ebuild delete mode 100644 dev-libs/botan/botan-2.14.0.ebuild delete mode 100644 dev-libs/botan/files/botan-1.10.17-build.patch delete mode 100644 dev-libs/botan/files/botan-1.10.17-libressl.patch (limited to 'dev-libs/botan') diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index f312591c3bda..6eb32a084b64 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,14 +1,7 @@ -AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a -AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642 AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0 -DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 -DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65 -EBUILD botan-1.10.17-r2.ebuild 4260 BLAKE2B a638b40227d5f8e4f4776407718ab20921930d1e0aebf73322097ea5e106c77c570f4b59890a044f965930cfc3c04900e359027793ea70835e98e6df1d5a0cc3 SHA512 8735649c85d603ceba417a7d2b5d61a3067c4e8493965d54d02c10fbf48e431846dcb3138a313fe00eea1a12fec7d84d8a43e7a7160b6ba54e9e7da1c940c093 -EBUILD botan-2.11.0.ebuild 2458 BLAKE2B 9b222461452f52d637669263c552779697b12b8e843490e8257061148864cdc820f94dd1e3fba4445ecaad8318597a7b792a3d8f45b9525478646779dfd7457d SHA512 af7f1e9d8f65ef7b0fd6b09d1b239a43456382929e490600fb77eb28d5412ab5fac82e92c433017bf666d3e7ad3e4ba68f9a832191bae5d3d2c32e3977d941e1 EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241 -EBUILD botan-2.14.0.ebuild 2459 BLAKE2B ec844c7d54d51204af44e4e55464a71b1c15670326a267d28a0c177314cf49eaab7ee43b7b64a4ef2af00d47f0809d3f1778f87c6a4d1a28a164fe9007320c2c SHA512 4e9df2af74bac749cf9a74a14286962e35a245912e248530221200fa5d07280ff45f71398863055373704eaabde6535dbcd8f61b343a8c522d7fa9856ece5054 EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56 diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild deleted file mode 100644 index 80af870a2c46..000000000000 --- a/dev-libs/botan/botan-1.10.17-r2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND} - bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2:* ) - ssl? ( - !libressl? ( /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-2.11.0.ebuild b/dev-libs/botan/botan-2.11.0.ebuild deleted file mode 100644 index 2b1b5bb66292..000000000000 --- a/dev-libs/botan/botan-2.11.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -MY_P="Botan-${PV}" -inherit python-r1 toolchain-funcs - -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" - -LICENSE="BSD" -SLOT="2/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND} - boost? ( >=dev-libs/boost-1.48:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - sqlite? ( dev-db/sqlite:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -BDEPEND=" - dev-lang/python:* - doc? ( dev-python/sphinx ) -" - -src_configure() { - local disable_modules=() - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - case ${CHOST} in - hppa*) CHOSTARCH=parisc ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \ - $(use_enable static-libs static-library) \ - $(use_with boost) \ - $(use_with bzip2) \ - $(use_with doc documentation) \ - $(use_with doc sphinx) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(usex hppa --without-stack-protector '') \ - --cc=gcc \ - --cpu=${CHOSTARCH} \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - --docdir=share/doc \ - --libdir=$(get_libdir) \ - --os=${myos} \ - --prefix="${EPREFIX}/usr" \ - --with-endian="$(tc-endian)" \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --without-doxygen \ - || die "configure.py failed" -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - default - use python && python_foreach_impl python_optimize -} diff --git a/dev-libs/botan/botan-2.14.0.ebuild b/dev-libs/botan/botan-2.14.0.ebuild deleted file mode 100644 index 6d2a94dea777..000000000000 --- a/dev-libs/botan/botan-2.14.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -MY_P="Botan-${PV}" -inherit python-r1 toolchain-funcs - -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" - -LICENSE="BSD" -SLOT="2/$(ver_cut 1-2)" # soname version -KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND} - boost? ( >=dev-libs/boost-1.48:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - sqlite? ( dev-db/sqlite:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -BDEPEND=" - dev-lang/python:* - doc? ( dev-python/sphinx ) -" - -src_configure() { - local disable_modules=() - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - case ${CHOST} in - hppa*) CHOSTARCH=parisc ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \ - $(use_enable static-libs static-library) \ - $(use_with boost) \ - $(use_with bzip2) \ - $(use_with doc documentation) \ - $(use_with doc sphinx) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(usex hppa --without-stack-protector '') \ - --cc=gcc \ - --cpu=${CHOSTARCH} \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - --docdir=share/doc \ - --libdir=$(get_libdir) \ - --os=${myos} \ - --prefix="${EPREFIX}/usr" \ - --with-endian="$(tc-endian)" \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --without-doxygen \ - || die "configure.py failed" -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - default - use python && python_foreach_impl python_optimize -} diff --git a/dev-libs/botan/files/botan-1.10.17-build.patch b/dev-libs/botan/files/botan-1.10.17-build.patch deleted file mode 100644 index 43877972211a..000000000000 --- a/dev-libs/botan/files/botan-1.10.17-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7963d28d03e5f65f4021a5b764dc4bff9417eda Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Wed, 4 Oct 2017 01:50:33 +0300 -Subject: [PATCH] gost_3411: use correct type for build to pass - ---- - src/hash/gost_3411/gost_3411.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp -index 97aa399..7ca22dc 100644 ---- a/src/hash/gost_3411/gost_3411.cpp -+++ b/src/hash/gost_3411/gost_3411.cpp -@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte input[], size_t blocks) - // P transformation - for(size_t k = 0; k != 4; ++k) - { -- const uint64_t UVk = U[k] ^ V[k]; -+ const u64bit UVk = U[k] ^ V[k]; - for(size_t l = 0; l != 8; ++l) - key[4*l+k] = get_byte(l, UVk); - } --- -2.13.6 - diff --git a/dev-libs/botan/files/botan-1.10.17-libressl.patch b/dev-libs/botan/files/botan-1.10.17-libressl.patch deleted file mode 100644 index 5913bfd30494..000000000000 --- a/dev-libs/botan/files/botan-1.10.17-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Wed, 4 Oct 2017 22:16:31 +0300 -Subject: [PATCH] openssl: support libressl - -Signed-off-by: Alon Bar-Lev ---- - src/engine/openssl/ossl_bc.cpp | 2 +- - src/engine/openssl/ossl_md.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp -index 74660c7b5..cb184c202 100644 ---- a/src/engine/openssl/ossl_bc.cpp -+++ b/src/engine/openssl/ossl_bc.cpp -@@ -8,7 +8,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - -diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp -index 2fcb2b0e5..9c43d616e 100644 ---- a/src/engine/openssl/ossl_md.cpp -+++ b/src/engine/openssl/ossl_md.cpp -@@ -8,7 +8,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - --- -2.13.6 - -- cgit v1.2.3