summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2011-12-28 07:02:03 +0000
committerPatrick Lauer <patrick@gentoo.org>2011-12-28 07:02:03 +0000
commitfd529f1671876f73884eacdd250b7ee9962c416b (patch)
tree98cba0ef7e1e32e7b9ca7c35e13eba163f0cb7ff /dev-libs
parentAdd blocker against mit-krb5-appl - bug #396245 (diff)
downloadhistorical-fd529f1671876f73884eacdd250b7ee9962c416b.tar.gz
historical-fd529f1671876f73884eacdd250b7ee9962c416b.tar.bz2
historical-fd529f1671876f73884eacdd250b7ee9962c416b.zip
Fixing #322713 again, this time with upstream patch
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/crypto++/ChangeLog8
-rw-r--r--dev-libs/crypto++/Manifest4
-rw-r--r--dev-libs/crypto++/crypto++-5.6.1-r2.ebuild55
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch14
4 files changed, 79 insertions, 2 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index f3f041b39fbb..cf7ee454266a 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.72 2011/02/27 13:56:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.73 2011/12/28 07:02:03 patrick Exp $
+
+*crypto++-5.6.1-r2 (28 Dec 2011)
+
+ 28 Dec 2011; Patrick Lauer <patrick@gentoo.org> +crypto++-5.6.1-r2.ebuild,
+ +files/crypto++-5.6.1-rijndael.patch:
+ Fixing #322713 again, this time with upstream patch
27 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-crypto++-5.5.2-r1.ebuild, -crypto++-5.6.0.ebuild, -crypto++-5.6.0-r1.ebuild,
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 6e07976ad270..44cfa1052a6b 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,6 +1,8 @@
AUX crypto++-5.6.1-fix_build_system.patch 5008 RMD160 df6813be73acddba7aac0e70abd2c9ff75c5a4de SHA1 c514f778c97cb739f9e3a02f2c44ef86dcafa992 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480
+AUX crypto++-5.6.1-rijndael.patch 578 RMD160 3d90b5e917be68ce44180377b8965708cfdb9d9c SHA1 76357ba0afd2c5688d0b23b4924c039a5601c732 SHA256 8d5c406987a1a98c3e2aa5c1046d86bc3ff2c7af6c487b70b8b0fa9cb938ca0c
AUX crypto++-5.6.1-sunos.patch 546 RMD160 69e22a1db8f5fefae1660cf1adbb2cca6600b2d9 SHA1 c21120d904eab8ec3531ebbab68a9663355ac098 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c
DIST cryptopp561.zip 1069703 RMD160 a8a5b80c995c5d4ddafba228caf8866425212fbf SHA1 31dbb456c21f50865218c57b7eaf4c955a222ba1 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
EBUILD crypto++-5.6.1-r1.ebuild 1380 RMD160 611f381055e27cbbdb9a4593cd50b4118cb25f90 SHA1 fbbc76fcf90df6855b0b1ff2b0dcc3fa5ff56969 SHA256 613af20fe8e05295e207688948f16451f72e26250cb6474257610dfab269995c
-MISC ChangeLog 10536 RMD160 68a30b5eaad5653e20958c48e24df19a360b1d29 SHA1 b1165b98cb9ef97925291a5bc812f7efe1f85b24 SHA256 b0799ac6498674d1a680980e9377ce0b2ba31f4da2149efcb97a2c1df36dff08
+EBUILD crypto++-5.6.1-r2.ebuild 1424 RMD160 44859a29f011a0cbd12c85a3c2b922249229e6de SHA1 f18fe9fb76b00b52756fee98eaf3a24abf41da0f SHA256 d99596a7198f7b77dbed83fd9d33a4f7e2e81f6fa77a9aae3335f8adf9139e59
+MISC ChangeLog 10741 RMD160 0308f7d5b5bea8d5e6255d2ee55b0e79665e94a1 SHA1 1fbc430988c7017ae02505d39b3e94e90e3ab76b SHA256 8d160356d892b07c71b0cf09a60e729957db687efb437aa83e6f75e38d6c821a
MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild b/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
new file mode 100644
index 000000000000..2891f858eb5d
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild,v 1.1 2011/12/28 07:02:02 patrick Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="cryptopp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_build_system.patch" \
+ "${FILESDIR}/${P}-sunos.patch" \
+ "${FILESDIR}/${P}-rijndael.patch"
+}
+
+src_compile() {
+ # Higher optimizations cause problems.
+ replace-flags -O? -O1
+ filter-flags -fomit-frame-pointer
+
+ emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+ LIBDIR="$(get_libdir)" || die "emake failed"
+}
+
+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)" install \
+ || die "emake install failed"
+}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch b/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
new file mode 100644
index 000000000000..153fa44b913f
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
@@ -0,0 +1,14 @@
+--- rijndael.cpp 2010-08-06 18:46:22.000000000 +0200
++++ rijndael.cpp2 2011-12-27 16:10:52.606933355 +0100
+@@ -349,7 +349,11 @@
+ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
+ {
+ #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+ if (HasSSE2())
++#else
++ if (HasAESNI())
++#endif
+ {
+ Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
+ return;