Pullup ticket #5194 - requested by joerg

security/botan-devel: build fix

Revisions pulled up:
- security/botan-devel/distinfo                                 1.12
- security/botan-devel/patches/patch-src_build-data_os_solaris.txt 1.1
- security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt 1.1
- security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp 1.4

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Mon Jan 16 01:50:15 UTC 2017

   Modified Files:
   	pkgsrc/security/botan-devel: distinfo
   	pkgsrc/security/botan-devel/patches: patch-src_lib_utils_os__utils.cpp
   Added Files:
   	pkgsrc/security/botan-devel/patches:
   	    patch-src_build-data_os_solaris.txt
   	    patch-src_lib_utils_locking__allocator_info.txt

   Log Message:
   More fixes for build on SmartOS/Solaris.

4 files changed, 33 insertions, 5 deletions

diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo
index 7a82bfd6c35..02f42d808dc 100644
--- a/security/botan-devel/distinfo
+++ b/security/botan-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/11/17 10:23:14 joerg Exp $
+$NetBSD: distinfo,v 1.11.2.1 2017/01/20 18:35:38 bsiegert Exp $
 
 SHA1 (Botan-1.11.33.tgz) = 71f2f4c81af48197e7c6db86bab393396ecf6541
 RMD160 (Botan-1.11.33.tgz) = f0de0fea65fd501747cf1949e47ec2faeb6acaa0
@@ -7,4 +7,6 @@ Size (Botan-1.11.33.tgz) = 4329671 bytes
 SHA1 (patch-src_build-data_os_dragonfly.txt) = 2aef3f0c514f6d1e84aae43052d82b3536a1b1c5
 SHA1 (patch-src_build-data_os_netbsd.txt) = e3acd79c182f338542c4c65b20f2443e42a1a488
 SHA1 (patch-src_build-data_os_openbsd.txt) = 2388e859c855409f6ec23e2b149b3eb56c5a0aea
-SHA1 (patch-src_lib_utils_os__utils.cpp) = 9c5d3bc241ab87fa7c2b9cf8a817682207b026f5
+SHA1 (patch-src_build-data_os_solaris.txt) = d4632d817c401d3942aaabe23719c7496d416b84
+SHA1 (patch-src_lib_utils_locking__allocator_info.txt) = 30dd9043e1fa7befdf6933778e5c729fcb88263d
+SHA1 (patch-src_lib_utils_os__utils.cpp) = 28298bc3b98703275dce23d1d7fcd65ff262d05f
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..836e8dbd78e
--- /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.2.2 2017/01/20 18:35:38 bsiegert 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..d4bf9d2ed6d
--- /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.2.2 2017/01/20 18:35:38 bsiegert 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..e05c7f19e41 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.3.2.1 2017/01/20 18:35:38 bsiegert 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