From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- dev-libs/crypto++/Manifest | 11 ++-- dev-libs/crypto++/crypto++-5.6.5-r1.ebuild | 60 ---------------------- dev-libs/crypto++/crypto++-7.0.0-r3.ebuild | 48 ----------------- dev-libs/crypto++/crypto++-8.2.0-r2.ebuild | 2 +- dev-libs/crypto++/crypto++-8.2.0.ebuild | 52 ------------------- dev-libs/crypto++/crypto++-8.3.0.ebuild | 49 ++++++++++++++++++ .../crypto++/files/crypto++-5.6.4-nonative.patch | 28 ---------- .../files/crypto++-5.6.5-CVE-2017-9434.patch | 45 ---------------- 8 files changed, 53 insertions(+), 242 deletions(-) delete mode 100644 dev-libs/crypto++/crypto++-5.6.5-r1.ebuild delete mode 100644 dev-libs/crypto++/crypto++-7.0.0-r3.ebuild delete mode 100644 dev-libs/crypto++/crypto++-8.2.0.ebuild create mode 100644 dev-libs/crypto++/crypto++-8.3.0.ebuild delete mode 100644 dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch delete mode 100644 dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch (limited to 'dev-libs/crypto++') diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest index a2976a069482..a28d6f32ac9d 100644 --- a/dev-libs/crypto++/Manifest +++ b/dev-libs/crypto++/Manifest @@ -1,11 +1,6 @@ -AUX crypto++-5.6.4-nonative.patch 1011 BLAKE2B e8f8245dbb1ce9a0011c0e73ea1021ab4e0e197d2f3eaeaa455265dcbb75b19d50bb308b787bd926afee994c674203622662a120b6c539d6fed6c434bae86b55 SHA512 fd9973d5fcb8182f89388276c54e8698c9b0ec82be1e93a575b4a00ad5f8b2966cd2cf699258dbf8b681423b31cb3d926a694d36d0eb07bf583811d55e845837 -AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f04d90f0b5bff524aa817a46dcb1c3fd005609a938e08007d71bf407bd8ef0c334baa2054b44c2aac58c15817314223c7b0a2c SHA512 42566d3e67c6b253b65587877652112691ba91e554db47843256a9c2af8a29d7950266a508358356f008462ec51cc1dadf4d0e9dbbd33a33a5a94d029eebc1f9 AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e -DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7 -DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5 -EBUILD crypto++-5.6.5-r1.ebuild 1508 BLAKE2B 414f8076a72da047953f6153e867ba9f3a46aabea6bdb49be0c8581c76c47ca7017f606ba4e83261e6d61ed50986ebe0430d62e8870ec13f6689f64de92b67e4 SHA512 c9d628ced0291647540937d5b8b21a3d8b906c1f735efefe46e9df39c34038129e13ee305fadf21e61a844a2d526432379bcd1a0906f305eee247b5735af4068 -EBUILD crypto++-7.0.0-r3.ebuild 1055 BLAKE2B 227217e396ccaa5da08fc2ab159f0519cc9ec0d9283a480d2f9f8f9fa1861fdd7d99b20c50ed891fb206faadc770d77fb894d6140ab15e088faa2ed57a439c17 SHA512 46579432b7c764ff592ec94a5d744aad6f1a9453dc2a4583dc71872fcf52260052d8e3edf790364b7eb36e30ebdb1459ee6fe9400fb62881fe81c5ecce96924f -EBUILD crypto++-8.2.0-r2.ebuild 1734 BLAKE2B 75558e27ac641842302bb1204ae483852c71b65741de7f426c415b15907ae1b20515c0e9f2518248884003157b4eabfca8637eba01ac2df7f0c26be77074b454 SHA512 7d75f266de075a6410ef26999697db14c76ff8b38316afa227419c1532b63c62a70a9cdee67684cded93b12aa49e592be1ba7c0f9ef81666fb95c692d2b99587 -EBUILD crypto++-8.2.0.ebuild 1100 BLAKE2B 2f84080a48c493a2c6ecb94c5b59a24ef253ceec47bacf364fb81e3ef9a79254c9171f62199087586a853cc21da3febda660e4c0601974ede860bff18ed5f8b6 SHA512 01afc48b803f776c94836a762f7a6734f0497922636acacab3063d8f4f9903bab0173e87467e3dc3364a51789537c4561761353497b55585382e2cfbb9526622 +DIST cryptopp830.zip 9120687 BLAKE2B 777ae6a0716793dbbf40594e5f910783852df15e1d6444ddb9505e9f00e6ead0c17fcf6eb5d0b4d58881595fefa79d285bd2db1f1789716ffb59624c50823c3d SHA512 ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147 +EBUILD crypto++-8.2.0-r2.ebuild 1728 BLAKE2B 16a66423eacd0ef476c55b2ff1ac59d074a7fafdce464d7ad5b8d04769b2dde7f098f27b7ab9986ba686f29b168f1d44213bb45f4fddf6223a095f24525a4378 SHA512 6e37f760a975c95251c5919fb30f9a6311a0f5191c9ceb8984ebf7d7283558010fbb60af5f57bba5b73f25197eff43475c47dd0eb8807e97a04f87bebc6b5308 +EBUILD crypto++-8.3.0.ebuild 1095 BLAKE2B 7a8ceb7e2203e017b5236c023ad4afd7bd6fc9d1dc49c84e2d6ba638d78cd05c76f642ba519e8ecdfc38e6972750b69ba7aa87f4219f74260f5e3586e8ae101c SHA512 d402a6c90c6b342fae9fad6a7037e4d229221ff82bc218fd46e8feec10dd632619de051950639f8208373cc580ba39d5445ecf76a4bd1ca162e7d3d867f61a7e MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253 diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild deleted file mode 100644 index 0d60a1066e54..000000000000 --- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0/5.6" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" -IUSE="static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${PN}-5.6.4-nonative.patch" - "${FILESDIR}/${P}-CVE-2017-9434.patch" -) - -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - -src_compile() { - # higher optimizations cause problems - replace-flags -O3 -O2 - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM - - emake -f GNUmakefile all shared -} - -src_install() { - default - - # remove leftovers as build system sucks - rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a - - # compatibility - dosym cryptopp "${EPREFIX}"/usr/include/crypto++ - for f in "${ED}"/usr/$(get_libdir)/*; do - ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die - done -} - -pkg_preinst() { - # we switched directory to symlink - # make sure portage digests that - rm -fr "${EROOT}/usr/include/crypto++" - rm -fr "${EROOT}/usr/include/cryptopp" -} diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild deleted file mode 100644 index f1d8bcbf44c5..000000000000 --- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0/7" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" -IUSE="+asm static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -config_uncomment() { - sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die -} - -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - -src_prepare() { - default - - use asm || config_uncomment CRYPTOPP_DISABLE_ASM - - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM -} - -src_compile() { - emake -f GNUmakefile all shared libcryptopp.pc -} - -src_install() { - default - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild index b81af078bf30..1ffe175e83b9 100644 --- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild +++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" LICENSE="Boost-1.0" SLOT="0/8" # subslot is so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos" IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs" BDEPEND="app-arch/unzip" diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild deleted file mode 100644 index ec4e24855984..000000000000 --- a/dev-libs/crypto++/crypto++-8.2.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="https://cryptopp.com" -SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0/8" # subslot is so version -KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" -IUSE="+asm static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) - -config_uncomment() { - sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die -} - -pkg_setup() { - export CXX="$(tc-getCXX)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" - export PREFIX="${EPREFIX}/usr" -} - -src_prepare() { - default - - use asm || config_uncomment CRYPTOPP_DISABLE_ASM - - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM -} - -src_compile() { - emake -f GNUmakefile all shared libcryptopp.pc -} - -src_install() { - default - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/dev-libs/crypto++/crypto++-8.3.0.ebuild b/dev-libs/crypto++/crypto++-8.3.0.ebuild new file mode 100644 index 000000000000..84d1b838f7c4 --- /dev/null +++ b/dev-libs/crypto++/crypto++-8.3.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="C++ class library of cryptographic schemes" +HOMEPAGE="https://cryptopp.com" +SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" +S="${WORKDIR}" + +LICENSE="Boost-1.0" +SLOT="0/8" # subslot is so version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos" +IUSE="+asm static-libs" + +BDEPEND="app-arch/unzip" + +config_uncomment() { + sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die +} + +src_prepare() { + default + + use asm || config_uncomment CRYPTOPP_DISABLE_ASM + + # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS + [[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM +} + +src_configure() { + export CXX="$(tc-getCXX)" + export LIBDIR="${EPREFIX}/usr/$(get_libdir)" + export PREFIX="${EPREFIX}/usr" + tc-export AR RANLIB + default +} + +src_compile() { + emake -f GNUmakefile all shared libcryptopp.pc +} + +src_install() { + default + + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a +} diff --git a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch deleted file mode 100644 index 77d74ee729e9..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: work/GNUmakefile -=================================================================== ---- work.orig/GNUmakefile -+++ work/GNUmakefile -@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS - endif - endif - --# Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else -- # GCC 3.3 and "unknown option -march=" -- # Ubuntu GCC 4.1 compiler crash with -march=native -- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -- # Sun compiler is handled below -- ifeq ($(SUN_COMPILER)$(IS_X64),01) -- CXXFLAGS += -m64 -- else ifeq ($(SUN_COMPILER)$(IS_X86),01) -- CXXFLAGS += -m32 -- endif # X86/X32/X64 --endif -- - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) - ifneq ($(UNALIGNED_ACCESS),0) diff --git a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch b/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch deleted file mode 100644 index 428f48901a31..000000000000 --- a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 07dbcc3d9644b18e05c1776db2a57fe04d780965 Mon Sep 17 00:00:00 2001 -From: Jeffrey Walton -Date: Wed, 10 May 2017 18:17:12 -0400 -Subject: [PATCH] Add Inflator::BadDistanceErr exception (Issue 414) The - improved validation and excpetion clears the Address Sanitizer and Undefined - Behavior Sanitizer findings - ---- - zinflate.cpp | 8 +++++++- - zinflate.h | 4 ++++ - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/zinflate.cpp b/zinflate.cpp -index 664efe6..fbd7505 100644 ---- a/zinflate.cpp -+++ b/zinflate.cpp -@@ -550,12 +550,16 @@ bool Inflator::DecodeBody() - break; - } - case DISTANCE_BITS: -+ if (m_distance >= COUNTOF(distanceExtraBits)) -+ throw BadDistanceErr(); - bits = distanceExtraBits[m_distance]; - if (!m_reader.FillBuffer(bits)) - { - m_nextDecode = DISTANCE_BITS; - break; - } -+ if (m_distance >= COUNTOF(distanceStarts)) -+ throw BadDistanceErr(); - m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance]; - OutputPast(m_literal, m_distance); - } -diff --git a/zinflate.h b/zinflate.h -index e2fd237..c47d2f6 100644 ---- a/zinflate.h -+++ b/zinflate.h -@@ -96,6 +96,7 @@ public: - }; - class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}}; - class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}}; -+ class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}}; - - //! \brief RFC 1951 Decompressor - //! \param attachment the filter's attached transformation -- cgit v1.2.3