Update botan-devel to 2.11.0.

There are too many changes to put them in this message.

8 files changed, 135 insertions, 114 deletions

diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile
index e723a906579..ddca6610043 100644
--- a/security/botan-devel/Makefile
+++ b/security/botan-devel/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2019/07/01 04:07:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2019/07/15 18:31:29 bsiegert Exp $
 
-DISTNAME=	Botan-2.1.0
+DISTNAME=	Botan-2.11.0
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	https://botan.randombit.net/releases/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	https://botan.randombit.net/
@@ -19,7 +18,7 @@ PYTHON_FOR_BUILD_ONLY=	yes
 
 CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	./configure.py
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-zlib --with-boost --destdir=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-zlib --with-boost
 CONFIGURE_ARGS+=	--docdir=share/doc
 
 REPLACE_PYTHON+=	*.py src/scripts/*.py
@@ -27,6 +26,8 @@ REPLACE_PYTHON+=	*.py src/scripts/*.py
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CONFIGURE_ARGS+=	--cc-bin=${CXX} --cc=clang
+.else
+CONFIGURE_ARGS+=	--cc=gcc
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"
diff --git a/security/botan-devel/PLIST b/security/botan-devel/PLIST
index cebb7756104..65ee176bc49 100644
--- a/security/botan-devel/PLIST
+++ b/security/botan-devel/PLIST
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST,v 1.9 2017/04/10 21:14:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/07/15 18:31:29 bsiegert Exp $
 bin/botan
 include/botan-2/botan/adler32.h
 include/botan-2/botan/aead.h
 include/botan-2/botan/aes.h
 include/botan-2/botan/alg_id.h
+include/botan-2/botan/argon2.h
+include/botan-2/botan/aria.h
+include/botan-2/botan/asio_async_ops.h
+include/botan-2/botan/asio_context.h
+include/botan-2/botan/asio_error.h
+include/botan-2/botan/asio_stream.h
 include/botan-2/botan/asn1_alt_name.h
 include/botan-2/botan/asn1_attribute.h
 include/botan-2/botan/asn1_obj.h
 include/botan-2/botan/asn1_oid.h
+include/botan-2/botan/asn1_print.h
 include/botan-2/botan/asn1_str.h
 include/botan-2/botan/asn1_time.h
 include/botan-2/botan/assert.h
 include/botan-2/botan/atomic.h
 include/botan-2/botan/auto_rng.h
-include/botan-2/botan/b64_filt.h
+include/botan-2/botan/base32.h
+include/botan-2/botan/base58.h
 include/botan-2/botan/base64.h
 include/botan-2/botan/basefilt.h
 include/botan-2/botan/bcrypt.h
+include/botan-2/botan/bcrypt_pbkdf.h
 include/botan-2/botan/ber_dec.h
 include/botan-2/botan/bigint.h
 include/botan-2/botan/blake2b.h
@@ -39,10 +48,13 @@ include/botan-2/botan/ccm.h
 include/botan-2/botan/cecpq1.h
 include/botan-2/botan/cert_status.h
 include/botan-2/botan/certstor.h
+include/botan-2/botan/certstor_flatfile.h
 include/botan-2/botan/certstor_sql.h
+include/botan-2/botan/certstor_system.h
 include/botan-2/botan/cfb.h
 include/botan-2/botan/chacha.h
 include/botan-2/botan/chacha20poly1305.h
+include/botan-2/botan/chacha_rng.h
 include/botan-2/botan/charset.h
 include/botan-2/botan/cipher_filter.h
 include/botan-2/botan/cipher_mode.h
@@ -83,6 +95,7 @@ include/botan-2/botan/ecdsa.h
 include/botan-2/botan/ecgdsa.h
 include/botan-2/botan/ecies.h
 include/botan-2/botan/eckcdsa.h
+include/botan-2/botan/ed25519.h
 include/botan-2/botan/elgamal.h
 include/botan-2/botan/eme.h
 include/botan-2/botan/eme_pkcs.h
@@ -101,6 +114,7 @@ include/botan-2/botan/filters.h
 include/botan-2/botan/fpe_fe1.h
 include/botan-2/botan/gcm.h
 include/botan-2/botan/gf2m_small_m.h
+include/botan-2/botan/ghash.h
 include/botan-2/botan/gmac.h
 include/botan-2/botan/gost_28147.h
 include/botan-2/botan/gost_3410.h
@@ -108,10 +122,10 @@ include/botan-2/botan/gost_3411.h
 include/botan-2/botan/hash.h
 include/botan-2/botan/hash_id.h
 include/botan-2/botan/hex.h
-include/botan-2/botan/hex_filt.h
 include/botan-2/botan/hkdf.h
 include/botan-2/botan/hmac.h
 include/botan-2/botan/hmac_drbg.h
+include/botan-2/botan/hotp.h
 include/botan-2/botan/http_util.h
 include/botan-2/botan/idea.h
 include/botan-2/botan/init.h
@@ -140,11 +154,12 @@ include/botan-2/botan/mem_ops.h
 include/botan-2/botan/mgf1.h
 include/botan-2/botan/misty1.h
 include/botan-2/botan/mode_pad.h
-include/botan-2/botan/mp_types.h
+include/botan-2/botan/monty.h
 include/botan-2/botan/mul128.h
 include/botan-2/botan/mutex.h
 include/botan-2/botan/name_constraint.h
 include/botan-2/botan/newhope.h
+include/botan-2/botan/nist_keywrap.h
 include/botan-2/botan/noekeon.h
 include/botan-2/botan/numthry.h
 include/botan-2/botan/oaep.h
@@ -173,6 +188,7 @@ include/botan-2/botan/pbkdf.h
 include/botan-2/botan/pbkdf1.h
 include/botan-2/botan/pbkdf2.h
 include/botan-2/botan/pem.h
+include/botan-2/botan/pgp_s2k.h
 include/botan-2/botan/pipe.h
 include/botan-2/botan/pk_algs.h
 include/botan-2/botan/pk_keys.h
@@ -189,8 +205,11 @@ include/botan-2/botan/polyn_gf2m.h
 include/botan-2/botan/pow_mod.h
 include/botan-2/botan/prf_tls.h
 include/botan-2/botan/prf_x942.h
+include/botan-2/botan/psk_db.h
+include/botan-2/botan/psk_db_sql.h
 include/botan-2/botan/pssr.h
 include/botan-2/botan/pubkey.h
+include/botan-2/botan/pwdhash.h
 include/botan-2/botan/rc4.h
 include/botan-2/botan/rdrand_rng.h
 include/botan-2/botan/reducer.h
@@ -202,6 +221,7 @@ include/botan-2/botan/rotate.h
 include/botan-2/botan/rsa.h
 include/botan-2/botan/salsa20.h
 include/botan-2/botan/scan_name.h
+include/botan-2/botan/scrypt.h
 include/botan-2/botan/secmem.h
 include/botan-2/botan/secqueue.h
 include/botan-2/botan/seed.h
@@ -210,24 +230,34 @@ include/botan-2/botan/sha160.h
 include/botan-2/botan/sha2_32.h
 include/botan-2/botan/sha2_64.h
 include/botan-2/botan/sha3.h
+include/botan-2/botan/shacal2.h
 include/botan-2/botan/shake.h
 include/botan-2/botan/shake_cipher.h
 include/botan-2/botan/siphash.h
 include/botan-2/botan/siv.h
 include/botan-2/botan/skein_512.h
+include/botan-2/botan/sm2.h
+include/botan-2/botan/sm2_enc.h
+include/botan-2/botan/sm3.h
+include/botan-2/botan/sm4.h
+include/botan-2/botan/sodium.h
 include/botan-2/botan/sp800_108.h
+include/botan-2/botan/sp800_56a.h
 include/botan-2/botan/sp800_56c.h
 include/botan-2/botan/srp6.h
 include/botan-2/botan/stateful_rng.h
 include/botan-2/botan/stl_compatibility.h
 include/botan-2/botan/stream_cipher.h
 include/botan-2/botan/stream_mode.h
+include/botan-2/botan/streebog.h
 include/botan-2/botan/sym_algo.h
 include/botan-2/botan/symkey.h
 include/botan-2/botan/system_rng.h
 include/botan-2/botan/threefish.h
+include/botan-2/botan/threefish_512.h
 include/botan-2/botan/tiger.h
 include/botan-2/botan/tls_alert.h
+include/botan-2/botan/tls_algos.h
 include/botan-2/botan/tls_blocking.h
 include/botan-2/botan/tls_callbacks.h
 include/botan-2/botan/tls_channel.h
@@ -245,9 +275,11 @@ include/botan-2/botan/tls_session.h
 include/botan-2/botan/tls_session_manager.h
 include/botan-2/botan/tls_session_manager_sql.h
 include/botan-2/botan/tls_version.h
+include/botan-2/botan/totp.h
 include/botan-2/botan/tss.h
 include/botan-2/botan/twofish.h
 include/botan-2/botan/types.h
+include/botan-2/botan/uuid.h
 include/botan-2/botan/version.h
 include/botan-2/botan/whrlpool.h
 include/botan-2/botan/workfactor.h
@@ -279,45 +311,69 @@ include/botan-2/botan/xts.h
 include/botan-2/botan/zlib.h
 lib/libbotan-2.a
 lib/libbotan-2.so
-lib/libbotan-2.so.0
-lib/libbotan-2.so.0.1.0
+lib/libbotan-2.so.11
+lib/libbotan-2.so.11.11.0
 lib/pkgconfig/botan-2.pc
 ${PYSITELIB}/botan2.py
-share/doc/${PKGNAME}/deprecated.txt
+share/doc/${PKGNAME}/authors.txt
+share/doc/${PKGNAME}/handbook/abi.rst
+share/doc/${PKGNAME}/handbook/api_ref/bigint.rst
+share/doc/${PKGNAME}/handbook/api_ref/block_cipher.rst
+share/doc/${PKGNAME}/handbook/api_ref/cipher_modes.rst
+share/doc/${PKGNAME}/handbook/api_ref/compression.rst
+share/doc/${PKGNAME}/handbook/api_ref/contents.rst
+share/doc/${PKGNAME}/handbook/api_ref/credentials_manager.rst
+share/doc/${PKGNAME}/handbook/api_ref/cryptobox.rst
+share/doc/${PKGNAME}/handbook/api_ref/ecc.rst
+share/doc/${PKGNAME}/handbook/api_ref/ffi.rst
+share/doc/${PKGNAME}/handbook/api_ref/filters.rst
+share/doc/${PKGNAME}/handbook/api_ref/fpe.rst
+share/doc/${PKGNAME}/handbook/api_ref/hash.rst
+share/doc/${PKGNAME}/handbook/api_ref/kdf.rst
+share/doc/${PKGNAME}/handbook/api_ref/keywrap.rst
+share/doc/${PKGNAME}/handbook/api_ref/message_auth_codes.rst
+share/doc/${PKGNAME}/handbook/api_ref/otp.rst
+share/doc/${PKGNAME}/handbook/api_ref/passhash.rst
+share/doc/${PKGNAME}/handbook/api_ref/pbkdf.rst
+share/doc/${PKGNAME}/handbook/api_ref/pkcs11.rst
+share/doc/${PKGNAME}/handbook/api_ref/psk_db.rst
+share/doc/${PKGNAME}/handbook/api_ref/pubkey.rst
+share/doc/${PKGNAME}/handbook/api_ref/python.rst
+share/doc/${PKGNAME}/handbook/api_ref/rng.rst
+share/doc/${PKGNAME}/handbook/api_ref/secmem.rst
+share/doc/${PKGNAME}/handbook/api_ref/srp.rst
+share/doc/${PKGNAME}/handbook/api_ref/stream_ciphers.rst
+share/doc/${PKGNAME}/handbook/api_ref/tls.rst
+share/doc/${PKGNAME}/handbook/api_ref/tpm.rst
+share/doc/${PKGNAME}/handbook/api_ref/tss.rst
+share/doc/${PKGNAME}/handbook/api_ref/versions.rst
+share/doc/${PKGNAME}/handbook/api_ref/x509.rst
+share/doc/${PKGNAME}/handbook/authors.txt
+share/doc/${PKGNAME}/handbook/building.rst
+share/doc/${PKGNAME}/handbook/cli.rst
+share/doc/${PKGNAME}/handbook/contents.rst
+share/doc/${PKGNAME}/handbook/credits.rst
+share/doc/${PKGNAME}/handbook/deprecated.rst
+share/doc/${PKGNAME}/handbook/dev_ref/configure.rst
+share/doc/${PKGNAME}/handbook/dev_ref/contents.rst
+share/doc/${PKGNAME}/handbook/dev_ref/continuous_integration.rst
+share/doc/${PKGNAME}/handbook/dev_ref/contributing.rst
+share/doc/${PKGNAME}/handbook/dev_ref/fuzzing.rst
+share/doc/${PKGNAME}/handbook/dev_ref/mistakes.rst
+share/doc/${PKGNAME}/handbook/dev_ref/oids.rst
+share/doc/${PKGNAME}/handbook/dev_ref/os.rst
+share/doc/${PKGNAME}/handbook/dev_ref/reading_list.rst
+share/doc/${PKGNAME}/handbook/dev_ref/release_process.rst
+share/doc/${PKGNAME}/handbook/dev_ref/test_framework.rst
+share/doc/${PKGNAME}/handbook/dev_ref/todo.rst
+share/doc/${PKGNAME}/handbook/goals.rst
+share/doc/${PKGNAME}/handbook/index.rst
+share/doc/${PKGNAME}/handbook/packaging.rst
+share/doc/${PKGNAME}/handbook/pgpkey.txt
+share/doc/${PKGNAME}/handbook/roadmap.rst
+share/doc/${PKGNAME}/handbook/security.rst
+share/doc/${PKGNAME}/handbook/side_channels.rst
+share/doc/${PKGNAME}/handbook/support.rst
 share/doc/${PKGNAME}/license.txt
-share/doc/${PKGNAME}/manual/bigint.rst
-share/doc/${PKGNAME}/manual/building.rst
-share/doc/${PKGNAME}/manual/cli.rst
-share/doc/${PKGNAME}/manual/compression.rst
-share/doc/${PKGNAME}/manual/contents.rst
-share/doc/${PKGNAME}/manual/credentials_manager.rst
-share/doc/${PKGNAME}/manual/cryptobox.rst
-share/doc/${PKGNAME}/manual/ffi.rst
-share/doc/${PKGNAME}/manual/filters.rst
-share/doc/${PKGNAME}/manual/fpe.rst
-share/doc/${PKGNAME}/manual/goals.rst
-share/doc/${PKGNAME}/manual/hash.rst
-share/doc/${PKGNAME}/manual/index.rst
-share/doc/${PKGNAME}/manual/kdf.rst
-share/doc/${PKGNAME}/manual/lowlevel.rst
-share/doc/${PKGNAME}/manual/mceliece.rst
-share/doc/${PKGNAME}/manual/packaging.rst
-share/doc/${PKGNAME}/manual/passhash.rst
-share/doc/${PKGNAME}/manual/pbkdf.rst
-share/doc/${PKGNAME}/manual/pkcs11.rst
-share/doc/${PKGNAME}/manual/platforms.rst
-share/doc/${PKGNAME}/manual/pubkey.rst
-share/doc/${PKGNAME}/manual/python.rst
-share/doc/${PKGNAME}/manual/rng.rst
-share/doc/${PKGNAME}/manual/secmem.rst
-share/doc/${PKGNAME}/manual/side_channels.rst
-share/doc/${PKGNAME}/manual/srp.rst
-share/doc/${PKGNAME}/manual/support.rst
-share/doc/${PKGNAME}/manual/symmetric_crypto.rst
-share/doc/${PKGNAME}/manual/tls.rst
-share/doc/${PKGNAME}/manual/tpm.rst
-share/doc/${PKGNAME}/manual/versions.rst
-share/doc/${PKGNAME}/manual/x509.rst
 share/doc/${PKGNAME}/news.txt
 share/doc/${PKGNAME}/pgpkey.txt
-share/doc/${PKGNAME}/reading_list.txt
diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo
index 0d25b0df4d8..db70f12c0d0 100644
--- a/security/botan-devel/distinfo
+++ b/security/botan-devel/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.14 2018/02/02 13:56:35 jperkin Exp $
+$NetBSD: distinfo,v 1.15 2019/07/15 18:31:29 bsiegert Exp $
 
-SHA1 (Botan-2.1.0.tgz) = a754303f0fc5dc6e187dc80d1316f9fdb20cde1f
-RMD160 (Botan-2.1.0.tgz) = b736e1820aa4315095248ebdf119a5c6b493616d
-SHA512 (Botan-2.1.0.tgz) = af9ea35baf431500d380a360525e20e67dd17fdeaa442726019d544e9e423c301196cc17b09a3831f956ca9e62d7e99797f129b26fac10a653dd04e3ad1f4f4f
-Size (Botan-2.1.0.tgz) = 5073684 bytes
-SHA1 (patch-configure.py) = 188c466dc1427b65ef1790eabda04995442df6ed
-SHA1 (patch-src_build-data_os_openbsd.txt) = 4b187abcca4652a780386a6817033e4b6cdeafa8
-SHA1 (patch-src_build-data_os_solaris.txt) = de351e82e261c1f9e8668ecca606f3776cfa9eb2
-SHA1 (patch-src_lib_utils_locking__allocator_info.txt) = 30dd9043e1fa7befdf6933778e5c729fcb88263d
-SHA1 (patch-src_lib_utils_os__utils.cpp) = 1b6b545c55995d0786669b1649e0913fbf0b5f3c
+SHA1 (Botan-2.11.0.tar.xz) = 67027ec56b9b217217a5bbc29c191e65d9e4193d
+RMD160 (Botan-2.11.0.tar.xz) = 95b54b384964c4ef881d7fb07adce995a9e1e78f
+SHA512 (Botan-2.11.0.tar.xz) = a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
+Size (Botan-2.11.0.tar.xz) = 5765712 bytes
+SHA1 (patch-configure.py) = 2688fe59474bf3de425b49d2e0c9c1f4ecccfd16
+SHA1 (patch-src_build-data_os_openbsd.txt) = 9bfadff82d70bf65a476f3906709af64ade133cb
+SHA1 (patch-src_lib_utils_os__utils.cpp) = dc08c5d7736e86523159ac4bfe565757cd689a4e
diff --git a/security/botan-devel/patches/patch-configure.py b/security/botan-devel/patches/patch-configure.py
index b6825dd74f1..cee3afbf953 100644
--- a/security/botan-devel/patches/patch-configure.py
+++ b/security/botan-devel/patches/patch-configure.py
@@ -1,15 +1,16 @@
-$NetBSD: patch-configure.py,v 1.1 2018/02/02 13:56:35 jperkin Exp $
+$NetBSD: patch-configure.py,v 1.2 2019/07/15 18:31:29 bsiegert Exp $
 
 Leave pkgsrc to handle security features.
 
---- configure.py.orig	2017-04-05 01:09:22.000000000 +0000
+--- configure.py.orig	2019-07-01 10:23:16.000000000 +0000
 +++ configure.py
-@@ -1060,7 +1060,7 @@ class CompilerInfo(InfoObject): # pylint
-             if flag != None and flag != '' and flag not in abi_link:
-                 abi_link.append(flag)
+@@ -1266,9 +1266,6 @@ class CompilerInfo(InfoObject): # pylint
+         if options.msvc_runtime:
+             abi_link.add("/" + options.msvc_runtime)
  
 -        if options.with_stack_protector and self.stack_protector_flags != '':
-+        if options.with_stack_protector and self.stack_protector_flags != '' and False:
-             abi_link.append(self.stack_protector_flags)
- 
+-            abi_link.add(self.stack_protector_flags)
+-
          if options.with_coverage_info:
+             if self.coverage_flags == '':
+                 raise UserError('No coverage handling for %s' % (self.basename))
diff --git a/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt b/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt
index 9fa3a36a5eb..f07e9ac1001 100644
--- a/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt
+++ b/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt
@@ -1,14 +1,13 @@
-$NetBSD: patch-src_build-data_os_openbsd.txt,v 1.2 2017/04/10 21:14:45 joerg Exp $
+$NetBSD: patch-src_build-data_os_openbsd.txt,v 1.3 2019/07/15 18:31:29 bsiegert Exp $
 
---- src/build-data/os/openbsd.txt.orig	2017-04-10 20:31:58.319297182 +0000
+--- src/build-data/os/openbsd.txt.orig	2019-07-01 10:23:16.000000000 +0000
 +++ src/build-data/os/openbsd.txt
-@@ -1,8 +1,6 @@
- os_type unix
+@@ -1,7 +1,5 @@
  
--soname_pattern_base  "libbotan-{version_major}.so"
--soname_pattern_abi   "libbotan-{version_major}.so.{abi_rev}"
--soname_pattern_patch "libbotan-{version_major}.so.{abi_rev}.{version_minor}"
+-soname_pattern_base  "lib{libname}.so"
+-soname_pattern_abi   "lib{libname}.so.{abi_rev}.{version_minor}"
+-soname_pattern_patch "lib{libname}.so.{abi_rev}.{version_minor}"
 +soname_suffix "so"
  
- <target_features>
- arc4random
+ shared_lib_symlinks no
+ 
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
deleted file mode 100644
index 1be4db33561..00000000000
--- a/security/botan-devel/patches/patch-src_build-data_os_solaris.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_build-data_os_solaris.txt,v 1.2 2017/04/10 21:14:45 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,8 @@ os_type unix
- install_cmd_data '/usr/ucb/install -m 644'
- install_cmd_exec '/usr/ucb/install -m 755'
- 
-+soname_suffix "so"
-+
- <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
deleted file mode 100644
index e6add5f50cd..00000000000
--- a/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-$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 8467bcefe28..1f0ff714169 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,23 +1,12 @@
-$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.5 2017/04/10 21:14:45 joerg Exp $
+$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.6 2019/07/15 18:31:29 bsiegert Exp $
 
---- src/lib/utils/os_utils.cpp.orig	2017-04-05 01:09:22.000000000 +0000
+--- src/lib/utils/os_utils.cpp.orig	2019-07-15 18:14:39.932394200 +0000
 +++ src/lib/utils/os_utils.cpp
-@@ -21,6 +21,10 @@
-   #include <setjmp.h>
- #endif
- 
-+#ifdef __sun
-+#include <priv.h>
-+#endif
-+
- #if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW)
-   #define NOMINMAX 1
-   #include <windows.h>
-@@ -170,7 +174,21 @@ uint64_t OS::get_system_timestamp_ns()
+@@ -325,7 +325,21 @@ size_t OS::system_page_size()
  
  size_t OS::get_memory_locking_limit()
     {
--#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
+-#if defined(BOTAN_TARGET_OS_HAS_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) && defined(RLIMIT_MEMLOCK)
 +#if defined(__sun)
 +   priv_set_t *priv_set = priv_allocset();
 +   if (priv_set == nullptr)
@@ -32,7 +21,7 @@ $NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.5 2017/04/10 21:14:45 joerg Exp $
 +   /* XXX how to obtain the real limit? */
 +   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)
++#elif defined(BOTAN_TARGET_OS_HAS_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) && defined(RLIMIT_MEMLOCK)
     /*
-    * Linux defaults to only 64 KiB of mlockable memory per process
-    * (too small) but BSDs offer a small fraction of total RAM (more
+    * If RLIMIT_MEMLOCK is not defined, likely the OS does not support
+    * unprivileged mlock calls.