From owner-svn-ports-head@freebsd.org Tue Sep 26 23:37:21 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E1DEE25979; Tue, 26 Sep 2017 23:37:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1899280023; Tue, 26 Sep 2017 23:37:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8QNbKvX013885; Tue, 26 Sep 2017 23:37:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8QNbKwN013882; Tue, 26 Sep 2017 23:37:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201709262337.v8QNbKwN013882@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 26 Sep 2017 23:37:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450702 - in head/security/botan110: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/security/botan110: . files X-SVN-Commit-Revision: 450702 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Sep 2017 23:37:21 -0000 Author: jbeich Date: Tue Sep 26 23:37:19 2017 New Revision: 450702 URL: https://svnweb.freebsd.org/changeset/ports/450702 Log: security/botan110: make ECC mandatory Boost >= 1.65 no longer provides TR1. However, GCC defaults to C++14 while libc++ leaks enough C++11 features that TR1 can be emulated in C++98 mode. PR: 220760 Approved by: portmgr blanket Tested by: Dmitri Goutnik, Ralf van der Enden Added: head/security/botan110/files/patch-src_ssl_tls__record.h (contents, props changed) Modified: head/security/botan110/Makefile (contents, props changed) Modified: head/security/botan110/Makefile ============================================================================== --- head/security/botan110/Makefile Tue Sep 26 22:32:04 2017 (r450701) +++ head/security/botan110/Makefile Tue Sep 26 23:37:19 2017 (r450702) @@ -3,7 +3,7 @@ PORTNAME= botan PORTVERSION= 1.10.13 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 110 @@ -15,14 +15,14 @@ COMMENT= Portable, easy to use, and efficient C++ cryp LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/doc/license.txt -OPTIONS_DEFINE= SSL GMP ECC DOCS -OPTIONS_DEFAULT= SSL GMP ECC -ECC_DESC= ECC support +OPTIONS_DEFINE= SSL GMP DOCS +OPTIONS_DEFAULT= SSL GMP USES= compiler gmake python:build tar:tgz HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.py -CONFIGURE_ARGS= --prefix=${PREFIX} --with-bzip2 --with-zlib +CONFIGURE_ARGS= --prefix=${PREFIX} --cc ${CHOSEN_COMPILER_TYPE} \ + --with-tr1-implementation=system --with-bzip2 --with-zlib 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 \ @@ -41,23 +41,12 @@ CONFIGURE_ARGS+=--with-openssl .endif .if ${PORT_OPTIONS:MGMP} +USES+= localbase:ldflags LIB_DEPENDS+= libgmp.so:math/gmp CONFIGURE_ARGS+=--with-gnump -MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${PORT_OPTIONS:MECC} -BROKEN= fails to build with boost 1.65, see bug 220760 -BUILD_DEPENDS+= ${LOCALBASE}/include/boost/tr1/memory.hpp:devel/boost-libs -CONFIGURE_ARGS+=--with-tr1-implementation=boost -CXXFLAGS+= -I${LOCALBASE}/include -.else -CONFIGURE_ARGS+=--with-tr1-implementation=none -.endif - .include - -CONFIGURE_ARGS+=--cc ${COMPILER_TYPE} post-patch: ${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ Added: head/security/botan110/files/patch-src_ssl_tls__record.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/botan110/files/patch-src_ssl_tls__record.h Tue Sep 26 23:37:19 2017 (r450702) @@ -0,0 +1,31 @@ +--- src/ssl/tls_record.h.orig 2016-04-28 13:27:08 UTC ++++ src/ssl/tls_record.h +@@ -17,8 +17,15 @@ + + #if defined(BOTAN_USE_STD_TR1) + +-#if defined(BOTAN_BUILD_COMPILER_IS_MSVC) ++#if defined(_LIBCPP_VERSION) || defined(BOTAN_BUILD_COMPILER_IS_MSVC) + #include ++ #if defined(_LIBCPP_VERSION) ++ namespace std { ++ namespace tr1 { ++ using std::function; ++ } ++ } ++ #endif + #else + #include + #endif +@@ -31,7 +38,11 @@ + + namespace Botan { + ++#if defined(_LIBCPP_VERSION) ++using namespace std::placeholders; ++#else + using namespace std::tr1::placeholders; ++#endif + + /** + * TLS Record Writer