1 |
commit: 756f4a7c8eaf896507c32131037492bd1e26e2e5 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 30 05:25:56 2019 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 30 05:25:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756f4a7c |
7 |
|
8 |
dev-libs/crypto++: cleanup old |
9 |
|
10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
dev-libs/crypto++/Manifest | 1 - |
14 |
dev-libs/crypto++/crypto++-5.6.5-r1.ebuild | 60 ---------------------- |
15 |
.../crypto++/files/crypto++-5.6.4-nonative.patch | 28 ---------- |
16 |
.../files/crypto++-5.6.5-CVE-2017-9434.patch | 45 ---------------- |
17 |
4 files changed, 134 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest |
20 |
index ddba9587a28..afb0e40685e 100644 |
21 |
--- a/dev-libs/crypto++/Manifest |
22 |
+++ b/dev-libs/crypto++/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7 |
25 |
DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec |
26 |
|
27 |
diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 03281fc6285..00000000000 |
30 |
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,60 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit flag-o-matic toolchain-funcs |
39 |
- |
40 |
-DESCRIPTION="C++ class library of cryptographic schemes" |
41 |
-HOMEPAGE="https://cryptopp.com" |
42 |
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip" |
43 |
- |
44 |
-LICENSE="Boost-1.0" |
45 |
-SLOT="0/5.6" # subslot is so version |
46 |
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" |
47 |
-IUSE="static-libs" |
48 |
- |
49 |
-BDEPEND="app-arch/unzip" |
50 |
- |
51 |
-S="${WORKDIR}" |
52 |
- |
53 |
-PATCHES=( |
54 |
- "${FILESDIR}/${PN}-5.6.4-nonative.patch" |
55 |
- "${FILESDIR}/${P}-CVE-2017-9434.patch" |
56 |
-) |
57 |
- |
58 |
-pkg_setup() { |
59 |
- export CXX="$(tc-getCXX)" |
60 |
- export LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
61 |
- export PREFIX="${EPREFIX}/usr" |
62 |
-} |
63 |
- |
64 |
-src_compile() { |
65 |
- # higher optimizations cause problems |
66 |
- replace-flags -O3 -O2 |
67 |
- # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS |
68 |
- [[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM |
69 |
- |
70 |
- emake -f GNUmakefile all shared |
71 |
-} |
72 |
- |
73 |
-src_install() { |
74 |
- default |
75 |
- |
76 |
- # remove leftovers as build system sucks |
77 |
- rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp |
78 |
- use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a |
79 |
- |
80 |
- # compatibility |
81 |
- dosym cryptopp "${EPREFIX}"/usr/include/crypto++ |
82 |
- for f in "${ED}${EPREFIX}"/usr/$(get_libdir)/*; do |
83 |
- ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die |
84 |
- done |
85 |
-} |
86 |
- |
87 |
-pkg_preinst() { |
88 |
- # we switched directory to symlink |
89 |
- # make sure portage digests that |
90 |
- rm -fr "${EROOT}/usr/include/crypto++" |
91 |
- rm -fr "${EROOT}/usr/include/cryptopp" |
92 |
-} |
93 |
|
94 |
diff --git a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch |
95 |
deleted file mode 100644 |
96 |
index 77d74ee729e..00000000000 |
97 |
--- a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch |
98 |
+++ /dev/null |
99 |
@@ -1,28 +0,0 @@ |
100 |
-Index: work/GNUmakefile |
101 |
-=================================================================== |
102 |
---- work.orig/GNUmakefile |
103 |
-+++ work/GNUmakefile |
104 |
-@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS |
105 |
- endif |
106 |
- endif |
107 |
- |
108 |
--# Guard use of -march=native |
109 |
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) |
110 |
-- CXXFLAGS += -march=native |
111 |
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) |
112 |
-- CXXFLAGS += -march=native |
113 |
--else |
114 |
-- # GCC 3.3 and "unknown option -march=" |
115 |
-- # Ubuntu GCC 4.1 compiler crash with -march=native |
116 |
-- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" |
117 |
-- # Sun compiler is handled below |
118 |
-- ifeq ($(SUN_COMPILER)$(IS_X64),01) |
119 |
-- CXXFLAGS += -m64 |
120 |
-- else ifeq ($(SUN_COMPILER)$(IS_X86),01) |
121 |
-- CXXFLAGS += -m32 |
122 |
-- endif # X86/X32/X64 |
123 |
--endif |
124 |
-- |
125 |
- # Aligned access required for -O3 and above due to vectorization |
126 |
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) |
127 |
- ifneq ($(UNALIGNED_ACCESS),0) |
128 |
|
129 |
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 |
130 |
deleted file mode 100644 |
131 |
index 428f48901a3..00000000000 |
132 |
--- a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch |
133 |
+++ /dev/null |
134 |
@@ -1,45 +0,0 @@ |
135 |
-From 07dbcc3d9644b18e05c1776db2a57fe04d780965 Mon Sep 17 00:00:00 2001 |
136 |
-From: Jeffrey Walton <noloader@×××××.com> |
137 |
-Date: Wed, 10 May 2017 18:17:12 -0400 |
138 |
-Subject: [PATCH] Add Inflator::BadDistanceErr exception (Issue 414) The |
139 |
- improved validation and excpetion clears the Address Sanitizer and Undefined |
140 |
- Behavior Sanitizer findings |
141 |
- |
142 |
---- |
143 |
- zinflate.cpp | 8 +++++++- |
144 |
- zinflate.h | 4 ++++ |
145 |
- 3 files changed, 14 insertions(+), 4 deletions(-) |
146 |
- |
147 |
-diff --git a/zinflate.cpp b/zinflate.cpp |
148 |
-index 664efe6..fbd7505 100644 |
149 |
---- a/zinflate.cpp |
150 |
-+++ b/zinflate.cpp |
151 |
-@@ -550,12 +550,16 @@ bool Inflator::DecodeBody() |
152 |
- break; |
153 |
- } |
154 |
- case DISTANCE_BITS: |
155 |
-+ if (m_distance >= COUNTOF(distanceExtraBits)) |
156 |
-+ throw BadDistanceErr(); |
157 |
- bits = distanceExtraBits[m_distance]; |
158 |
- if (!m_reader.FillBuffer(bits)) |
159 |
- { |
160 |
- m_nextDecode = DISTANCE_BITS; |
161 |
- break; |
162 |
- } |
163 |
-+ if (m_distance >= COUNTOF(distanceStarts)) |
164 |
-+ throw BadDistanceErr(); |
165 |
- m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance]; |
166 |
- OutputPast(m_literal, m_distance); |
167 |
- } |
168 |
-diff --git a/zinflate.h b/zinflate.h |
169 |
-index e2fd237..c47d2f6 100644 |
170 |
---- a/zinflate.h |
171 |
-+++ b/zinflate.h |
172 |
-@@ -96,6 +96,7 @@ public: |
173 |
- }; |
174 |
- class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}}; |
175 |
- class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}}; |
176 |
-+ class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}}; |
177 |
- |
178 |
- //! \brief RFC 1951 Decompressor |
179 |
- //! \param attachment the filter's attached transformation |