From 672e39e668498a293c6cdfcd2213db2753703d19 Mon Sep 17 00:00:00 2001 From: landry Date: Fri, 15 Mar 2013 16:13:53 +0000 Subject: [PATCH] Unbreak after boost update, from Amit Kulkarni (with a REVISION bump added since PLIST was updated.) From http://lists.nongnu.org/archive/html/monotone-devel/2013-03/msg00000.html --- devel/monotone/Makefile | 5 ++- devel/monotone/distinfo | 3 -- devel/monotone/patches/patch-keys_cc | 63 ++++++++++++++++++++++++++++ devel/monotone/pkg/PLIST | 4 +- 4 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 devel/monotone/patches/patch-keys_cc diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 78b2f84c649..ee2b3830e8d 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2013/03/11 10:50:11 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2013/03/15 16:13:53 landry Exp $ COMMENT= distributed version control system VERSION= 0.39 DISTNAME= monotone-${VERSION} CATEGORIES= devel +REVISION = 0 HOMEPAGE= http://monotone.ca/ @@ -17,7 +18,7 @@ WANTLIB += c m stdc++ z MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/ MODULES= devel/gettext -BUILD_DEPENDS= devel/boost +BUILD_DEPENDS= devel/boost>=1.53.0 USE_GMAKE= Yes CONFIGURE_STYLE=gnu diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 2201500b714..2413c3303cd 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,5 +1,2 @@ -MD5 (monotone-0.39.tar.gz) = UiyQyZ4Yo1wx49+l+EmQNA== -RMD160 (monotone-0.39.tar.gz) = 1VnDGOGPgBUToXCTb7VrbhrEEjU= -SHA1 (monotone-0.39.tar.gz) = s0x+JYcd3/HjDRW3M8HzKD7Bbek= SHA256 (monotone-0.39.tar.gz) = d6Po7CmlXHOltgDQlUCCARgAAmVrRqF10jVPdoN0tOw= SIZE (monotone-0.39.tar.gz) = 5332200 diff --git a/devel/monotone/patches/patch-keys_cc b/devel/monotone/patches/patch-keys_cc new file mode 100644 index 00000000000..fbf3aef724e --- /dev/null +++ b/devel/monotone/patches/patch-keys_cc @@ -0,0 +1,63 @@ +$OpenBSD: patch-keys_cc,v 1.1 2013/03/15 16:13:53 landry Exp $ + +patch for boost 1.53.0 from +http://lists.nongnu.org/archive/html/monotone-devel/2013-03/msg00000.html +which further references the actual patch at +http://alt.linux.kiev.ua/ru/srpm/Sisyphus/monotone/patches/0 + +--- keys.cc.orig Thu Mar 14 14:50:41 2013 ++++ keys.cc Thu Mar 14 14:51:53 2013 +@@ -44,7 +44,7 @@ using std::vector; + + using boost::scoped_ptr; + using boost::shared_ptr; +-using boost::shared_dynamic_cast; ++using boost::dynamic_pointer_cast; + + using Botan::byte; + using Botan::get_cipher; +@@ -263,7 +263,7 @@ get_private_key(lua_hooks & lua, + if (pkcs8_key) + { + shared_ptr priv_key; +- priv_key = shared_dynamic_cast(pkcs8_key); ++ priv_key = dynamic_pointer_cast(pkcs8_key); + if (!priv_key) + throw informative_failure("Failed to get RSA signing key"); + +@@ -318,7 +318,7 @@ migrate_private_key(app_state & app, + continue; + } + +- priv_key = shared_dynamic_cast(pkcs8_key); ++ priv_key = dynamic_pointer_cast(pkcs8_key); + if (!priv_key) + throw informative_failure("Failed to get old RSA key"); + } +@@ -404,7 +404,7 @@ make_signature(app_state & app, // to hook f + L(FL("make_signature: building %d-byte pub key") % pub_block.size()); + shared_ptr x509_key = + shared_ptr(Botan::X509::load_key(pub_block)); +- shared_ptr pub_key = shared_dynamic_cast(x509_key); ++ shared_ptr pub_key = dynamic_pointer_cast(x509_key); + + if (!pub_key) + throw informative_failure("Failed to get monotone RSA public key"); +@@ -524,7 +524,7 @@ check_signature(app_state &app, + L(FL("building verifier for %d-byte pub key") % pub_block.size()); + shared_ptr x509_key = + shared_ptr(Botan::X509::load_key(pub_block)); +- pub_key = shared_dynamic_cast(x509_key); ++ pub_key = dynamic_pointer_cast(x509_key); + if (!pub_key) + throw informative_failure("Failed to get RSA verifying key"); + +@@ -565,7 +565,7 @@ void encrypt_rsa(lua_hooks & lua, + pub_block.set(reinterpret_cast(pub().data()), pub().size()); + + shared_ptr x509_key = shared_ptr(Botan::X509::load_key(pub_block)); +- shared_ptr pub_key = shared_dynamic_cast(x509_key); ++ shared_ptr pub_key = dynamic_pointer_cast(x509_key); + if (!pub_key) + throw informative_failure("Failed to get RSA encrypting key"); + diff --git a/devel/monotone/pkg/PLIST b/devel/monotone/pkg/PLIST index 66c5c13bf45..ec8eabe3fa8 100644 --- a/devel/monotone/pkg/PLIST +++ b/devel/monotone/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2007/05/27 10:43:48 alek Exp $ -bin/mtn +@comment $OpenBSD: PLIST,v 1.3 2013/03/15 16:13:53 landry Exp $ +@bin bin/mtn @info info/monotone.info share/doc/monotone/ share/doc/monotone/monotone.html