diff options
author | joerg <joerg> | 2015-05-14 18:39:24 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-05-14 18:39:24 +0000 |
commit | b5a9fadb7035fabe7349e9c3e4eac864d6226538 (patch) | |
tree | 0eaee0e1884b09fa45bda6ccd62d6db78661bb84 /security | |
parent | b8d89a6976e881df815bf8ac60ec1f34542f94dc (diff) | |
download | pkgsrc-b5a9fadb7035fabe7349e9c3e4eac864d6226538.tar.gz |
Update to Botan 1.11.16:
- Switch to using IETF ALPN extension for negotiating application-level
protocols for TLS in place of NPN extension.
- Optimizations for ECDSA
- Allow using OpenSSL's RSA implementation
- RC4 is deprecated and will be removed in the future
- Removed global state like the global PRNG.
- Cleaner registration for algorithm etc, potentially requires changes
for statically linked programs.
- Simple C binding for common operations
- Optimized reductors for P-192, P-224, P-256, P-384, P-521
- Experimental OCB support for TLS
- Reduced memory footprint of CTR
- botan-config has been merged into botan
- Removal of SSLv3 support
- MCEIES, DTLS-STRP, SipHash, Curve25519, Poly1305, ChaCha20Poly1305
supported
- Changed format of serialized TLS sessions
- TLS heartbeat messages support user-defined size of padding for PMTU
discovery
- RFC 6979 support for deterministic nouns and signatures with DSA and ECDSA
- Support for TLS fallback signaling
Diffstat (limited to 'security')
-rw-r--r-- | security/botan-devel/Makefile | 14 | ||||
-rw-r--r-- | security/botan-devel/PLIST | 50 | ||||
-rw-r--r-- | security/botan-devel/distinfo | 8 | ||||
-rw-r--r-- | security/botan-devel/patches/patch-src_build-data_cc_clang.txt | 14 | ||||
-rw-r--r-- | security/botan-devel/patches/patch-src_build-data_makefile_header.in | 21 | ||||
-rw-r--r-- | security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp | 26 | ||||
-rw-r--r-- | security/botan-devel/patches/patch-src_lib_kdf_kdf.h | 12 |
7 files changed, 44 insertions, 101 deletions
diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile index b1e71af5af4..a228cc79dd4 100644 --- a/security/botan-devel/Makefile +++ b/security/botan-devel/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2015/04/17 15:52:57 adam Exp $ +# $NetBSD: Makefile,v 1.8 2015/05/14 18:39:24 joerg Exp $ -DISTNAME= Botan-1.11.8 +DISTNAME= Botan-1.11.16 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 4 CATEGORIES= security -MASTER_SITES= http://files.randombit.net/botan/ -EXTRACT_SUFX= .tbz +MASTER_SITES= http://botan.randombit.net/releases/ +EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://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 +CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost --destdir=${DESTDIR}${PREFIX} .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) @@ -30,6 +29,8 @@ MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} USE_TOOLS+= gmake +PY_PATCHPLIST= yes + PLIST_VARS+= x86 x86_64 .if ${MACHINE_ARCH} == "x86_64" @@ -42,4 +43,5 @@ PLIST.x86= yes .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 index ecd77d9f32f..43190ba33e5 100644 --- a/security/botan-devel/PLIST +++ b/security/botan-devel/PLIST @@ -1,14 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2014/05/21 01:22:14 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/05/14 18:39:24 joerg Exp $ bin/botan -bin/botan-config-1.11 include/botan-1.11/botan/adler32.h -include/botan-1.11/botan/aead_filt.h include/botan-1.11/botan/aead.h include/botan-1.11/botan/aes.h ${PLIST.x86}include/botan-1.11/botan/aes_ni.h ${PLIST.x86}include/botan-1.11/botan/aes_ssse3.h include/botan-1.11/botan/alg_id.h -include/botan-1.11/botan/algo_factory.h include/botan-1.11/botan/asn1_alt_name.h include/botan-1.11/botan/asn1_attribute.h include/botan-1.11/botan/asn1_obj.h @@ -43,20 +40,25 @@ include/botan-1.11/botan/ccm.h include/botan-1.11/botan/cert_status.h include/botan-1.11/botan/certstor.h include/botan-1.11/botan/cfb.h +include/botan-1.11/botan/chacha20poly1305.h include/botan-1.11/botan/chacha.h include/botan-1.11/botan/charset.h include/botan-1.11/botan/cipher_mode.h include/botan-1.11/botan/cmac.h +include/botan-1.11/botan/code_based_util.h include/botan-1.11/botan/comb4p.h +include/botan-1.11/botan/comp_filter.h +include/botan-1.11/botan/compression.h include/botan-1.11/botan/cpuid.h include/botan-1.11/botan/crc24.h include/botan-1.11/botan/crc32.h include/botan-1.11/botan/credentials_manager.h include/botan-1.11/botan/crl_ent.h include/botan-1.11/botan/cryptobox.h -include/botan-1.11/botan/cryptobox_psk.h include/botan-1.11/botan/ctr.h +include/botan-1.11/botan/curve25519.h include/botan-1.11/botan/curve_gfp.h +include/botan-1.11/botan/database.h include/botan-1.11/botan/data_snk.h include/botan-1.11/botan/data_src.h include/botan-1.11/botan/datastor.h @@ -69,7 +71,6 @@ include/botan-1.11/botan/dl_algo.h include/botan-1.11/botan/dl_group.h include/botan-1.11/botan/dlies.h include/botan-1.11/botan/dsa.h -include/botan-1.11/botan/dyn_engine.h include/botan-1.11/botan/eax.h include/botan-1.11/botan/ecb.h include/botan-1.11/botan/ecc_key.h @@ -79,23 +80,26 @@ include/botan-1.11/botan/ec_group.h include/botan-1.11/botan/elgamal.h include/botan-1.11/botan/eme.h include/botan-1.11/botan/eme_pkcs.h +include/botan-1.11/botan/eme_raw.h include/botan-1.11/botan/emsa1_bsi.h include/botan-1.11/botan/emsa1.h include/botan-1.11/botan/emsa.h include/botan-1.11/botan/emsa_pkcs1.h include/botan-1.11/botan/emsa_raw.h include/botan-1.11/botan/emsa_x931.h -include/botan-1.11/botan/engine.h include/botan-1.11/botan/entropy_src.h include/botan-1.11/botan/exceptn.h include/botan-1.11/botan/fd_unix.h +include/botan-1.11/botan/ffi.h include/botan-1.11/botan/filter.h include/botan-1.11/botan/filters.h include/botan-1.11/botan/fpe_fe1.h +include/botan-1.11/botan/fs.h include/botan-1.11/botan/gcm.h include/botan-1.11/botan/get_byte.h -include/botan-1.11/botan/get_pbe.h -include/botan-1.11/botan/global_state.h +include/botan-1.11/botan/gf2m_rootfind_dcmp.h +include/botan-1.11/botan/gf2m_small_m.h +include/botan-1.11/botan/goppa_code.h include/botan-1.11/botan/gost_28147.h include/botan-1.11/botan/gost_3410.h include/botan-1.11/botan/gost_3411.h @@ -105,6 +109,7 @@ include/botan-1.11/botan/hash_id.h include/botan-1.11/botan/hex_filt.h include/botan-1.11/botan/hex.h include/botan-1.11/botan/hkdf.h +include/botan-1.11/botan/hmac_drbg.h include/botan-1.11/botan/hmac.h include/botan-1.11/botan/hmac_rng.h include/botan-1.11/botan/http_util.h @@ -121,13 +126,16 @@ include/botan-1.11/botan/key_constraint.h include/botan-1.11/botan/key_filt.h include/botan-1.11/botan/keypair.h include/botan-1.11/botan/key_spec.h -include/botan-1.11/botan/libstate.h include/botan-1.11/botan/lion.h include/botan-1.11/botan/loadstor.h include/botan-1.11/botan/locking_allocator.h include/botan-1.11/botan/lookup.h include/botan-1.11/botan/mac.h include/botan-1.11/botan/mars.h +include/botan-1.11/botan/mceies.h +include/botan-1.11/botan/mce_kem.h +include/botan-1.11/botan/mceliece.h +include/botan-1.11/botan/mceliece_key.h include/botan-1.11/botan/md2.h include/botan-1.11/botan/md4.h include/botan-1.11/botan/md5.h @@ -153,7 +161,6 @@ include/botan-1.11/botan/package.h include/botan-1.11/botan/par_hash.h include/botan-1.11/botan/parsing.h include/botan-1.11/botan/passhash9.h -include/botan-1.11/botan/pbe.h include/botan-1.11/botan/pbes2.h include/botan-1.11/botan/pbkdf1.h include/botan-1.11/botan/pbkdf2.h @@ -162,12 +169,12 @@ include/botan-1.11/botan/pem.h include/botan-1.11/botan/pipe.h include/botan-1.11/botan/pkcs10.h include/botan-1.11/botan/pkcs8.h -include/botan-1.11/botan/pk_filts.h include/botan-1.11/botan/pk_keys.h include/botan-1.11/botan/pk_ops.h include/botan-1.11/botan/point_gfp.h +include/botan-1.11/botan/poly1305.h +include/botan-1.11/botan/polyn_gf2m.h include/botan-1.11/botan/pow_mod.h -include/botan-1.11/botan/prf_ssl3.h include/botan-1.11/botan/prf_tls.h include/botan-1.11/botan/prf_x942.h include/botan-1.11/botan/pssr.h @@ -178,6 +185,7 @@ include/botan-1.11/botan/rc5.h include/botan-1.11/botan/rc6.h include/botan-1.11/botan/reducer.h include/botan-1.11/botan/rfc3394.h +include/botan-1.11/botan/rfc6979.h include/botan-1.11/botan/rmd128.h include/botan-1.11/botan/rmd160.h include/botan-1.11/botan/rng.h @@ -190,22 +198,23 @@ include/botan-1.11/botan/scan_name.h include/botan-1.11/botan/secmem.h include/botan-1.11/botan/secqueue.h include/botan-1.11/botan/seed.h -include/botan-1.11/botan/selftest.h include/botan-1.11/botan/serpent.h include/botan-1.11/botan/serp_simd.h include/botan-1.11/botan/sha160.h ${PLIST.x86}include/botan-1.11/botan/sha1_sse2.h -${PLIST.x86_64}include/botan-1.11/botan/sha1_x86_64.h +${PLIST.x86}include/botan-1.11/botan/sha1_x86_64.h include/botan-1.11/botan/sha2_32.h include/botan-1.11/botan/sha2_64.h +include/botan-1.11/botan/siphash.h include/botan-1.11/botan/siv.h include/botan-1.11/botan/skein_512.h include/botan-1.11/botan/srp6_files.h include/botan-1.11/botan/srp6.h -include/botan-1.11/botan/ssl3_mac.h include/botan-1.11/botan/stream_cipher.h +include/botan-1.11/botan/stream_mode.h include/botan-1.11/botan/sym_algo.h include/botan-1.11/botan/symkey.h +include/botan-1.11/botan/system_rng.h include/botan-1.11/botan/tea.h ${PLIST.x86_64}include/botan-1.11/botan/threefish_avx2.h include/botan-1.11/botan/threefish.h @@ -223,6 +232,7 @@ include/botan-1.11/botan/tls_server.h include/botan-1.11/botan/tls_server_info.h include/botan-1.11/botan/tls_session.h include/botan-1.11/botan/tls_session_manager.h +include/botan-1.11/botan/tls_session_manager_sql.h include/botan-1.11/botan/tls_version.h include/botan-1.11/botan/transform_filter.h include/botan-1.11/botan/transform.h @@ -249,15 +259,18 @@ include/botan-1.11/botan/xts.h include/botan-1.11/botan/zlib.h lib/libbotan-1.11.a lib/libbotan-1.11.so -lib/libbotan-1.11.so.8 -lib/libbotan-1.11.so.8.8 +lib/libbotan-1.11.so.16 +lib/libbotan-1.11.so.16.16 lib/pkgconfig/botan-1.11.pc +${PYSITELIB}/botan.py +share/doc/${PKGNAME}/license.txt share/doc/${PKGNAME}/manual/aead.rst share/doc/${PKGNAME}/manual/bigint.rst share/doc/${PKGNAME}/manual/building.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/firststep.rst share/doc/${PKGNAME}/manual/fpe.rst @@ -275,3 +288,4 @@ share/doc/${PKGNAME}/manual/srp.rst share/doc/${PKGNAME}/manual/tls.rst share/doc/${PKGNAME}/manual/versions.rst share/doc/${PKGNAME}/manual/x509.rst +share/doc/${PKGNAME}/news.txt diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo index 7cb2dc6970c..4534ecbc8e3 100644 --- a/security/botan-devel/distinfo +++ b/security/botan-devel/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2014/05/23 12:05:10 joerg Exp $ +$NetBSD: distinfo,v 1.4 2015/05/14 18:39:24 joerg Exp $ -SHA1 (Botan-1.11.8.tbz) = bde51183fd601b1cf1e687a1fe88eb2407c2db32 -RMD160 (Botan-1.11.8.tbz) = 62f1ca66f5eceb18e9218321e8b983af3743167f -Size (Botan-1.11.8.tbz) = 2193897 bytes +SHA1 (Botan-1.11.16.tgz) = 7214da75a638a7b4a233aca4eccd94d8c688fd52 +RMD160 (Botan-1.11.16.tgz) = 7b82dd41243b7bb53d3d667db58afd7e2f948871 +Size (Botan-1.11.16.tgz) = 2843785 bytes SHA1 (patch-src_build-data_arch_arm.txt) = 977a5917ee94e1bafb50f467e99d0f6e1e561ec9 SHA1 (patch-src_build-data_cc_clang.txt) = e36a85e036765d103c06eedac2d9f553a9202173 SHA1 (patch-src_build-data_makefile_header.in) = 9ef8fba7f7a4d665d95478cdd87d58839d438f80 diff --git a/security/botan-devel/patches/patch-src_build-data_cc_clang.txt b/security/botan-devel/patches/patch-src_build-data_cc_clang.txt deleted file mode 100644 index 87bb9413dc8..00000000000 --- a/security/botan-devel/patches/patch-src_build-data_cc_clang.txt +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_build-data_cc_clang.txt,v 1.1 2014/03/05 21:22:38 joerg Exp $ - ---- src/build-data/cc/clang.txt.orig 2014-03-01 16:46:28.000000000 +0000 -+++ src/build-data/cc/clang.txt -@@ -53,8 +53,7 @@ ivybridge -> "-march=core-avx-i" - </mach_opt> - - <mach_abi_linking> --#all -> "-stdlib=libc++ -pthread" --all -> "-stdlib=libstdc++ -pthread" -+all -> "-pthread" - - x86_64 -> "-m64" - ppc64 -> "-m64" diff --git a/security/botan-devel/patches/patch-src_build-data_makefile_header.in b/security/botan-devel/patches/patch-src_build-data_makefile_header.in deleted file mode 100644 index f2c0fc026f4..00000000000 --- a/security/botan-devel/patches/patch-src_build-data_makefile_header.in +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_build-data_makefile_header.in,v 1.1 2014/02/24 20:49:14 joerg Exp $ - ---- src/build-data/makefile/header.in.orig 2014-02-24 21:22:30.086425663 +0100 -+++ src/build-data/makefile/header.in 2014-02-24 21:22:48.658425876 +0100 -@@ -21,11 +21,11 @@ - BRANCH = %{version_major}.%{version_minor} - - # Installation Settings --DESTDIR = %{destdir} --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(BRANCH)/botan --DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) -+PREFIX = ${DESTDIR}%{destdir} -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/%{libdir} -+HEADERDIR = $(PREFIX)/%{includedir}/botan-$(BRANCH)/botan -+DOCDIR = $(PREFIX)/%{docdir}/botan-$(VERSION) - PKGCONF_DIR = $(LIBDIR)/pkgconfig - - CONFIG_SCRIPT = %{botan_config} diff --git a/security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp b/security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp deleted file mode 100644 index a6d4b6a3b4f..00000000000 --- a/security/botan-devel/patches/patch-src_lib_alloc_locking__allocator_locking__allocator.cpp +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_lib_alloc_locking__allocator_locking__allocator.cpp,v 1.1 2014/03/05 21:22:38 joerg Exp $ - ---- src/lib/alloc/locking_allocator/locking_allocator.cpp.orig 2014-02-14 02:36:03.000000000 +0000 -+++ src/lib/alloc/locking_allocator/locking_allocator.cpp -@@ -7,9 +7,10 @@ - - #include <botan/locking_allocator.h> - #include <botan/mem_ops.h> --#include <algorithm> - #include <sys/mman.h> - #include <sys/resource.h> -+#include <algorithm> -+#include <string> - - namespace Botan { - -@@ -213,6 +214,9 @@ mlock_allocator::mlock_allocator() : - #if !defined(MAP_NOCORE) - #define MAP_NOCORE 0 - #endif -+#if !defined(MAP_ANONYMOUS) -+ #define MAP_ANONYMOUS MAP_ANON -+#endif - - if(m_poolsize) - { diff --git a/security/botan-devel/patches/patch-src_lib_kdf_kdf.h b/security/botan-devel/patches/patch-src_lib_kdf_kdf.h deleted file mode 100644 index c7679d6c91f..00000000000 --- a/security/botan-devel/patches/patch-src_lib_kdf_kdf.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_lib_kdf_kdf.h,v 1.1 2014/03/05 21:22:38 joerg Exp $ - ---- src/lib/kdf/kdf.h.orig 2014-03-01 16:36:51.000000000 +0000 -+++ src/lib/kdf/kdf.h -@@ -10,6 +10,7 @@ - - #include <botan/secmem.h> - #include <botan/types.h> -+#include <string> - - namespace Botan { - |