diff options
34 files changed, 23 insertions, 1175 deletions
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index f5b58ec590d..fbcd3b69eb1 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.120 2021/12/08 16:04:02 adam Exp $ +# $NetBSD: Makefile,v 1.121 2022/04/01 08:07:28 wiz Exp $ DISTNAME= monotone-1.1 -PKGREVISION= 27 +PKGREVISION= 28 CATEGORIES= devel scm MASTER_SITES= http://www.monotone.ca/downloads/1.1/ EXTRACT_SUFX= .tar.bz2 @@ -56,7 +56,6 @@ BUILDLINK_API_DEPENDS.pcre+= pcre>=7.6 .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" -# botan-devel is probably also fine -.include "../../security/botan/buildlink3.mk" +.include "../../security/botan1/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/powerdns/options.mk b/net/powerdns/options.mk index d9c86e12515..93954eb6aa2 100644 --- a/net/powerdns/options.mk +++ b/net/powerdns/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2020/07/02 13:01:38 otis Exp $ +# $NetBSD: options.mk,v 1.9 2022/04/01 08:07:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe random remote sqlite tools zeromq @@ -15,7 +15,7 @@ PLIST.bind= yes .if !empty(PKG_OPTIONS:Mbotan) .include "../../devel/gmp/buildlink3.mk" -.include "../../security/botan-devel/buildlink3.mk" +.include "../../security/botan2/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mluarecords) diff --git a/security/Makefile b/security/Makefile index 1c496b386ff..326476681a9 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.851 2022/03/15 18:18:55 nia Exp $ +# $NetBSD: Makefile,v 1.852 2022/04/01 08:07:28 wiz Exp $ # COMMENT= Security and cryptography tools and libraries @@ -39,8 +39,8 @@ SUBDIR+= bcrypt SUBDIR+= bearssl SUBDIR+= beecrypt SUBDIR+= bitstir -SUBDIR+= botan -SUBDIR+= botan-devel +SUBDIR+= botan1 +SUBDIR+= botan2 SUBDIR+= ca-certificates SUBDIR+= caff SUBDIR+= ccid diff --git a/security/botan-devel/DESCR b/security/botan-devel/DESCR deleted file mode 100644 index 7a1c2929a7f..00000000000 --- a/security/botan-devel/DESCR +++ /dev/null @@ -1,13 +0,0 @@ -Botan is a crypto library written in C++. It provides a variety of -cryptographic algorithms, including common ones such as AES, MD5, SHA, -HMAC, RSA, Diffie-Hellman, DSA, and ECDSA, as well as many others that -are more obscure or specialized. It also offers X.509v3 certificates -and CRLs, and PKCS #10 certificate requests. A message processing -system that uses a filter/pipeline metaphor allows for many common -cryptographic tasks to be completed with just a few lines of code. -Assembly optimizations for common CPUs, including x86, x86-64, and -PowerPC, offers further speedups for critical tasks such as SHA-1 -hashing and multiple precision integer operations. - -The development version contains a much improved TLS infrastructure. -It also depends on C++11. diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile deleted file mode 100644 index e3567a15168..00000000000 --- a/security/botan-devel/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# $NetBSD: Makefile,v 1.45 2022/03/31 23:24:22 wiz Exp $ - -DISTNAME= Botan-2.19.1 -PKGNAME= ${DISTNAME:tl} -CATEGORIES= security -MASTER_SITES= https://botan.randombit.net/releases/ -EXTRACT_SUFX= .tar.xz - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= https://botan.randombit.net/ -COMMENT= Portable, easy to use, and efficient C++ crypto library -LICENSE= 2-clause-bsd - -HAS_CONFIGURE= yes -USE_LANGUAGES= c++ - -PYTHON_FOR_BUILD_ONLY= yes - -CONFIG_SHELL= ${PYTHONBIN} -CONFIGURE_SCRIPT= ./configure.py -CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost -CONFIGURE_ARGS+= --docdir=share/doc -CONFIGURE_ARGS+= --without-sphinx - -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 - -PLIST_VARS+= x86 -.if ${MACHINE_ARCH} == "x86_64" -PLIST.x86= yes -CONFIGURE_ARGS+= --cpu=amd64 -.elif ${MACHINE_ARCH} == "i386" -PLIST.x86= yes -CONFIGURE_ARGS+= --cpu=i386 -.elif ${MACHINE_ARCH} == "powerpc" -CONFIGURE_ARGS+= --cpu=ppc -.elif ${MACHINE_ARCH} == "powerpc64" -CONFIGURE_ARGS+= --cpu=ppc64 -.elif !empty(MACHINE_ARCH:Maarch64*) -CONFIGURE_ARGS+= --cpu=arm64 -.elif !empty(MACHINE_ARCH:Mearm*) -CONFIGURE_ARGS+= --cpu=arm32 -.endif - -MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} - -USE_TOOLS+= gmake - -PY_PATCHPLIST= yes - -LDFLAGS.SunOS+= -lnsl -lsocket - -TEST_TARGET= tests - -post-test: - cd ${WRKSRC} && ./botan-test - -.include "../../devel/zlib/buildlink3.mk" -.include "../../devel/boost-libs/buildlink3.mk" -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/botan-devel/PLIST b/security/botan-devel/PLIST deleted file mode 100644 index 2373dc70074..00000000000 --- a/security/botan-devel/PLIST +++ /dev/null @@ -1,388 +0,0 @@ -@comment $NetBSD: PLIST,v 1.13 2022/03/31 23:24:22 wiz 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/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 -include/botan-2/botan/blinding.h -include/botan-2/botan/block_cipher.h -include/botan-2/botan/blowfish.h -include/botan-2/botan/botan.h -include/botan-2/botan/bswap.h -include/botan-2/botan/buf_comp.h -include/botan-2/botan/buf_filt.h -include/botan-2/botan/build.h -include/botan-2/botan/calendar.h -include/botan-2/botan/camellia.h -include/botan-2/botan/cascade.h -include/botan-2/botan/cast128.h -include/botan-2/botan/cast256.h -include/botan-2/botan/cbc.h -include/botan-2/botan/cbc_mac.h -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 -include/botan-2/botan/cmac.h -include/botan-2/botan/comb4p.h -include/botan-2/botan/comp_filter.h -include/botan-2/botan/compiler.h -include/botan-2/botan/compression.h -include/botan-2/botan/cpuid.h -include/botan-2/botan/crc24.h -include/botan-2/botan/crc32.h -include/botan-2/botan/credentials_manager.h -include/botan-2/botan/crl_ent.h -include/botan-2/botan/cryptobox.h -include/botan-2/botan/ctr.h -include/botan-2/botan/curve25519.h -include/botan-2/botan/curve_gfp.h -include/botan-2/botan/curve_nistp.h -include/botan-2/botan/data_snk.h -include/botan-2/botan/data_src.h -include/botan-2/botan/database.h -include/botan-2/botan/datastor.h -include/botan-2/botan/der_enc.h -include/botan-2/botan/des.h -include/botan-2/botan/desx.h -include/botan-2/botan/dh.h -include/botan-2/botan/divide.h -include/botan-2/botan/dl_algo.h -include/botan-2/botan/dl_group.h -include/botan-2/botan/dlies.h -include/botan-2/botan/dsa.h -include/botan-2/botan/dyn_load.h -include/botan-2/botan/eax.h -include/botan-2/botan/ec_group.h -include/botan-2/botan/ecc_key.h -include/botan-2/botan/ecdh.h -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 -include/botan-2/botan/eme_raw.h -include/botan-2/botan/emsa.h -include/botan-2/botan/emsa1.h -include/botan-2/botan/emsa_pkcs1.h -include/botan-2/botan/emsa_raw.h -include/botan-2/botan/emsa_x931.h -include/botan-2/botan/entropy_src.h -include/botan-2/botan/exceptn.h -include/botan-2/botan/fd_unix.h -include/botan-2/botan/ffi.h -include/botan-2/botan/filter.h -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 -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 -include/botan-2/botan/iso9796.h -include/botan-2/botan/kasumi.h -include/botan-2/botan/kdf.h -include/botan-2/botan/kdf1.h -include/botan-2/botan/kdf1_iso18033.h -include/botan-2/botan/kdf2.h -include/botan-2/botan/keccak.h -include/botan-2/botan/key_constraint.h -include/botan-2/botan/key_filt.h -include/botan-2/botan/key_spec.h -include/botan-2/botan/keypair.h -include/botan-2/botan/lion.h -include/botan-2/botan/loadstor.h -include/botan-2/botan/locking_allocator.h -include/botan-2/botan/lookup.h -include/botan-2/botan/mac.h -include/botan-2/botan/mceies.h -include/botan-2/botan/mceliece.h -include/botan-2/botan/md4.h -include/botan-2/botan/md5.h -include/botan-2/botan/mdx_hash.h -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/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 -include/botan-2/botan/ocb.h -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 -include/botan-2/botan/p11_ecdsa.h -include/botan-2/botan/p11_module.h -include/botan-2/botan/p11_object.h -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 -include/botan-2/botan/parsing.h -include/botan-2/botan/passhash9.h -include/botan-2/botan/pbes2.h -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 -include/botan-2/botan/pk_ops.h -include/botan-2/botan/pk_ops_fwd.h -include/botan-2/botan/pkcs10.h -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 -${PLIST.x86}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 -include/botan-2/botan/pubkey.h -include/botan-2/botan/pwdhash.h -include/botan-2/botan/rc4.h -${PLIST.x86}include/botan-2/botan/rdrand_rng.h -include/botan-2/botan/reducer.h -include/botan-2/botan/rfc3394.h -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 -include/botan-2/botan/scrypt.h -include/botan-2/botan/secmem.h -include/botan-2/botan/secqueue.h -include/botan-2/botan/seed.h -include/botan-2/botan/serpent.h -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 -include/botan-2/botan/tls_ciphersuite.h -include/botan-2/botan/tls_client.h -include/botan-2/botan/tls_exceptn.h -include/botan-2/botan/tls_extensions.h -include/botan-2/botan/tls_handshake_msg.h -include/botan-2/botan/tls_magic.h -include/botan-2/botan/tls_messages.h -include/botan-2/botan/tls_policy.h -include/botan-2/botan/tls_server.h -include/botan-2/botan/tls_server_info.h -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 -include/botan-2/botan/x509_ca.h -include/botan-2/botan/x509_crl.h -include/botan-2/botan/x509_dn.h -include/botan-2/botan/x509_ext.h -include/botan-2/botan/x509_key.h -include/botan-2/botan/x509_obj.h -include/botan-2/botan/x509cert.h -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_hash.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_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 -include/botan-2/botan/xtea.h -include/botan-2/botan/xts.h -include/botan-2/botan/zfec.h -include/botan-2/botan/zlib.h -lib/libbotan-2.a -lib/libbotan-2.so -lib/libbotan-2.so.19 -lib/libbotan-2.so.19.19.1 -lib/pkgconfig/botan-2.pc -${PYSITELIB}/botan2.py -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/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 -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/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 -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/api_ref/zfec.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/old_news.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}/news.txt -share/doc/${PKGNAME}/pgpkey.txt diff --git a/security/botan-devel/buildlink3.mk b/security/botan-devel/buildlink3.mk deleted file mode 100644 index 4c38695a3e2..00000000000 --- a/security/botan-devel/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.24 2022/03/31 23:30:16 wiz Exp $ - -BUILDLINK_TREE+= botan - -.if !defined(BOTAN_BUILDLINK3_MK) -BOTAN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.botan+= botan>=2.11 -BUILDLINK_ABI_DEPENDS.botan?= botan>=2.19.1 -BUILDLINK_PKGSRCDIR.botan?= ../../security/botan-devel - -.include "../../devel/zlib/buildlink3.mk" -.include "../../devel/boost-libs/buildlink3.mk" -.endif # BOTAN_BUILDLINK3_MK - -BUILDLINK_TREE+= -botan diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo deleted file mode 100644 index e440a26b234..00000000000 --- a/security/botan-devel/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.20 2022/03/31 23:24:22 wiz Exp $ - -BLAKE2s (Botan-2.19.1.tar.xz) = 8e7c4d58d26e388a8bc8cf83e4fc86096b47b8fe44c95dff611f906702fedabb -SHA512 (Botan-2.19.1.tar.xz) = e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5 -Size (Botan-2.19.1.tar.xz) = 6088380 bytes -SHA1 (patch-configure.py) = 2688fe59474bf3de425b49d2e0c9c1f4ecccfd16 -SHA1 (patch-src_build-data_os_openbsd.txt) = 7858a819d457e0cb18a5b9d608c386bee36813ee -SHA1 (patch-src_lib_utils_os__utils.cpp) = ab44b46c0a9a649f055dc7cd8f54c6ffdf8246cb diff --git a/security/botan-devel/patches/patch-configure.py b/security/botan-devel/patches/patch-configure.py deleted file mode 100644 index cee3afbf953..00000000000 --- a/security/botan-devel/patches/patch-configure.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-configure.py,v 1.2 2019/07/15 18:31:29 bsiegert Exp $ - -Leave pkgsrc to handle security features. - ---- configure.py.orig 2019-07-01 10:23:16.000000000 +0000 -+++ configure.py -@@ -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 != '': -- 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 deleted file mode 100644 index 895b904ac65..00000000000 --- a/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt +++ /dev/null @@ -1,15 +0,0 @@ -$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 -@@ -1,7 +1,5 @@ - --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" - - shared_lib_symlinks no - 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 deleted file mode 100644 index 6bdc753ac17..00000000000 --- a/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$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 -@@ -325,7 +325,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) -+ priv_set_t *priv_set = priv_allocset(); -+ if (priv_set == nullptr) -+ return 0; -+ bool can_mlock = false; -+ -+ if(getppriv(PRIV_EFFECTIVE, priv_set) == 0) -+ can_mlock = priv_ismember(priv_set, PRIV_PROC_LOCK_MEMORY); -+ -+ priv_freeset(priv_set); -+ -+ /* 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_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) && defined(RLIMIT_MEMLOCK) - /* - * If RLIMIT_MEMLOCK is not defined, likely the OS does not support - * unprivileged mlock calls. diff --git a/security/botan/DESCR b/security/botan/DESCR deleted file mode 100644 index 25b417e5a68..00000000000 --- a/security/botan/DESCR +++ /dev/null @@ -1,12 +0,0 @@ -Botan is a crypto library written in C++. It provides a variety of -cryptographic algorithms, including common ones such as AES, MD5, SHA, -HMAC, RSA, Diffie-Hellman, DSA, and ECDSA, as well as many others that -are more obscure or specialized. It also offers X.509v3 certificates -and CRLs, and PKCS #10 certificate requests. A message processing -system that uses a filter/pipeline metaphor allows for many common -cryptographic tasks to be completed with just a few lines of code. -Assembly optimizations for common CPUs, including x86, x86-64, and -PowerPC, offers further speedups for critical tasks such as SHA-1 -hashing and multiple precision integer operations. - -Botan is licensed under the same permissive terms as NetBSD itself. diff --git a/security/botan/Makefile b/security/botan/Makefile deleted file mode 100644 index 6e5863584c2..00000000000 --- a/security/botan/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# $NetBSD: Makefile,v 1.54 2022/01/27 20:59:27 nros Exp $ - -DISTNAME= Botan-1.10.17 -PKGNAME= ${DISTNAME:tl} -PKGREVISION= 1 -CATEGORIES= security -MASTER_SITES= https://botan.randombit.net/releases/old/ -EXTRACT_SUFX= .tgz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://botan.randombit.net/ -COMMENT= Portable, easy to use, and efficient C++ crypto library -LICENSE= 2-clause-bsd - -HAS_CONFIGURE= yes -USE_LANGUAGES= c++03 - -PYTHON_FOR_BUILD_ONLY= yes -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.8.14; 1.10 is supposedly better - -CONFIG_SHELL= ${PYTHONBIN} -CONFIGURE_SCRIPT= ./configure.py -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --docdir=share/doc -CONFIGURE_ARGS+= --without-sphinx - -MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} - -.include "../../mk/bsd.prefs.mk" - -PLIST_VARS+= x86 x86_64 i386 - -.if ${MACHINE_ARCH} == "x86_64" -CONFIGURE_ARGS+= --cpu=amd64 -PLIST.x86_64= yes -PLIST.x86= yes -.elif ${MACHINE_ARCH} == "i386" -CONFIGURE_ARGS+= --cpu=i386 -PLIST.i386= yes -PLIST.x86= yes -.elif ${MACHINE_ARCH} == "powerpc" -CONFIGURE_ARGS+= --cpu=ppc -.elif ${MACHINE_ARCH} == "powerpc64" -CONFIGURE_ARGS+= --cpu=ppc64 -.elif ${MACHINE_ARCH} == "arm" -CONFIGURE_ARGS+= --cpu=arm -.endif - -.include "../../lang/python/application.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/botan/PLIST b/security/botan/PLIST deleted file mode 100644 index fb9fc318eb3..00000000000 --- a/security/botan/PLIST +++ /dev/null @@ -1,266 +0,0 @@ -@comment $NetBSD: PLIST,v 1.8 2018/07/01 17:23:43 joerg Exp $ -bin/botan-config-1.10 -include/botan-1.10/botan/adler32.h -include/botan-1.10/botan/aes.h -include/botan-1.10/botan/alg_id.h -include/botan-1.10/botan/algo_base.h -include/botan-1.10/botan/algo_factory.h -include/botan-1.10/botan/allocate.h -include/botan-1.10/botan/arc4.h -include/botan-1.10/botan/asn1_int.h -include/botan-1.10/botan/asn1_obj.h -include/botan-1.10/botan/asn1_oid.h -include/botan-1.10/botan/asn1_str.h -include/botan-1.10/botan/auto_rng.h -include/botan-1.10/botan/b64_filt.h -include/botan-1.10/botan/base64.h -include/botan-1.10/botan/basefilt.h -include/botan-1.10/botan/bcrypt.h -include/botan-1.10/botan/benchmark.h -include/botan-1.10/botan/ber_dec.h -include/botan-1.10/botan/bigint.h -include/botan-1.10/botan/blinding.h -include/botan-1.10/botan/block_cipher.h -include/botan-1.10/botan/blowfish.h -include/botan-1.10/botan/bmw_512.h -include/botan-1.10/botan/botan.h -include/botan-1.10/botan/bswap.h -include/botan-1.10/botan/buf_comp.h -include/botan-1.10/botan/buf_filt.h -include/botan-1.10/botan/build.h -include/botan-1.10/botan/camellia.h -include/botan-1.10/botan/cascade.h -include/botan-1.10/botan/cast128.h -include/botan-1.10/botan/cast256.h -include/botan-1.10/botan/cbc.h -include/botan-1.10/botan/cbc_mac.h -include/botan-1.10/botan/certstor.h -include/botan-1.10/botan/cfb.h -include/botan-1.10/botan/charset.h -include/botan-1.10/botan/cmac.h -include/botan-1.10/botan/comb4p.h -include/botan-1.10/botan/cpuid.h -include/botan-1.10/botan/crc24.h -include/botan-1.10/botan/crc32.h -include/botan-1.10/botan/crl_ent.h -include/botan-1.10/botan/cryptobox.h -include/botan-1.10/botan/ctr.h -include/botan-1.10/botan/cts.h -include/botan-1.10/botan/curve_gfp.h -include/botan-1.10/botan/data_snk.h -include/botan-1.10/botan/data_src.h -include/botan-1.10/botan/datastor.h -include/botan-1.10/botan/der_enc.h -include/botan-1.10/botan/des.h -include/botan-1.10/botan/desx.h -include/botan-1.10/botan/dh.h -include/botan-1.10/botan/divide.h -include/botan-1.10/botan/dl_algo.h -include/botan-1.10/botan/dl_group.h -include/botan-1.10/botan/dlies.h -include/botan-1.10/botan/dsa.h -include/botan-1.10/botan/dyn_engine.h -include/botan-1.10/botan/eax.h -include/botan-1.10/botan/ec_group.h -include/botan-1.10/botan/ecb.h -include/botan-1.10/botan/ecc_key.h -include/botan-1.10/botan/ecdh.h -include/botan-1.10/botan/ecdsa.h -include/botan-1.10/botan/elgamal.h -include/botan-1.10/botan/eme.h -include/botan-1.10/botan/eme1.h -include/botan-1.10/botan/eme_pkcs.h -include/botan-1.10/botan/emsa.h -include/botan-1.10/botan/emsa1.h -include/botan-1.10/botan/emsa1_bsi.h -include/botan-1.10/botan/emsa2.h -include/botan-1.10/botan/emsa3.h -include/botan-1.10/botan/emsa4.h -include/botan-1.10/botan/emsa_raw.h -include/botan-1.10/botan/engine.h -include/botan-1.10/botan/entropy_src.h -include/botan-1.10/botan/exceptn.h -include/botan-1.10/botan/fd_unix.h -include/botan-1.10/botan/filter.h -include/botan-1.10/botan/filters.h -include/botan-1.10/botan/fpe_fe1.h -include/botan-1.10/botan/get_byte.h -include/botan-1.10/botan/get_pbe.h -include/botan-1.10/botan/global_state.h -include/botan-1.10/botan/gost_28147.h -include/botan-1.10/botan/gost_3410.h -include/botan-1.10/botan/gost_3411.h -include/botan-1.10/botan/has160.h -include/botan-1.10/botan/hash.h -include/botan-1.10/botan/hash_id.h -include/botan-1.10/botan/hex.h -include/botan-1.10/botan/hex_filt.h -include/botan-1.10/botan/hmac.h -include/botan-1.10/botan/hmac_rng.h -include/botan-1.10/botan/idea.h -${PLIST.x86_64}include/botan-1.10/botan/idea_sse2.h -include/botan-1.10/botan/if_algo.h -include/botan-1.10/botan/init.h -include/botan-1.10/botan/kasumi.h -include/botan-1.10/botan/kdf.h -include/botan-1.10/botan/kdf1.h -include/botan-1.10/botan/kdf2.h -include/botan-1.10/botan/keccak.h -include/botan-1.10/botan/key_filt.h -include/botan-1.10/botan/key_spec.h -include/botan-1.10/botan/keypair.h -include/botan-1.10/botan/libstate.h -include/botan-1.10/botan/lion.h -include/botan-1.10/botan/loadstor.h -include/botan-1.10/botan/look_pk.h -include/botan-1.10/botan/lookup.h -include/botan-1.10/botan/lubyrack.h -include/botan-1.10/botan/mac.h -include/botan-1.10/botan/mars.h -include/botan-1.10/botan/md2.h -include/botan-1.10/botan/md4.h -${PLIST.i386}include/botan-1.10/botan/md4_x86_32.h -include/botan-1.10/botan/md5.h -${PLIST.i386}include/botan-1.10/botan/md5_x86_32.h -include/botan-1.10/botan/mdx_hash.h -include/botan-1.10/botan/mem_ops.h -include/botan-1.10/botan/mgf1.h -include/botan-1.10/botan/misty1.h -include/botan-1.10/botan/mode_pad.h -include/botan-1.10/botan/mp_types.h -include/botan-1.10/botan/noekeon.h -include/botan-1.10/botan/noekeon_simd.h -include/botan-1.10/botan/nr.h -include/botan-1.10/botan/numthry.h -include/botan-1.10/botan/ofb.h -include/botan-1.10/botan/oids.h -include/botan-1.10/botan/openpgp.h -include/botan-1.10/botan/package.h -include/botan-1.10/botan/par_hash.h -include/botan-1.10/botan/parsing.h -include/botan-1.10/botan/passhash9.h -include/botan-1.10/botan/pbe.h -include/botan-1.10/botan/pbes1.h -include/botan-1.10/botan/pbes2.h -include/botan-1.10/botan/pbkdf.h -include/botan-1.10/botan/pbkdf1.h -include/botan-1.10/botan/pbkdf2.h -include/botan-1.10/botan/pem.h -include/botan-1.10/botan/pgp_s2k.h -include/botan-1.10/botan/pipe.h -include/botan-1.10/botan/pk_filts.h -include/botan-1.10/botan/pk_keys.h -include/botan-1.10/botan/pk_ops.h -include/botan-1.10/botan/pkcs10.h -include/botan-1.10/botan/pkcs8.h -include/botan-1.10/botan/point_gfp.h -include/botan-1.10/botan/pow_mod.h -include/botan-1.10/botan/prf_ssl3.h -include/botan-1.10/botan/prf_tls.h -include/botan-1.10/botan/prf_x942.h -include/botan-1.10/botan/pubkey.h -include/botan-1.10/botan/pubkey_enums.h -include/botan-1.10/botan/randpool.h -include/botan-1.10/botan/rc2.h -include/botan-1.10/botan/rc5.h -include/botan-1.10/botan/rc6.h -include/botan-1.10/botan/reducer.h -include/botan-1.10/botan/rfc3394.h -include/botan-1.10/botan/rmd128.h -include/botan-1.10/botan/rmd160.h -include/botan-1.10/botan/rng.h -include/botan-1.10/botan/rotate.h -include/botan-1.10/botan/rsa.h -include/botan-1.10/botan/rw.h -include/botan-1.10/botan/safer_sk.h -include/botan-1.10/botan/salsa20.h -include/botan-1.10/botan/scan_name.h -include/botan-1.10/botan/secmem.h -include/botan-1.10/botan/secqueue.h -include/botan-1.10/botan/seed.h -include/botan-1.10/botan/selftest.h -include/botan-1.10/botan/serp_simd.h -${PLIST.i386}include/botan-1.10/botan/serp_x86_32.h -include/botan-1.10/botan/serpent.h -include/botan-1.10/botan/sha160.h -${PLIST.i386}include/botan-1.10/botan/sha1_x86_32.h -${PLIST.x86_64}include/botan-1.10/botan/sha1_sse2.h -${PLIST.x86_64}include/botan-1.10/botan/sha1_x86_64.h -include/botan-1.10/botan/sha2_32.h -include/botan-1.10/botan/sha2_64.h -include/botan-1.10/botan/skein_512.h -include/botan-1.10/botan/skipjack.h -include/botan-1.10/botan/square.h -include/botan-1.10/botan/srp6.h -include/botan-1.10/botan/ssl3_mac.h -include/botan-1.10/botan/stream_cipher.h -include/botan-1.10/botan/sym_algo.h -include/botan-1.10/botan/symkey.h -include/botan-1.10/botan/tea.h -include/botan-1.10/botan/tiger.h -include/botan-1.10/botan/time.h -include/botan-1.10/botan/tls_client.h -include/botan-1.10/botan/tls_connection.h -include/botan-1.10/botan/tls_exceptn.h -include/botan-1.10/botan/tls_magic.h -include/botan-1.10/botan/tls_policy.h -include/botan-1.10/botan/tls_record.h -include/botan-1.10/botan/tls_server.h -include/botan-1.10/botan/tls_session_key.h -include/botan-1.10/botan/tls_suites.h -include/botan-1.10/botan/tss.h -include/botan-1.10/botan/turing.h -include/botan-1.10/botan/twofish.h -include/botan-1.10/botan/types.h -include/botan-1.10/botan/ui.h -include/botan-1.10/botan/version.h -include/botan-1.10/botan/whrlpool.h -include/botan-1.10/botan/wid_wake.h -include/botan-1.10/botan/x509_ca.h -include/botan-1.10/botan/x509_crl.h -include/botan-1.10/botan/x509_dn.h -include/botan-1.10/botan/x509_ext.h -include/botan-1.10/botan/x509_key.h -include/botan-1.10/botan/x509_obj.h -include/botan-1.10/botan/x509cert.h -include/botan-1.10/botan/x509self.h -include/botan-1.10/botan/x509stor.h -include/botan-1.10/botan/x919_mac.h -include/botan-1.10/botan/x931_rng.h -include/botan-1.10/botan/xtea.h -include/botan-1.10/botan/xtea_simd.h -include/botan-1.10/botan/xts.h -lib/libbotan-1.10.a -lib/libbotan-1.10.so -lib/libbotan-1.10.so.1 -lib/libbotan-1.10.so.1.17 -lib/pkgconfig/botan-1.10.pc -share/doc/${PKGNAME}/manual/algos.txt -share/doc/${PKGNAME}/manual/bigint.txt -share/doc/${PKGNAME}/manual/build_log.txt -share/doc/${PKGNAME}/manual/building.txt -share/doc/${PKGNAME}/manual/contents.txt -share/doc/${PKGNAME}/manual/credits.txt -share/doc/${PKGNAME}/manual/download.txt -share/doc/${PKGNAME}/manual/faq.txt -share/doc/${PKGNAME}/manual/filters.txt -share/doc/${PKGNAME}/manual/firststep.txt -share/doc/${PKGNAME}/manual/fpe.txt -share/doc/${PKGNAME}/manual/index.txt -share/doc/${PKGNAME}/manual/kdf.txt -share/doc/${PKGNAME}/manual/license.txt -share/doc/${PKGNAME}/manual/log.txt -share/doc/${PKGNAME}/manual/lowlevel.txt -share/doc/${PKGNAME}/manual/passhash.txt -share/doc/${PKGNAME}/manual/pbkdf.txt -share/doc/${PKGNAME}/manual/pgpkey.txt -share/doc/${PKGNAME}/manual/pubkey.txt -share/doc/${PKGNAME}/manual/python.txt -share/doc/${PKGNAME}/manual/reading.txt -share/doc/${PKGNAME}/manual/rng.txt -share/doc/${PKGNAME}/manual/secmem.txt -share/doc/${PKGNAME}/manual/ssl.txt -share/doc/${PKGNAME}/manual/support.txt -share/doc/${PKGNAME}/manual/users.txt -share/doc/${PKGNAME}/manual/x509.txt -share/doc/${PKGNAME}/readme.txt diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk deleted file mode 100644 index 2f50967d975..00000000000 --- a/security/botan/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/05/19 22:10:24 joerg Exp $ - -BUILDLINK_TREE+= botan - -.if !defined(BOTAN_BUILDLINK3_MK) -BOTAN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.botan+= botan>=1.10.12<1.11 -BUILDLINK_PKGSRCDIR.botan?= ../../security/botan -.endif # BOTAN_BUILDLINK3_MK - -BUILDLINK_TREE+= -botan diff --git a/security/botan/distinfo b/security/botan/distinfo deleted file mode 100644 index 41115de1b0b..00000000000 --- a/security/botan/distinfo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.23 2021/10/26 11:17:00 nia Exp $ - -BLAKE2s (Botan-1.10.17.tgz) = cfc64b5584b0de6dba5676ba77c76a1c23f2c251a34af2a784a834402579cf4c -SHA512 (Botan-1.10.17.tgz) = a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 -Size (Botan-1.10.17.tgz) = 2706678 bytes -SHA1 (patch-src_build-data_arch_arm.txt) = 23e40eb4bf43ca8c96f809b7f7a33de4a5149f47 -SHA1 (patch-src_build-data_makefile_unix.in) = 1ab76671c1acfe955d3e01d27e91687c0c382239 -SHA1 (patch-src_build-data_makefile_unix__shr.in) = ecd64f1ee80cb791d58052a75c6f33c5d4360a96 -SHA1 (patch-src_build-data_os_solaris.txt) = 6c3e522392f5c20bab5ea59c18ff149d65bc2ab6 -SHA1 (patch-src_entropy_unix_procs_info.txt) = 0d94e14b48f049112c8913ac244c358318974c6f -SHA1 (patch-src_ssl_rec__wri.cpp) = af2dafd229b46c69674644a35dc231cdcc888786 -SHA1 (patch-src_ssl_tls__client.cpp) = 6e9f70d09c764bc5374a8d986351c01fd45395af -SHA1 (patch-src_ssl_tls__client.h) = 585e07caa7495ef53dea67e6544154f0f9f56878 -SHA1 (patch-src_ssl_tls__record.h) = 9b7ca33ae84b96af0fcd81c8e7602e38b6ed4888 -SHA1 (patch-src_ssl_tls__server.cpp) = 50cdff006e3057933999f57243fb6ac319642346 -SHA1 (patch-src_ssl_tls__server.h) = 3604a94261b4c3510e98c140718037bb4288b41f diff --git a/security/botan/patches/patch-src_build-data_arch_arm.txt b/security/botan/patches/patch-src_build-data_arch_arm.txt deleted file mode 100644 index 12e72898123..00000000000 --- a/security/botan/patches/patch-src_build-data_arch_arm.txt +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_build-data_arch_arm.txt,v 1.2 2016/05/19 22:10:24 joerg Exp $ - ---- src/build-data/arch/arm.txt.orig 2016-02-03 07:57:06.000000000 +0000 -+++ src/build-data/arch/arm.txt -@@ -5,6 +5,7 @@ family arm - <aliases> - armel # For Debian - armhf # For Debian -+evbarm # NetBSD - </aliases> - - <submodels> diff --git a/security/botan/patches/patch-src_build-data_makefile_unix.in b/security/botan/patches/patch-src_build-data_makefile_unix.in deleted file mode 100644 index aa6356f7380..00000000000 --- a/security/botan/patches/patch-src_build-data_makefile_unix.in +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_build-data_makefile_unix.in,v 1.1 2016/05/19 22:10:24 joerg Exp $ - ---- src/build-data/makefile/unix.in.orig 2016-02-03 07:57:06.000000000 +0000 -+++ src/build-data/makefile/unix.in -@@ -12,12 +12,12 @@ VERSION = %{version} - SERIES = %{version_major}.%{version_minor} - - # Installation Settings --DESTDIR = %{prefix} -+PREFIX = ${DESTDIR}%{prefix} - --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan --DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/%{libdir} -+HEADERDIR = $(PREFIX)/%{includedir}/botan-$(SERIES)/botan -+DOCDIR = $(PREFIX)/%{docdir}/botan-$(VERSION) - PKGCONF_DIR = $(LIBDIR)/pkgconfig - - CONFIG_SCRIPT = %{botan_config} -@@ -89,7 +89,7 @@ distclean: clean - $(RM) botan_all.cpp botan_all.h - - install: $(LIBRARIES) docs -- $(ECHO) "Installing Botan into $(DESTDIR)... " -+ $(ECHO) "Installing Botan into $(PREFIX)... " - $(MKDIR_INSTALL) $(DOCDIR) - $(COPY_R) %{doc_output_dir}/* $(DOCDIR) - diff --git a/security/botan/patches/patch-src_build-data_makefile_unix__shr.in b/security/botan/patches/patch-src_build-data_makefile_unix__shr.in deleted file mode 100644 index 525e849c572..00000000000 --- a/security/botan/patches/patch-src_build-data_makefile_unix__shr.in +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_build-data_makefile_unix__shr.in,v 1.1 2016/05/19 22:10:24 joerg Exp $ - ---- src/build-data/makefile/unix_shr.in.orig 2016-02-03 07:57:06.000000000 +0000 -+++ src/build-data/makefile/unix_shr.in -@@ -14,12 +14,12 @@ VERSION = %{version} - SERIES = %{version_major}.%{version_minor} - - # Installation Settings --DESTDIR = %{prefix} -+PREFIX = ${DESTDIR}%{prefix} - --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan --DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/%{libdir} -+HEADERDIR = $(PREFIX)/%{includedir}/botan-$(SERIES)/botan -+DOCDIR = $(PREFIX)/%{docdir}/botan-$(VERSION) - PKGCONF_DIR = $(LIBDIR)/pkgconfig - - CONFIG_SCRIPT = %{botan_config} -@@ -103,7 +103,7 @@ distclean: clean - $(RM) botan_all.cpp botan_all.h - - install: $(LIBRARIES) docs -- $(ECHO) "Installing Botan into $(DESTDIR)... " -+ $(ECHO) "Installing Botan into $(PREFIX)... " - $(MKDIR_INSTALL) $(DOCDIR) - $(COPY_R) %{doc_output_dir}/* $(DOCDIR) - diff --git a/security/botan/patches/patch-src_build-data_os_solaris.txt b/security/botan/patches/patch-src_build-data_os_solaris.txt deleted file mode 100644 index 74c9abdce85..00000000000 --- a/security/botan/patches/patch-src_build-data_os_solaris.txt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_build-data_os_solaris.txt,v 1.1 2016/06/03 11:52:42 fhajny Exp $ - -Modern SunOS platforms might not have /usr/ucb. Fixes install on -SmartOS and other. - ---- src/build-data/os/solaris.txt.orig 2016-02-03 07:57:06.000000000 +0000 -+++ src/build-data/os/solaris.txt -@@ -1,8 +1,5 @@ - os_type unix - --install_cmd_data '/usr/ucb/install -m 644' --install_cmd_exec '/usr/ucb/install -m 755' -- - <target_features> - posix_mlock - gettimeofday diff --git a/security/botan/patches/patch-src_entropy_unix_procs_info.txt b/security/botan/patches/patch-src_entropy_unix_procs_info.txt deleted file mode 100644 index f6f05011f69..00000000000 --- a/security/botan/patches/patch-src_entropy_unix_procs_info.txt +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_entropy_unix_procs_info.txt,v 1.2 2016/05/19 22:10:24 joerg Exp $ - ---- src/entropy/unix_procs/info.txt.orig 2016-02-03 07:57:06.000000000 +0000 -+++ src/entropy/unix_procs/info.txt -@@ -24,6 +24,7 @@ netbsd - qnx - solaris - tru64 -+dragonfly - </os> - - <requires> diff --git a/security/botan/patches/patch-src_ssl_rec__wri.cpp b/security/botan/patches/patch-src_ssl_rec__wri.cpp deleted file mode 100644 index 1b16ca90c2a..00000000000 --- a/security/botan/patches/patch-src_ssl_rec__wri.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_ssl_rec__wri.cpp,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/rec_wri.cpp.orig 2016-05-25 20:42:21.289208827 +0000 -+++ src/ssl/rec_wri.cpp -@@ -16,7 +16,7 @@ namespace Botan { - /** - * Record_Writer Constructor - */ --Record_Writer::Record_Writer(std::tr1::function<void (const byte[], size_t)> out) : -+Record_Writer::Record_Writer(function<void (const byte[], size_t)> out) : - output_fn(out), - buffer(DEFAULT_BUFFERSIZE) - { diff --git a/security/botan/patches/patch-src_ssl_tls__client.cpp b/security/botan/patches/patch-src_ssl_tls__client.cpp deleted file mode 100644 index 487537feb91..00000000000 --- a/security/botan/patches/patch-src_ssl_tls__client.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_ssl_tls__client.cpp,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/tls_client.cpp.orig 2016-05-25 20:42:19.378772780 +0000 -+++ src/ssl/tls_client.cpp -@@ -81,8 +81,8 @@ void client_check_state(Handshake_Type n - /** - * TLS Client Constructor - */ --TLS_Client::TLS_Client(std::tr1::function<size_t (byte[], size_t)> input_fn, -- std::tr1::function<void (const byte[], size_t)> output_fn, -+TLS_Client::TLS_Client(function<size_t (byte[], size_t)> input_fn, -+ function<void (const byte[], size_t)> output_fn, - const TLS_Policy& policy, - RandomNumberGenerator& rng) : - input_fn(input_fn), diff --git a/security/botan/patches/patch-src_ssl_tls__client.h b/security/botan/patches/patch-src_ssl_tls__client.h deleted file mode 100644 index 58625f3f2a3..00000000000 --- a/security/botan/patches/patch-src_ssl_tls__client.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_ssl_tls__client.h,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/tls_client.h.orig 2016-05-25 20:42:17.404292837 +0000 -+++ src/ssl/tls_client.h -@@ -33,8 +33,8 @@ class BOTAN_DLL TLS_Client : public TLS_ - void add_client_cert(const X509_Certificate& cert, - Private_Key* cert_key); - -- TLS_Client(std::tr1::function<size_t (byte[], size_t)> input_fn, -- std::tr1::function<void (const byte[], size_t)> output_fn, -+ TLS_Client(function<size_t (byte[], size_t)> input_fn, -+ function<void (const byte[], size_t)> output_fn, - const TLS_Policy& policy, - RandomNumberGenerator& rng); - -@@ -51,7 +51,7 @@ class BOTAN_DLL TLS_Client : public TLS_ - void read_handshake(byte, const MemoryRegion<byte>&); - void process_handshake_msg(Handshake_Type, const MemoryRegion<byte>&); - -- std::tr1::function<size_t (byte[], size_t)> input_fn; -+ function<size_t (byte[], size_t)> input_fn; - - const TLS_Policy& policy; - RandomNumberGenerator& rng; diff --git a/security/botan/patches/patch-src_ssl_tls__record.h b/security/botan/patches/patch-src_ssl_tls__record.h deleted file mode 100644 index 1ea8cf4c538..00000000000 --- a/security/botan/patches/patch-src_ssl_tls__record.h +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-src_ssl_tls__record.h,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/tls_record.h.orig 2016-05-25 20:40:33.153653548 +0000 -+++ src/ssl/tls_record.h -@@ -17,7 +17,7 @@ - - #if defined(BOTAN_USE_STD_TR1) - --#if defined(BOTAN_BUILD_COMPILER_IS_MSVC) -+#if defined(BOTAN_BUILD_COMPILER_IS_MSVC) || defined(_LIBCPP_VERSION) - #include <functional> - #else - #include <tr1/functional> -@@ -31,7 +31,13 @@ - - namespace Botan { - -+#if defined(_LIBCPP_VERSION) -+using namespace std::placeholders; -+using std::function; -+#else - using namespace std::tr1::placeholders; -+using std::tr1::function; -+#endif - - /** - * TLS Record Writer -@@ -52,7 +58,7 @@ class BOTAN_DLL Record_Writer - - void reset(); - -- Record_Writer(std::tr1::function<void (const byte[], size_t)> output_fn); -+ Record_Writer(function<void (const byte[], size_t)> output_fn); - - ~Record_Writer() { delete mac; } - private: -@@ -60,7 +66,7 @@ class BOTAN_DLL Record_Writer - void send_record(byte type, byte major, byte minor, - const byte input[], size_t length); - -- std::tr1::function<void (const byte[], size_t)> output_fn; -+ function<void (const byte[], size_t)> output_fn; - Pipe cipher; - MessageAuthenticationCode* mac; - diff --git a/security/botan/patches/patch-src_ssl_tls__server.cpp b/security/botan/patches/patch-src_ssl_tls__server.cpp deleted file mode 100644 index 10c10cbdb8b..00000000000 --- a/security/botan/patches/patch-src_ssl_tls__server.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_ssl_tls__server.cpp,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/tls_server.cpp.orig 2016-05-25 20:43:18.345421693 +0000 -+++ src/ssl/tls_server.cpp -@@ -85,8 +85,8 @@ void server_check_state(Handshake_Type n - /* - * TLS Server Constructor - */ --TLS_Server::TLS_Server(std::tr1::function<size_t (byte[], size_t)> input_fn, -- std::tr1::function<void (const byte[], size_t)> output_fn, -+TLS_Server::TLS_Server(function<size_t (byte[], size_t)> input_fn, -+ function<void (const byte[], size_t)> output_fn, - const TLS_Policy& policy, - RandomNumberGenerator& rng, - const X509_Certificate& cert, diff --git a/security/botan/patches/patch-src_ssl_tls__server.h b/security/botan/patches/patch-src_ssl_tls__server.h deleted file mode 100644 index c2bdbc4a042..00000000000 --- a/security/botan/patches/patch-src_ssl_tls__server.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_ssl_tls__server.h,v 1.1 2016/05/31 21:36:17 joerg Exp $ - ---- src/ssl/tls_server.h.orig 2016-05-25 20:42:12.789110157 +0000 -+++ src/ssl/tls_server.h -@@ -36,8 +36,8 @@ class BOTAN_DLL TLS_Server : public TLS_ - * FIXME: support cert chains (!) - * FIXME: support anonymous servers - */ -- TLS_Server(std::tr1::function<size_t (byte[], size_t)> input_fn, -- std::tr1::function<void (const byte[], size_t)> output_fn, -+ TLS_Server(function<size_t (byte[], size_t)> input_fn, -+ function<void (const byte[], size_t)> output_fn, - const TLS_Policy& policy, - RandomNumberGenerator& rng, - const X509_Certificate& cert, -@@ -53,7 +53,7 @@ class BOTAN_DLL TLS_Server : public TLS_ - - void process_handshake_msg(Handshake_Type, const MemoryRegion<byte>&); - -- std::tr1::function<size_t (byte[], size_t)> input_fn; -+ function<size_t (byte[], size_t)> input_fn; - - const TLS_Policy& policy; - RandomNumberGenerator& rng; diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile index dc616566f1e..b4c6c724866 100644 --- a/security/keepassxc/Makefile +++ b/security/keepassxc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2022/03/31 23:30:16 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2022/04/01 08:07:28 wiz Exp $ DISTNAME= keepassxc-${GITHUB_RELEASE}-src PKGNAME= ${DISTNAME:S/-src//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/} GITHUB_RELEASE= 2.7.0 @@ -41,7 +41,7 @@ pre-configure: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../security/argon2/buildlink3.mk" -.include "../../security/botan-devel/buildlink3.mk" +.include "../../security/botan2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" diff --git a/security/opendnssec/options.mk b/security/opendnssec/options.mk index 52ddfea7cd1..c0537d16dfa 100644 --- a/security/opendnssec/options.mk +++ b/security/opendnssec/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/01/24 20:30:28 pettai Exp $ +# $NetBSD: options.mk,v 1.3 2022/04/01 08:07:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec PKG_SUPPORTED_OPTIONS= softhsm @@ -10,6 +10,5 @@ PKG_SUGGESTED_OPTIONS= softhsm ### SoftHSM ### .if !empty(PKG_OPTIONS:Msofthsm) -DEPENDS+= softhsm-[0-9]*:../../security/softhsm .include "../../security/softhsm/buildlink3.mk" .endif diff --git a/security/opendnssec2/options.mk b/security/opendnssec2/options.mk index 50227dcbaf1..139a58c4eb2 100644 --- a/security/opendnssec2/options.mk +++ b/security/opendnssec2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/11/06 13:44:38 he Exp $ +# $NetBSD: options.mk,v 1.2 2022/04/01 08:07:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec PKG_SUPPORTED_OPTIONS= softhsm2 @@ -10,6 +10,5 @@ PKG_SUGGESTED_OPTIONS= softhsm2 ### SoftHSM ### .if !empty(PKG_OPTIONS:Msofthsm2) -DEPENDS+= softhsm2-[0-9]*:../../security/softhsm2 .include "../../security/softhsm2/buildlink3.mk" .endif diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile index 6ebcb1b5fb4..3362a34cef0 100644 --- a/security/softhsm/Makefile +++ b/security/softhsm/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2021/12/08 16:02:36 adam Exp $ -# +# $NetBSD: Makefile,v 1.50 2022/04/01 08:07:28 wiz Exp $ DISTNAME= softhsm-1.3.7 -PKGREVISION= 19 +PKGREVISION= 20 CATEGORIES= security MASTER_SITES= https://www.opendnssec.org/files/source/ @@ -38,5 +37,5 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/softhsm.conf ${DESTDIR}${EGDIR} .include "../../databases/sqlite3/buildlink3.mk" -.include "../../security/botan/buildlink3.mk" +.include "../../security/botan1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/softhsm/buildlink3.mk b/security/softhsm/buildlink3.mk index 6589f31e87d..0b9780c311c 100644 --- a/security/softhsm/buildlink3.mk +++ b/security/softhsm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2021/04/21 11:40:37 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2022/04/01 08:07:28 wiz Exp $ BUILDLINK_TREE+= softhsm @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.softhsm+= softhsm>=1.3.7nb18 BUILDLINK_PKGSRCDIR.softhsm?= ../../security/softhsm .include "../../databases/sqlite3/buildlink3.mk" -.include "../../security/botan/buildlink3.mk" +.include "../../security/botan1/buildlink3.mk" .endif # SOFTHSM_BUILDLINK3_MK BUILDLINK_TREE+= -softhsm diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile index 8626a43a826..c8aff28817b 100644 --- a/security/softhsm2/Makefile +++ b/security/softhsm2/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2022/03/31 23:30:16 wiz Exp $ -# +# $NetBSD: Makefile,v 1.15 2022/04/01 08:07:28 wiz Exp $ VERSION= 2.6.1 DISTNAME= softhsm-${VERSION} PKGNAME= softhsm2-${VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= security MASTER_SITES= http://www.opendnssec.org/files/source/ @@ -47,6 +46,6 @@ pre-install: USE_BUILTIN.sqlite3=NO .include "../../databases/sqlite3/buildlink3.mk" -.include "../../security/botan-devel/buildlink3.mk" +.include "../../security/botan2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/softhsm2/buildlink3.mk b/security/softhsm2/buildlink3.mk index bedd886e72b..a8d1425aee9 100644 --- a/security/softhsm2/buildlink3.mk +++ b/security/softhsm2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2022/03/31 23:30:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2022/04/01 08:07:28 wiz Exp $ BUILDLINK_TREE+= softhsm2 @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.softhsm2+= softhsm2>=2.6.1nb6 BUILDLINK_PKGSRCDIR.softhsm2?= ../../security/softhsm2 .include "../../databases/sqlite3/buildlink3.mk" -.include "../../security/botan-devel/buildlink3.mk" +.include "../../security/botan2/buildlink3.mk" .endif # SOFTHSM2_BUILDLINK3_MK BUILDLINK_TREE+= -softhsm2 |