- update to monotone-1.1
based on a diff from Richard Hopkins
This commit is contained in:
jasper
parent
d7d7261c8d
commit
4430517f24
@ -1,24 +1,28 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2013/03/15 16:13:53 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2015/06/10 13:26:43 jasper Exp $
|
||||
|
||||
COMMENT= distributed version control system
|
||||
|
||||
VERSION= 0.39
|
||||
VERSION= 1.1
|
||||
DISTNAME= monotone-${VERSION}
|
||||
CATEGORIES= devel
|
||||
REVISION = 0
|
||||
|
||||
HOMEPAGE= http://monotone.ca/
|
||||
|
||||
MAINTAINER= Aleksander Piotrowski <alek@openbsd.org>
|
||||
|
||||
# GPL
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
WANTLIB += c m stdc++ z
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
|
||||
WANTLIB += botan-1.10 c idn m pcre pthread sqlite3 stdc++ z
|
||||
WANTLIB += ${MODLUA_WANTLIB}
|
||||
|
||||
MODULES= devel/gettext
|
||||
BUILD_DEPENDS= devel/boost>=1.53.0
|
||||
MASTER_SITES= ${HOMEPAGE}/downloads/${VERSION}/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= devel/gettext \
|
||||
lang/lua
|
||||
BUILD_DEPENDS= devel/boost
|
||||
LIB_DEPENDS= devel/libidn \
|
||||
devel/pcre \
|
||||
security/botan
|
||||
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE=gnu
|
||||
@ -26,5 +30,6 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
|
||||
CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
|
||||
TEST_FLAGS= HOME=${WRKSRC}
|
||||
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/monotone/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (monotone-0.39.tar.gz) = d6Po7CmlXHOltgDQlUCCARgAAmVrRqF10jVPdoN0tOw=
|
||||
SIZE (monotone-0.39.tar.gz) = 5332200
|
||||
SHA256 (monotone-1.1.tar.bz2) = +Vz2CiLU5GG+ydDnL102CcmkV2+xzEX1U9AgLOLjjIg=
|
||||
SIZE (monotone-1.1.tar.bz2) = 3428699
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2008/04/03 07:47:45 bernd Exp $
|
||||
--- configure.orig Mon Feb 25 17:02:45 2008
|
||||
+++ configure Thu Mar 27 17:07:35 2008
|
||||
@@ -14577,10 +14577,10 @@ host_cpu!$host_cpu$ac_delim
|
||||
host_vendor!$host_vendor$ac_delim
|
||||
host_os!$host_os$ac_delim
|
||||
USE_NLS!$USE_NLS$ac_delim
|
||||
-LIBICONV!$LIBICONV$ac_delim
|
||||
+LIBICONV!$LTLIBICONV$ac_delim
|
||||
LTLIBICONV!$LTLIBICONV$ac_delim
|
||||
INTLLIBS!$INTLLIBS$ac_delim
|
||||
-LIBINTL!$LIBINTL$ac_delim
|
||||
+LIBINTL!$LTLIBINTL$ac_delim
|
||||
LTLIBINTL!$LTLIBINTL$ac_delim
|
||||
POSUB!$POSUB$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
@ -1,63 +0,0 @@
|
||||
$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");
|
||||
|
||||
@ -1,12 +1,88 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2013/03/15 16:13:53 landry Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2015/06/10 13:26:43 jasper Exp $
|
||||
@bin bin/mtn
|
||||
bin/mtn-cleanup
|
||||
bin/mtnopt
|
||||
@info info/monotone.info
|
||||
@man man/man1/mtn-cleanup.1
|
||||
@man man/man1/mtn.1
|
||||
@man man/man1/mtnopt.1
|
||||
share/doc/monotone/
|
||||
share/doc/monotone/monotone.html
|
||||
share/doc/monotone/contrib/
|
||||
share/doc/monotone/contrib/Attic/
|
||||
share/doc/monotone/contrib/Attic/monotone-nav.el
|
||||
share/doc/monotone/contrib/Attic/recreate-manifest-tables.sh
|
||||
share/doc/monotone/contrib/ChangeLog.sh
|
||||
share/doc/monotone/contrib/Monotone.pm
|
||||
share/doc/monotone/contrib/README
|
||||
share/doc/monotone/contrib/README.missing
|
||||
share/doc/monotone/contrib/basicio.vim
|
||||
share/doc/monotone/contrib/bisect.sh
|
||||
share/doc/monotone/contrib/ciabot_monotone.py
|
||||
share/doc/monotone/contrib/color-logs.conf
|
||||
share/doc/monotone/contrib/color-logs.sh
|
||||
share/doc/monotone/contrib/colorize
|
||||
share/doc/monotone/contrib/colortone.pl
|
||||
share/doc/monotone/contrib/command/
|
||||
share/doc/monotone/contrib/command/README
|
||||
share/doc/monotone/contrib/command/base.lua
|
||||
share/doc/monotone/contrib/command/conflicts.lua
|
||||
share/doc/monotone/contrib/command/fuse.lua
|
||||
share/doc/monotone/contrib/command/init.lua
|
||||
share/doc/monotone/contrib/command/remote_export.lua
|
||||
share/doc/monotone/contrib/command/revision.lua
|
||||
share/doc/monotone/contrib/dtrace2calltree.py
|
||||
share/doc/monotone/contrib/edit_comment_from_changelog.lua
|
||||
share/doc/monotone/contrib/extra-commands.lua
|
||||
share/doc/monotone/contrib/get_stdio.pl
|
||||
share/doc/monotone/contrib/monoprof.sh
|
||||
share/doc/monotone/contrib/monotone-inotify.lua
|
||||
share/doc/monotone/contrib/monotone-log-of-pulled-revs-hook.lua
|
||||
share/doc/monotone/contrib/monotone-mirror-postaction-push.sh
|
||||
share/doc/monotone/contrib/monotone-mirror-postaction-update.sh
|
||||
share/doc/monotone/contrib/monotone-mirror.lua
|
||||
share/doc/monotone/contrib/monotone-mirror.sh
|
||||
share/doc/monotone/contrib/monotone-run-script-post-netsync.lua
|
||||
share/doc/monotone/contrib/monotone.zsh_completion
|
||||
share/doc/monotone/contrib/mtbrowse.sh
|
||||
share/doc/monotone/contrib/mtn-export-revisions.pl
|
||||
share/doc/monotone/contrib/mtncommit.vim
|
||||
share/doc/monotone/contrib/op2calltree.py
|
||||
share/doc/monotone/contrib/parse-accounting.pl
|
||||
share/doc/monotone/contrib/perf-test.sh
|
||||
share/doc/monotone/examples/
|
||||
share/doc/monotone/examples/000README.txt
|
||||
share/doc/monotone/examples/mirror.rc
|
||||
share/doc/monotone/examples/push.rc
|
||||
share/doc/monotone/examples/read-permissions
|
||||
share/doc/monotone/examples/server-setup/
|
||||
share/doc/monotone/examples/server-setup/README
|
||||
share/doc/monotone/examples/server-setup/monotone.init
|
||||
share/doc/monotone/examples/server-setup/monotone.run
|
||||
share/doc/monotone/examples/server-setup/serverrc
|
||||
share/doc/monotone/examples/user-setup/
|
||||
share/doc/monotone/examples/user-setup/README
|
||||
share/doc/monotone/examples/user-setup/monotonerc
|
||||
share/doc/monotone/examples/write-permissions
|
||||
share/examples/monotone/
|
||||
share/examples/monotone/bash_completion.d/
|
||||
@sample ${SYSCONFDIR}/bash_completion.d/
|
||||
share/examples/monotone/bash_completion.d/monotone.bash_completion
|
||||
@sample ${SYSCONFDIR}/bash_completion.d/monotone
|
||||
share/locale/de/LC_MESSAGES/monotone.mo
|
||||
share/locale/es/LC_MESSAGES/monotone.mo
|
||||
share/locale/fr/LC_MESSAGES/monotone.mo
|
||||
share/locale/it/LC_MESSAGES/monotone.mo
|
||||
share/locale/ja/LC_MESSAGES/monotone.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/monotone.mo
|
||||
share/locale/pt/LC_MESSAGES/monotone.mo
|
||||
share/locale/sv/LC_MESSAGES/monotone.mo
|
||||
share/monotone/
|
||||
share/monotone/hooks/
|
||||
share/monotone/hooks/authorize_remote_automate.lua
|
||||
share/monotone/hooks/get_passphrase_from_file.lua
|
||||
share/monotone/hooks/monotone-buildbot.lua
|
||||
share/monotone/hooks/monotone-ciabot.lua
|
||||
share/monotone/hooks/monotone-cluster-push.lua
|
||||
share/monotone/hooks/monotone-cvs-ignore.lua
|
||||
share/monotone/hooks/monotone-mail-notify.lua
|
||||
share/monotone/scripts/
|
||||
share/monotone/scripts/monotone-ciabot.py
|
||||
share/monotone/scripts/monotone-mail-notify
|
||||
@unexec rm -f ${SYSCONFDIR}/bash_completion.d/monotone
|
||||
|
||||
Loading…
Reference in New Issue
Block a user