--- Makefile (revision 451938) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= botan -PORTVERSION= 1.10.13 -PORTREVISION= 6 +PORTVERSION= 1.10.17 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 110 @@ -26,7 +25,7 @@ MAKE_ARGS= CXX="${CXX}" LIB_OPT="${CXXFLAGS}" USE_LDCONFIG= yes PLIST_FILES= bin/botan-config-1.10 lib/libbotan-1.10.a lib/libbotan-1.10.so lib/libbotan-1.10.so.1 \ - lib/libbotan-1.10.so.1.13 libdata/pkgconfig/botan-1.10.pc + lib/libbotan-1.10.so.1.17 libdata/pkgconfig/botan-1.10.pc DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= * @@ -33,30 +32,22 @@ BROKEN_aarch64= Fails to configure: unknown or unidentifiable processor arm64 -.include +SSL_USES= ssl +SSL_CONFIGURE_WITH= openssl +SSL_VARS= BROKEN_SSL= openssl-devel -.if ${PORT_OPTIONS:MSSL} -USES+= ssl -CONFIGURE_ARGS+=--with-openssl -.endif +GMP_USES= localbase:ldflags +GMP_LIB_DEPENDS= libgmp.so:math/gmp +GMP_CONFIGURE_WITH= gnump -.if ${PORT_OPTIONS:MGMP} -USES+= localbase:ldflags -LIB_DEPENDS+= libgmp.so:math/gmp -CONFIGURE_ARGS+=--with-gnump -.endif - -.include - post-patch: ${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ ${WRKSRC}/configure.py -.if ! ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: ${REINPLACE_CMD} -e '/DOCDIR/d' \ ${WRKSRC}/src/build-data/makefile/unix_shr.in -.endif post-install: @(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST} -.include +.include --- distinfo (revision 451938) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465867941 -SHA256 (Botan-1.10.13.tgz) = 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 -SIZE (Botan-1.10.13.tgz) = 2710181 +TIMESTAMP = 1507819766 +SHA256 (Botan-1.10.17.tgz) = 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613 +SIZE (Botan-1.10.17.tgz) = 2706678 --- files/patch-src_engine_openssl_ossl__bc.cpp (nonexistent) +++ files/patch-src_engine_openssl_ossl__bc.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/engine/openssl/ossl_bc.cpp.orig 2017-10-02 06:00:00 UTC ++++ src/engine/openssl/ossl_bc.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER + #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" + #endif + --- files/patch-src_engine_openssl_ossl__md.cpp (nonexistent) +++ files/patch-src_engine_openssl_ossl__md.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/engine/openssl/ossl_md.cpp.orig 2017-10-02 06:00:00 UTC ++++ src/engine/openssl/ossl_md.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER + #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" + #endif +