| 1 |
chithanh 13/06/30 00:18:23 |
| 2 |
|
| 3 |
Added: monotone-1.0-boost-1.53.patch |
| 4 |
Log: |
| 5 |
Fix building against boost-1.53, bug #454160. |
| 6 |
|
| 7 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: monotone-1.0-boost-1.53.patch |
| 16 |
=================================================================== |
| 17 |
============================================================ |
| 18 |
--- src/database.cc 87efeeff2d3263ba98af684a4022f1897434ed2d |
| 19 |
+++ src/database.cc 39ab2644b936e09a536b99ebd28b93f6e0d7c162 |
| 20 |
@@ -92,7 +92,7 @@ using boost::shared_ptr; |
| 21 |
using std::accumulate; |
| 22 |
|
| 23 |
using boost::shared_ptr; |
| 24 |
-using boost::shared_dynamic_cast; |
| 25 |
+using boost::dynamic_pointer_cast; |
| 26 |
using boost::lexical_cast; |
| 27 |
using boost::get; |
| 28 |
using boost::tuple; |
| 29 |
@@ -3430,7 +3430,7 @@ database::encrypt_rsa(key_id const & pub |
| 30 |
|
| 31 |
shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); |
| 32 |
shared_ptr<RSA_PublicKey> pub_key |
| 33 |
- = shared_dynamic_cast<RSA_PublicKey>(x509_key); |
| 34 |
+ = dynamic_pointer_cast<RSA_PublicKey>(x509_key); |
| 35 |
if (!pub_key) |
| 36 |
throw recoverable_failure(origin::system, |
| 37 |
"Failed to get RSA encrypting key"); |
| 38 |
@@ -3481,7 +3481,7 @@ database::check_signature(key_id const & |
| 39 |
L(FL("building verifier for %d-byte pub key") % pub_block.size()); |
| 40 |
shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); |
| 41 |
shared_ptr<RSA_PublicKey> pub_key |
| 42 |
- = boost::shared_dynamic_cast<RSA_PublicKey>(x509_key); |
| 43 |
+ = boost::dynamic_pointer_cast<RSA_PublicKey>(x509_key); |
| 44 |
|
| 45 |
E(pub_key, id.inner().made_from, |
| 46 |
F("failed to get RSA verifying key for %s") % id); |
| 47 |
============================================================ |
| 48 |
--- src/key_store.cc b7859345f7c665914d16357409bdff24a48b7996 |
| 49 |
+++ src/key_store.cc 1ca13b7ee527bc2872d9fc325cf5ef327ca053c2 |
| 50 |
@@ -43,7 +43,7 @@ using boost::shared_ptr; |
| 51 |
|
| 52 |
using boost::scoped_ptr; |
| 53 |
using boost::shared_ptr; |
| 54 |
-using boost::shared_dynamic_cast; |
| 55 |
+using boost::dynamic_pointer_cast; |
| 56 |
|
| 57 |
using Botan::RSA_PrivateKey; |
| 58 |
using Botan::RSA_PublicKey; |
| 59 |
@@ -641,7 +641,7 @@ key_store_state::decrypt_private_key(key |
| 60 |
I(pkcs8_key); |
| 61 |
|
| 62 |
shared_ptr<RSA_PrivateKey> priv_key; |
| 63 |
- priv_key = shared_dynamic_cast<RSA_PrivateKey>(pkcs8_key); |
| 64 |
+ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(pkcs8_key); |
| 65 |
E(priv_key, origin::no_fault, |
| 66 |
F("failed to extract RSA private key from PKCS#8 keypair")); |
| 67 |
|
| 68 |
@@ -879,7 +879,8 @@ key_store::make_signature(database & db, |
| 69 |
L(FL("make_signature: building %d-byte pub key") % pub_block.size()); |
| 70 |
shared_ptr<X509_PublicKey> x509_key = |
| 71 |
shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); |
| 72 |
- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key); |
| 73 |
+ shared_ptr<RSA_PublicKey> pub_key = |
| 74 |
+ dynamic_pointer_cast<RSA_PublicKey>(x509_key); |
| 75 |
|
| 76 |
if (!pub_key) |
| 77 |
throw recoverable_failure(origin::system, |
| 78 |
@@ -1092,7 +1093,7 @@ key_store_state::migrate_old_key_pair |
| 79 |
continue; |
| 80 |
} |
| 81 |
|
| 82 |
- priv_key = shared_dynamic_cast<RSA_PrivateKey>(pkcs8_key); |
| 83 |
+ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(pkcs8_key); |
| 84 |
I(priv_key); |
| 85 |
|
| 86 |
// now we can write out the new key |
| 87 |
============================================================ |
| 88 |
--- src/ssh_agent.cc 4a0dcab873559e934e41c5f220b5434d35600d9b |
| 89 |
+++ src/ssh_agent.cc 6313ee3cdfca4112ba3957dc4a5f318472289dfa |
| 90 |
@@ -32,7 +32,7 @@ using boost::shared_ptr; |
| 91 |
using std::vector; |
| 92 |
|
| 93 |
using boost::shared_ptr; |
| 94 |
-using boost::shared_dynamic_cast; |
| 95 |
+using boost::dynamic_pointer_cast; |
| 96 |
|
| 97 |
using Botan::RSA_PublicKey; |
| 98 |
using Botan::RSA_PrivateKey; |
| 99 |
@@ -391,7 +391,8 @@ ssh_agent::has_key(const keypair & key) |
| 100 |
L(FL("has_key: building %d-byte pub key") % pub_block.size()); |
| 101 |
shared_ptr<X509_PublicKey> x509_key = |
| 102 |
shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); |
| 103 |
- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key); |
| 104 |
+ shared_ptr<RSA_PublicKey> pub_key = |
| 105 |
+ dynamic_pointer_cast<RSA_PublicKey>(x509_key); |
| 106 |
|
| 107 |
if (!pub_key) |
| 108 |
throw recoverable_failure(origin::system, |
Archives