CVS commit: pkgsrc/security/botan2

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Dec 19 17:39:40 UTC 2022

Modified Files:
        pkgsrc/security/botan2: distinfo
        pkgsrc/security/botan2/patches: patch-src_lib_utils_os__utils.cpp

Log Message:
botan2: fix build of os_utils.cpp on SunOS

os_utils.cpp needs priv.h to be included on
SunOS for the patch to build.
Use Botans own BOTAN_TARGET_OS_IS_SOLARIS
instead of __sun as indicator for building
on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/botan2/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/botan2/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/botan2/distinfo
diff -u pkgsrc/security/botan2/distinfo:1.3 pkgsrc/security/botan2/distinfo:1.4
--- pkgsrc/security/botan2/distinfo:1.3 Thu Nov 24 11:59:30 2022
+++ pkgsrc/security/botan2/distinfo     Mon Dec 19 17:39:40 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2022/11/24 11:59:30 wiz Exp $
+$NetBSD: distinfo,v 1.4 2022/12/19 17:39:40 nros Exp $
 
 BLAKE2s (Botan-2.19.3.tar.xz) = 124eb756725b0b7fe63a89617940271a6e99cee91ca1f6ca986ce432b7f8fc22
 SHA512 (Botan-2.19.3.tar.xz) = 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110
 Size (Botan-2.19.3.tar.xz) = 6105896 bytes
 SHA1 (patch-configure.py) = 2688fe59474bf3de425b49d2e0c9c1f4ecccfd16
 SHA1 (patch-src_build-data_os_openbsd.txt) = 7858a819d457e0cb18a5b9d608c386bee36813ee
-SHA1 (patch-src_lib_utils_os__utils.cpp) = ab44b46c0a9a649f055dc7cd8f54c6ffdf8246cb
+SHA1 (patch-src_lib_utils_os__utils.cpp) = cf914c9566e7c0f376b045c85bb39fb6a573b225

Index: pkgsrc/security/botan2/patches/patch-src_lib_utils_os__utils.cpp
diff -u pkgsrc/security/botan2/patches/patch-src_lib_utils_os__utils.cpp:1.1 pkgsrc/security/botan2/patches/patch-src_lib_utils_os__utils.cpp:1.2
--- pkgsrc/security/botan2/patches/patch-src_lib_utils_os__utils.cpp:1.1        Fri Apr  1 08:01:12 2022
+++ pkgsrc/security/botan2/patches/patch-src_lib_utils_os__utils.cpp    Mon Dec 19 17:39:40 2022
@@ -1,15 +1,26 @@
-$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.1 2022/04/01 08:01:12 wiz Exp $
+$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.2 2022/12/19 17:39:40 nros Exp $
 
 Add check for ability to do mlock() on SunOS.
 
---- src/lib/utils/os_utils.cpp.orig    2019-07-15 18:14:39.932394200 +0000
+--- src/lib/utils/os_utils.cpp.orig    2022-11-16 11:19:19.000000000 +0000
 +++ src/lib/utils/os_utils.cpp
-@@ -325,7 +325,21 @@ size_t OS::system_page_size()
+@@ -60,6 +60,10 @@
+   #include <mach/vm_statistics.h>
+ #endif
+ 
++#if defined(BOTAN_TARGET_OS_IS_SOLARIS)
++#  include <priv.h>
++#endif
++
+ namespace Botan {
+ 
+ // Not defined in OS namespace for historical reasons
+@@ -326,7 +330,21 @@ size_t OS::system_page_size()
  
  size_t OS::get_memory_locking_limit()
     {
 -#if defined(BOTAN_TARGET_OS_HAS_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) && defined(RLIMIT_MEMLOCK)
-+#if defined(__sun)
++#if defined(BOTAN_TARGET_OS_IS_SOLARIS)
 +   priv_set_t *priv_set = priv_allocset();
 +   if (priv_set == nullptr)
 +     return 0;