From d296726e12f7c82e62c2427eaf605d58c5dddb44 Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Wed, 1 Dec 2010 14:31:50 -0500 Subject: New patch. Compiles as expected. Restored keywords. --- dev-libs/botan/ChangeLog | 4 + dev-libs/botan/Manifest | 3 +- dev-libs/botan/botan-1.9.11.ebuild | 3 +- .../botan/files/botan-1.9.11-openssl_compile.patch | 116 +++++++++++++++++++++ 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 dev-libs/botan/files/botan-1.9.11-openssl_compile.patch (limited to 'dev-libs') diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog index 3aeef22..212f3dc 100644 --- a/dev-libs/botan/ChangeLog +++ b/dev-libs/botan/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Dec 2010; Dane Smith botan-1.9.11.ebuild, + +files/botan-1.9.11-openssl_compile.patch: + New patch fixes compile bug. + *botan-1.9.11 (01 Dec 2010) 01 Dec 2010; Dane Smith +botan-1.9.11.ebuild, diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index d5e0c26..451e5e2 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,6 +1,7 @@ +AUX botan-1.9.11-openssl_compile.patch 4603 RMD160 172a7a01bc3c8259c8ab6dfb3fbfda36d0eeb66a SHA1 be20ee2fc589fd1beacfbe5cc891266e8e272ad6 SHA256 7008c173e49072544f604a51cdd2045e7c0476c92192e5284cd96ff925740ade AUX botan-1.9.11-python_wrapper_fixes.patch 3186 RMD160 3be956306ed8460be3342f329acadc15a8d2aacc SHA1 4792a22b07a73351fe7441b64062d377ba4710c3 SHA256 5dfa21e23bbf235e837df187c422af0d5be09472898b78aa8689fd2820609d59 DIST Botan-1.9.10.tbz 2977027 RMD160 b50f499cf3771582aa92333a73b8423f5e5a73f0 SHA1 600ea40b1ff563e806e7d85369870c0e04b2ae61 SHA256 a54cb37d171808e727be2835d09a924feb49d68e982f1ed95c95e8393d1f2a07 DIST Botan-1.9.11.tbz 2968277 RMD160 2f6da620c4ed37de11ac5d3f27b290b2d113da16 SHA1 f74da0e5421e14bb6d878a0a30b342062d5dfdd5 SHA256 483f4e63d9ff69d4fa4854066543b9487a8e6ff976a14931a132571525a424c9 EBUILD botan-1.9.10.ebuild 2585 RMD160 bbb2baa4ebc4baa8542b9d4ddd1074c31e50ebbc SHA1 eedfa841305320a2423edc7ca40df91a986bfdc3 SHA256 e93bca4f0701ead75b69dc3c8b18772b00962221e6ad579e9d1e28c81979852a -EBUILD botan-1.9.11.ebuild 2617 RMD160 8c01c20e7c19c0dfc76f8a852df4b6ae4f414560 SHA1 09393dbd7aababa4176b70978d23f00ff4d87e2a SHA256 6bdda82a0c8a7445a387c635c06ad1d6d5307e0fb7e6d6dd00939b47036dad90 +EBUILD botan-1.9.11.ebuild 2706 RMD160 80964240e01d70eafbedd1972fd8cc92698f35ec SHA1 e3e52c8e2be5c4524632048708762b2f79940f04 SHA256 356e19e478c924d0c6d89b261b9786c08d16b8881926add78e4308fa4c79f6cf MISC ChangeLog 422 RMD160 fd4b5ca717c29e99d3c61fe903a08f82433abe91 SHA1 9678cdcac4fe0ce5f7bb9602d06070021e54a916 SHA256 6d7e110f8366f7a31e2a4d52a55d3791f5d5d54a0b30dd26ce19f7b9197a9904 diff --git a/dev-libs/botan/botan-1.9.11.ebuild b/dev-libs/botan/botan-1.9.11.ebuild index b9926bf..972bdfc 100644 --- a/dev-libs/botan/botan-1.9.11.ebuild +++ b/dev-libs/botan/botan-1.9.11.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library" HOMEPAGE="http://botan.randombit.net/" SRC_URI="http://botan.randombit.net/files/${MY_P}.tbz" -KEYWORDS="" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc-macos" SLOT="0" LICENSE="BSD" IUSE="altivec bzip2 gmp python sse2 ssse3 ssl threads zlib" @@ -34,6 +34,7 @@ pkg_setup() { src_prepare(){ epatch "${FILESDIR}"/${P}-python_wrapper_fixes.patch + epatch "${FILESDIR}"/${P}-openssl_compile.patch } src_configure() { diff --git a/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch b/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch new file mode 100644 index 0000000..d03c24e --- /dev/null +++ b/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch @@ -0,0 +1,116 @@ +# +# old_revision [52e500a0ac32174fdce00c589290e69186b99bdd] +# +# patch "src/engine/openssl/ossl_arc4.cpp" +# from [4aed07563d8f2b1ada6a76cbe55b4e76e8877403] +# to [d8ca80a67a27f9b2a1bcfb1e1e1efb4122ea28aa] +# +# patch "src/engine/openssl/ossl_bc.cpp" +# from [9efd108ef8aebb28f4c0507bfcd3a08baf813531] +# to [947792c43bcccd42b8667a6d59e5bc477e374d0c] +# +# patch "src/engine/openssl/ossl_md.cpp" +# from [c8fe0b67a8f0797fa8be764e9aeb78d5960d9bd9] +# to [29482b218897968d26787b4f4e517c11f511767d] +# +============================================================ +--- src/engine/openssl/ossl_bc.cpp 9efd108ef8aebb28f4c0507bfcd3a08baf813531 ++++ src/engine/openssl/ossl_bc.cpp 947792c43bcccd42b8667a6d59e5bc477e374d0c +@@ -29,6 +29,8 @@ class EVP_BlockCipher : public BlockCiph + EVP_BlockCipher(const EVP_CIPHER*, const std::string&, + size_t, size_t, size_t); + ++ Key_Length_Specification key_spec() const { return cipher_key_spec; } ++ + ~EVP_BlockCipher(); + private: + void encrypt_n(const byte in[], byte out[], size_t blocks) const; +@@ -36,6 +38,7 @@ class EVP_BlockCipher : public BlockCiph + void key_schedule(const byte[], size_t); + + size_t block_sz; ++ Key_Length_Specification cipher_key_spec; + std::string cipher_name; + mutable EVP_CIPHER_CTX encrypt, decrypt; + }; +@@ -45,8 +48,8 @@ EVP_BlockCipher::EVP_BlockCipher(const E + */ + EVP_BlockCipher::EVP_BlockCipher(const EVP_CIPHER* algo, + const std::string& algo_name) : +- BlockCipher(EVP_CIPHER_key_length(algo)), + block_sz(EVP_CIPHER_block_size(algo)), ++ cipher_key_spec(EVP_CIPHER_key_length(algo)), + cipher_name(algo_name) + { + if(EVP_CIPHER_mode(algo) != EVP_CIPH_ECB_MODE) +@@ -69,8 +72,8 @@ EVP_BlockCipher::EVP_BlockCipher(const E + const std::string& algo_name, + size_t key_min, size_t key_max, + size_t key_mod) : +- BlockCipher(key_min, key_max, key_mod), + block_sz(EVP_CIPHER_block_size(algo)), ++ cipher_key_spec(key_min, key_max, key_mod), + cipher_name(algo_name) + { + if(EVP_CIPHER_mode(algo) != EVP_CIPH_ECB_MODE) +@@ -148,8 +151,10 @@ BlockCipher* EVP_BlockCipher::clone() co + BlockCipher* EVP_BlockCipher::clone() const + { + return new EVP_BlockCipher(EVP_CIPHER_CTX_cipher(&encrypt), +- cipher_name, MINIMUM_KEYLENGTH, +- MAXIMUM_KEYLENGTH, KEYLENGTH_MULTIPLE); ++ cipher_name, ++ cipher_key_spec.minimum_keylength(), ++ cipher_key_spec.maximum_keylength(), ++ cipher_key_spec.keylength_multiple()); + } + + /* +============================================================ +--- src/engine/openssl/ossl_md.cpp c8fe0b67a8f0797fa8be764e9aeb78d5960d9bd9 ++++ src/engine/openssl/ossl_md.cpp 29482b218897968d26787b4f4e517c11f511767d +@@ -22,8 +22,16 @@ class EVP_HashFunction : public HashFunc + std::string name() const { return algo_name; } + HashFunction* clone() const; + +- size_t hash_block_size() const { return block_size; } ++ size_t output_length() const ++ { ++ return EVP_MD_size(EVP_MD_CTX_md(&md)); ++ } + ++ size_t hash_block_size() const ++ { ++ return EVP_MD_block_size(EVP_MD_CTX_md(&md)); ++ } ++ + EVP_HashFunction(const EVP_MD*, const std::string&); + ~EVP_HashFunction(); + private: +@@ -76,8 +84,6 @@ EVP_HashFunction::EVP_HashFunction(const + */ + EVP_HashFunction::EVP_HashFunction(const EVP_MD* algo, + const std::string& name) : +- HashFunction(EVP_MD_size(algo)), +- block_size(EVP_MD_block_size(algo)), + algo_name(name) + { + EVP_MD_CTX_init(&md); +============================================================ +--- src/engine/openssl/ossl_arc4.cpp 4aed07563d8f2b1ada6a76cbe55b4e76e8877403 ++++ src/engine/openssl/ossl_arc4.cpp d8ca80a67a27f9b2a1bcfb1e1e1efb4122ea28aa +@@ -23,7 +23,13 @@ class ARC4_OpenSSL : public StreamCipher + std::string name() const; + StreamCipher* clone() const { return new ARC4_OpenSSL(SKIP); } + +- ARC4_OpenSSL(size_t s = 0) : StreamCipher(1, 32), SKIP(s) { clear(); } ++ Key_Length_Specification key_spec() const ++ { ++ return Key_Length_Specification(1, 32); ++ } ++ ++ ++ ARC4_OpenSSL(size_t s = 0) : SKIP(s) { clear(); } + ~ARC4_OpenSSL() { clear(); } + private: + void cipher(const byte[], byte[], size_t); -- cgit v1.2.3-65-gdbad