diff options
| author | joerg <joerg@pkgsrc.org> | 2017-01-16 01:50:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-01-16 01:50:14 +0000 |
| commit | 115e8d9c74ce01bf39cfcaa29c0bc7a904420a38 (patch) | |
| tree | 785d3d433d5ca051662056c1207377ff5fff06ac /security/botan-devel/patches | |
| parent | 2d02c0d1ed130fab4127ffefaa29e296a0ce2e5e (diff) | |
| download | pkgsrc-115e8d9c74ce01bf39cfcaa29c0bc7a904420a38.tar.gz | |
More fixes for build on SmartOS/Solaris.
Diffstat (limited to 'security/botan-devel/patches')
3 files changed, 29 insertions, 3 deletions
diff --git a/security/botan-devel/patches/patch-src_build-data_os_solaris.txt b/security/botan-devel/patches/patch-src_build-data_os_solaris.txt new file mode 100644 index 00000000000..9caa8ee1d75 --- /dev/null +++ b/security/botan-devel/patches/patch-src_build-data_os_solaris.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-src_build-data_os_solaris.txt,v 1.1 2017/01/16 01:50:14 joerg Exp $ + +--- src/build-data/os/solaris.txt.orig 2017-01-16 01:41:19.253492127 +0000 ++++ src/build-data/os/solaris.txt +@@ -3,6 +3,10 @@ os_type unix + install_cmd_data '/usr/ucb/install -m 644' + install_cmd_exec '/usr/ucb/install -m 755' + ++soname_pattern_base "libbotan-{version_major}.{version_minor}.so" ++soname_pattern_abi "libbotan-{version_major}.{version_minor}.so.{abi_rev}" ++soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}" ++ + <target_features> + posix_mlock + gettimeofday diff --git a/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt b/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt new file mode 100644 index 00000000000..e6add5f50cd --- /dev/null +++ b/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt @@ -0,0 +1,10 @@ +$NetBSD: patch-src_lib_utils_locking__allocator_info.txt,v 1.1 2017/01/16 01:50:14 joerg Exp $ + +--- src/lib/utils/locking_allocator/info.txt.orig 2017-01-16 01:42:23.676606157 +0000 ++++ src/lib/utils/locking_allocator/info.txt +@@ -6,4 +6,5 @@ freebsd + openbsd + netbsd + windows ++solaris + </os> diff --git a/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp b/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp index 62200739fc8..ced32d25abe 100644 --- a/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp +++ b/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3 2016/11/11 19:44:51 joerg Exp $ +$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.4 2017/01/16 01:50:14 joerg Exp $ --- src/lib/utils/os_utils.cpp.orig 2016-10-26 13:39:08.000000000 +0000 +++ src/lib/utils/os_utils.cpp @@ -13,7 +13,7 @@ $NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3 2016/11/11 19:44:51 joerg Exp $ #if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW) #include <windows.h> #endif -@@ -146,7 +150,20 @@ uint64_t get_system_timestamp_ns() +@@ -146,7 +150,21 @@ uint64_t get_system_timestamp_ns() size_t get_memory_locking_limit() { @@ -30,7 +30,8 @@ $NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3 2016/11/11 19:44:51 joerg Exp $ + priv_freeset(priv_set); + + /* XXX how to obtain the real limit? */ -+ return can_mlock ? std::min<size_t>(512 * 1024, max_req) : 0; ++ size_t mlock_requested = BOTAN_MLOCK_ALLOCATOR_MAX_LOCKED_KB; ++ return can_mlock ? std::min<size_t>(512 * 1024, mlock_requested) : 0; +#elif defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) /* * Linux defaults to only 64 KiB of mlockable memory per process |