CVS commit: pkgsrc/security/botan-devel/patches

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Nov 11 19:44:51 UTC 2016

Modified Files:
        pkgsrc/security/botan-devel/patches: patch-src_lib_utils_os__utils.cpp

Log Message:
Move Solaris-specific code first, at least SmartOS doesn't support
'RLIMIT_MEMLOCK' and fails with the default mlock code.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp
diff -u pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.2 pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.3
--- pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.2   Fri Nov 11 19:41:44 2016
+++ pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp       Fri Nov 11 19:44:51 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.2 2016/11/11 19:41:44 joerg Exp $
+$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3 2016/11/11 19:44:51 joerg Exp $
 
 --- src/lib/utils/os_utils.cpp.orig    2016-10-26 13:39:08.000000000 +0000
 +++ src/lib/utils/os_utils.cpp
@@ -13,11 +13,12 @@ $NetBSD: patch-src_lib_utils_os__utils.c
  #if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW)
    #include <windows.h>
  #endif
-@@ -216,6 +220,19 @@ size_t get_memory_locking_limit()
-          return BOTAN_MLOCK_ALLOCATOR_MAX_LOCKED_KB * 1024ULL;
-          }
-       }
-+#elif defined(__sun)
+@@ -146,7 +150,20 @@ uint64_t get_system_timestamp_ns()
+ 
+ size_t get_memory_locking_limit()
+    {
+-#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
++#if defined(__sun)
 +   priv_set_t *priv_set = priv_allocset();
 +   if (priv_set == nullptr)
 +     return 0;
@@ -30,6 +31,7 @@ $NetBSD: patch-src_lib_utils_os__utils.c
 +
 +   /* XXX how to obtain the real limit? */
 +   return can_mlock ? std::min<size_t>(512 * 1024, max_req) : 0;
- #endif
- 
-    return 0;
++#elif defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
+    /*
+    * Linux defaults to only 64 KiB of mlockable memory per process
+    * (too small) but BSDs offer a small fraction of total RAM (more