cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak after boost update, from Amit Kulkarni (with a REVISION bump added

Browse Source 
since PLIST was updated.)

From http://lists.nongnu.org/archive/html/monotone-devel/2013-03/msg00000.html
This commit is contained in:
landry 2013-03-15 16:13:53 +00:00
parent 04ed343abb
commit 672e39e668
4 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/monotone/Makefile
View File

@ -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

3
devel/monotone/distinfo
View File

@ -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

63
devel/monotone/patches/patch-keys_cc Normal file
View File

@ -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<RSA_PrivateKey> priv_key;
- priv_key = shared_dynamic_cast<RSA_PrivateKey>(pkcs8_key);
+ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(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<RSA_PrivateKey>(pkcs8_key);
+ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(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_PublicKey> x509_key =
shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block));
- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key);
+ shared_ptr<RSA_PublicKey> pub_key = dynamic_pointer_cast<RSA_PublicKey>(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_PublicKey> x509_key =
shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block));
- pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key);
+ pub_key = dynamic_pointer_cast<RSA_PublicKey>(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<Botan::byte const *>(pub().data()), pub().size());
shared_ptr<X509_PublicKey> x509_key = shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block));
- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key);
+ shared_ptr<RSA_PublicKey> pub_key = dynamic_pointer_cast<RSA_PublicKey>(x509_key);
if (!pub_key)
throw informative_failure("Failed to get RSA encrypting key");

4
devel/monotone/pkg/PLIST
View File

@ -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