[gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/files/, dev-libs/crypto++/
commit: 8c2b2de331750a01550608034a5305a21198f32f Author: Sam James gentoo org> AuthorDate: Sun Feb 20 05:38:29 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 20 05:38:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2b2de3 dev-libs/crypto++: drop 8.2.0-r2, 8.4.0, 8.5.0 Signed-off-by: Sam James gentoo.org> dev-libs/crypto++/Manifest | 4 - dev-libs/crypto++/crypto++-8.2.0-r2.ebuild | 61 - dev-libs/crypto++/crypto++-8.4.0.ebuild| 53 dev-libs/crypto++/crypto++-8.5.0.ebuild| 60 - dev-libs/crypto++/files/crypto++-8.2.0-build.patch | 271 - 5 files changed, 449 deletions(-) diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest index 286877ceff98..a96d06c31610 100644 --- a/dev-libs/crypto++/Manifest +++ b/dev-libs/crypto++/Manifest @@ -1,6 +1,2 @@ -DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5 -DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09 -DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c79739550b1ec7a6da3e7183af5748c2dfa5127be3810d73960af2f3b09b4b2bf4e624a43bfc4357ecde12b SHA512 090472545c74bbf0579b56b09e8b5dcd777b38f29f7199a2e68f45d4a8c687acc82f105ba8b2a38f9aa65e5997a3d846aaf2341ab74d58b4bbfd1f5f03823b93 -DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63 DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03 DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21 diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild deleted file mode 100644 index a52ee90857ea.. --- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 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 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" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" -) - -config_add() { - sed -i -e "/Important Settings/a#define $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_add CRYPTOPP_DISABLE_ASM - use cpu_flags_x86_aes || config_add CRYPTOPP_DISABLE_AESNI - use cpu_flags_x86_avx || config_add CRYPTOPP_DISABLE_AVX - use cpu_flags_x86_avx2 || config_add CRYPTOPP_DISABLE_AVX2 - use cpu_flags_x86_pclmul || config_add CRYPTOPP_DISABLE_CLMUL - use cpu_flags_x86_sha || config_add CRYPTOPP_DISABLE_SHANI - use cpu_flags_x86_sse2 || config_add CRYPTOPP_DISABLE_SSE2 - use cpu_flags_x86_sse4_2 || config_add CRYPTOPP_DISABLE_SSE4 - use cpu_flags_x86_ssse3 || config_add CRYPTOPP_DISABLE_SSSE3 - - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && config_add 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/files/, dev-libs/crypto++/
commit: 34abb7faf744a76561db0e7c922e2c6f409da053 Author: Alon Bar-Lev gentoo org> AuthorDate: Tue Apr 30 06:01:29 2019 + Commit: Alon Bar-Lev gentoo org> CommitDate: Tue Apr 30 06:03:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34abb7fa Revert "dev-libs/crypto++: cleanup old" This reverts commit 756f4a7c8eaf896507c32131037492bd1e26e2e5. Used by gentoo.org> dev-libs/crypto++/Manifest | 1 + dev-libs/crypto++/crypto++-5.6.5-r1.ebuild | 60 ++ .../crypto++/files/crypto++-5.6.4-nonative.patch | 28 ++ .../files/crypto++-5.6.5-CVE-2017-9434.patch | 45 4 files changed, 134 insertions(+) diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest index afb0e40685e..ddba9587a28 100644 --- a/dev-libs/crypto++/Manifest +++ b/dev-libs/crypto++/Manifest @@ -1 +1,2 @@ +DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild new file mode 100644 index 000..03281fc6285 --- /dev/null +++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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}${EPREFIX}"/usr/$(get_libdir)/*.a + + # compatibility + dosym cryptopp "${EPREFIX}"/usr/include/crypto++ + for f in "${ED}${EPREFIX}"/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++/files/crypto++-5.6.4-nonative.patch b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch new file mode 100644 index 000..77d74ee729e --- /dev/null +++ b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index
[gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/files/, dev-libs/crypto++/
commit: b38aa2bb931c2063d5ebdcfda230b45b559c98c2 Author: Alon Bar-Lev gentoo org> AuthorDate: Sun Apr 17 04:48:46 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Sun Apr 17 04:49:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38aa2bb Revert "dev-libs/crypto++: add pkgconfig file for clementine" This reverts commit 9960132bfacc2d44138d832c66835bfa27aa99e9. dev-libs/crypto++/crypto++-5.6.2-r4.ebuild | 75 -- dev-libs/crypto++/files/cryptopp.pc| 12 - 2 files changed, 87 deletions(-) diff --git a/dev-libs/crypto++/crypto++-5.6.2-r4.ebuild b/dev-libs/crypto++/crypto++-5.6.2-r4.ebuild deleted file mode 100644 index 1796b2d..000 --- a/dev-libs/crypto++/crypto++-5.6.2-r4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs autotools - -DESCRIPTION="C++ class library of cryptographic schemes" -HOMEPAGE="http://cryptopp.com; -SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos" -IUSE="static-libs" - -DEPEND="app-arch/unzip - sys-devel/libtool" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-r1-make.patch - epatch "${FILESDIR}"/${P}-cve-2015-2141.patch - - # Generate our own libtool script for building. - cat <<-EOF > configure.ac - AC_INIT(lt, 0) - AM_INIT_AUTOMAKE - AC_PROG_CXX - LT_INIT - AC_CONFIG_FILES(Makefile) - AC_OUTPUT - EOF - touch NEWS README AUTHORS ChangeLog Makefile.am - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_compile() { - # higher optimizations cause problems - replace-flags -O? -O1 - filter-flags -fomit-frame-pointer - # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS - [[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM - - emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" LIBTOOL="./libtool" -} - -src_test() { - # ensure that all test vectors have Unix line endings - local file - for file in TestVectors/* ; do - edos2unix ${file} - done - - if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test ; then - eerror "Crypto++ self-tests failed." - eerror "Try to remove some optimization flags and reemerge Crypto++." - die "emake test failed" - fi -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" LIBTOOL="./libtool" install - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la - cp "${FILESDIR}/cryptopp.pc" "${WORKDIR}" || die "Could not find pkg-config file" - sed -i -e "s:^prefix= :prefix= ${EPREFIX}:" -e "s:/,lib,:/$(get_libdir):g" "${WORKDIR}/cryptopp.pc" - insinto "/usr/$(get_libdir)/pkgconfig" - doins "${WORKDIR}/cryptopp.pc" -} diff --git a/dev-libs/crypto++/files/cryptopp.pc b/dev-libs/crypto++/files/cryptopp.pc deleted file mode 100644 index ed60972..000 --- a/dev-libs/crypto++/files/cryptopp.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix= /usr -exec_prefix=${prefix} -libdir=${exec_prefix}/,lib, -includedir=${prefix}/include - -Name: libcrypto++ -Description: General purpose cryptographic shared library -URL: http://www.cryptopp.com -Version: %version -Requires: -Libs: -lcryptopp -Cflags: