diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile index 256851838da8..57cc5f37ce76 100644 --- a/security/botan-devel/Makefile +++ b/security/botan-devel/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2021/03/06 21:23:28 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2021/03/07 17:56:25 he Exp $ -DISTNAME= Botan-2.11.0 +DISTNAME= Botan-2.17.3 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 4 CATEGORIES= security MASTER_SITES= https://botan.randombit.net/releases/ EXTRACT_SUFX= .tar.xz diff --git a/security/botan-devel/PLIST b/security/botan-devel/PLIST index 65ee176bc494..4527de1c06c6 100644 --- a/security/botan-devel/PLIST +++ b/security/botan-devel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2019/07/15 18:31:29 bsiegert Exp $ +@comment $NetBSD: PLIST,v 1.11 2021/03/07 17:56:25 he Exp $ bin/botan include/botan-2/botan/adler32.h include/botan-2/botan/aead.h @@ -18,8 +18,8 @@ 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 @@ -122,6 +122,7 @@ 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 @@ -168,6 +169,7 @@ include/botan-2/botan/ocsp.h include/botan-2/botan/ocsp_types.h include/botan-2/botan/ofb.h include/botan-2/botan/oids.h +include/botan-2/botan/otp.h include/botan-2/botan/p11.h include/botan-2/botan/p11_ecc_key.h include/botan-2/botan/p11_ecdh.h @@ -178,6 +180,7 @@ include/botan-2/botan/p11_randomgenerator.h include/botan-2/botan/p11_rsa.h include/botan-2/botan/p11_session.h include/botan-2/botan/p11_slot.h +include/botan-2/botan/p11_types.h include/botan-2/botan/p11_x509.h include/botan-2/botan/package.h include/botan-2/botan/par_hash.h @@ -199,12 +202,15 @@ include/botan-2/botan/pkcs11.h include/botan-2/botan/pkcs11f.h include/botan-2/botan/pkcs11t.h include/botan-2/botan/pkcs8.h +include/botan-2/botan/pkix_enums.h +include/botan-2/botan/pkix_types.h include/botan-2/botan/point_gfp.h include/botan-2/botan/poly1305.h 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/processor_rng.h include/botan-2/botan/psk_db.h include/botan-2/botan/psk_db_sql.h include/botan-2/botan/pssr.h @@ -218,6 +224,7 @@ include/botan-2/botan/rfc6979.h include/botan-2/botan/rmd160.h include/botan-2/botan/rng.h include/botan-2/botan/rotate.h +include/botan-2/botan/roughtime.h include/botan-2/botan/rsa.h include/botan-2/botan/salsa20.h include/botan-2/botan/scan_name.h @@ -294,15 +301,12 @@ include/botan-2/botan/x509path.h include/botan-2/botan/x509self.h include/botan-2/botan/x919_mac.h include/botan-2/botan/xmss.h -include/botan-2/botan/xmss_address.h -include/botan-2/botan/xmss_common_ops.h include/botan-2/botan/xmss_hash.h -include/botan-2/botan/xmss_index_registry.h include/botan-2/botan/xmss_key_pair.h include/botan-2/botan/xmss_parameters.h include/botan-2/botan/xmss_privatekey.h include/botan-2/botan/xmss_publickey.h -include/botan-2/botan/xmss_tools.h +include/botan-2/botan/xmss_wots.h include/botan-2/botan/xmss_wots_parameters.h include/botan-2/botan/xmss_wots_privatekey.h include/botan-2/botan/xmss_wots_publickey.h @@ -311,8 +315,8 @@ include/botan-2/botan/xts.h include/botan-2/botan/zlib.h lib/libbotan-2.a lib/libbotan-2.so -lib/libbotan-2.so.11 -lib/libbotan-2.so.11.11.0 +lib/libbotan-2.so.17 +lib/libbotan-2.so.17.17.3 lib/pkgconfig/botan-2.pc ${PYSITELIB}/botan2.py share/doc/${PKGNAME}/authors.txt @@ -325,6 +329,7 @@ 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/env_vars.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 @@ -340,6 +345,7 @@ 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/roughtime.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 @@ -368,6 +374,7 @@ 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/old_news.rst share/doc/${PKGNAME}/handbook/packaging.rst share/doc/${PKGNAME}/handbook/pgpkey.txt share/doc/${PKGNAME}/handbook/roadmap.rst diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo index 59767441af37..bce4b9ff126b 100644 --- a/security/botan-devel/distinfo +++ b/security/botan-devel/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2019/12/18 12:40:22 joerg Exp $ +$NetBSD: distinfo,v 1.17 2021/03/07 17:56:25 he Exp $ -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 (Botan-2.17.3.tar.xz) = f77d9224a2e85e05b4195cdbb05ec67f55639515 +RMD160 (Botan-2.17.3.tar.xz) = 0c9b9e3de4fa1c69e86e9efc6b047875a7e31c85 +SHA512 (Botan-2.17.3.tar.xz) = ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc +Size (Botan-2.17.3.tar.xz) = 5937596 bytes SHA1 (patch-configure.py) = 2688fe59474bf3de425b49d2e0c9c1f4ecccfd16 -SHA1 (patch-src_build-data_os_openbsd.txt) = 9bfadff82d70bf65a476f3906709af64ade133cb +SHA1 (patch-src_build-data_os_openbsd.txt) = 7858a819d457e0cb18a5b9d608c386bee36813ee SHA1 (patch-src_lib_compat_sodium_sodium__utils.cpp) = 2be13d873006bafe969c39e3af2a783f0372ad1b -SHA1 (patch-src_lib_utils_os__utils.cpp) = dc08c5d7736e86523159ac4bfe565757cd689a4e +SHA1 (patch-src_lib_utils_os__utils.cpp) = ab44b46c0a9a649f055dc7cd8f54c6ffdf8246cb 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 f07e9ac1001e..895b904ac65a 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,4 +1,6 @@ -$NetBSD: patch-src_build-data_os_openbsd.txt,v 1.3 2019/07/15 18:31:29 bsiegert Exp $ +$NetBSD: patch-src_build-data_os_openbsd.txt,v 1.4 2021/03/07 17:56:25 he Exp $ + +Simplify library naming for OpenBSD. --- src/build-data/os/openbsd.txt.orig 2019-07-01 10:23:16.000000000 +0000 +++ src/build-data/os/openbsd.txt 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 1f0ff7141699..6bdc753ac17b 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,6 @@ -$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.6 2019/07/15 18:31:29 bsiegert Exp $ +$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.7 2021/03/07 17:56:25 he 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