update botan2 to 2.10.0
Disable upstream pledge for now as it is broken.
This commit is contained in:
parent
3d68d906f2
commit
cfab020cc6
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2019/01/16 12:53:23 bluhm Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2019/07/04 18:16:52 bluhm Exp $
|
||||
|
||||
COMMENT = crypto and TLS for C++11
|
||||
|
||||
VERSION = 2.9.0
|
||||
VERSION = 2.10.0
|
||||
DISTNAME = Botan-${VERSION}
|
||||
PKGNAME = botan2-${VERSION}
|
||||
|
||||
SHARED_LIBS = botan-2 9.0
|
||||
SHARED_LIBS = botan-2 10.0
|
||||
|
||||
CATEGORIES = security
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
SHA256 (Botan-2.9.0.tgz) = MFVkNSM03WOuY9sDkHfZauUt+lejJIhxCBcZtqny0Rk=
|
||||
SHA256 (Botan-2.9.0.tgz.asc) = 3rNT0/l78SYxShLJ7i0jv975dRS0yF6AbeEBtuyo1Ks=
|
||||
SIZE (Botan-2.9.0.tgz) = 7216373
|
||||
SIZE (Botan-2.9.0.tgz.asc) = 488
|
||||
SHA256 (Botan-2.10.0.tgz) = iEgZl1eMJ5JHJP6nZhDUPZ9ZyZ7f5WHUGAO7yYhxrTE=
|
||||
SHA256 (Botan-2.10.0.tgz.asc) = Qtc+N2kc+uhO4WPmUDcB4ra5z6yIbVG6J5ijZhxsLUg=
|
||||
SIZE (Botan-2.10.0.tgz) = 7240021
|
||||
SIZE (Botan-2.10.0.tgz.asc) = 488
|
||||
|
16
security/botan2/patches/patch-src_cli_sandbox_cpp
Normal file
16
security/botan2/patches/patch-src_cli_sandbox_cpp
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_cli_sandbox_cpp,v 1.1 2019/07/04 18:16:52 bluhm Exp $
|
||||
|
||||
Index: src/cli/sandbox.cpp
|
||||
--- src/cli/sandbox.cpp.orig
|
||||
+++ src/cli/sandbox.cpp
|
||||
@@ -29,8 +29,8 @@ Sandbox::Sandbox()
|
||||
bool Sandbox::init()
|
||||
{
|
||||
#if defined(BOTAN_TARGET_OS_HAS_PLEDGE)
|
||||
- const static char *opts = "stdio rpath inet error";
|
||||
- return (::pledge(opts, nullptr) == 0);
|
||||
+ // Cannot use pledge(2) as Botan library calls mlock(2) and munlock(2).
|
||||
+ return true;
|
||||
#elif defined(BOTAN_TARGET_OS_HAS_CAP_ENTER)
|
||||
return (::cap_enter() == 0);
|
||||
#else
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-src_tests_main_cpp,v 1.6 2019/01/16 12:53:23 bluhm Exp $
|
||||
$OpenBSD: patch-src_tests_main_cpp,v 1.7 2019/07/04 18:16:52 bluhm Exp $
|
||||
|
||||
Index: src/tests/main.cpp
|
||||
--- src/tests/main.cpp.orig
|
||||
+++ src/tests/main.cpp
|
||||
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
|
||||
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
|
||||
const Botan_Tests::Test_Options opts(
|
||||
parser.get_arg_list("suites"),
|
||||
parser.get_arg_list("skip-tests"),
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.12 2019/01/16 12:53:23 bluhm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.13 2019/07/04 18:16:52 bluhm Exp $
|
||||
@bin bin/botan
|
||||
@bin bin/botan-test
|
||||
include/botan-2/
|
||||
@ -1951,5 +1951,6 @@ share/doc/botan-2/manual/tss.rst
|
||||
share/doc/botan-2/manual/versions.rst
|
||||
share/doc/botan-2/manual/x509.rst
|
||||
share/doc/botan-2/news.txt
|
||||
share/doc/botan-2/oids.txt
|
||||
share/doc/botan-2/pgpkey.txt
|
||||
share/doc/botan-2/reading_list.txt
|
||||
|
Loading…
Reference in New Issue
Block a user