From owner-svn-ports-all@FreeBSD.ORG Sun Nov 23 10:34:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21F5AE7A; Sun, 23 Nov 2014 10:34:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E889533E; Sun, 23 Nov 2014 10:34:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANAYcQm083803; Sun, 23 Nov 2014 10:34:38 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANAYctw083802; Sun, 23 Nov 2014 10:34:38 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201411231034.sANAYctw083802@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sun, 23 Nov 2014 10:34:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373140 - head/security/openssl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 10:34:39 -0000 Author: dinoex Date: Sun Nov 23 10:34:38 2014 New Revision: 373140 URL: https://svnweb.freebsd.org/changeset/ports/373140 QAT: https://qat.redports.org/buildarchive/r373140/ Log: - new option TLSEXPCIPHERS PR: 195270 Submitted by: yuri@rawbw.com - options ordered by function - extends descriptions Modified: head/security/openssl/Makefile Modified: head/security/openssl/Makefile ============================================================================== --- head/security/openssl/Makefile Sun Nov 23 10:16:30 2014 (r373139) +++ head/security/openssl/Makefile Sun Nov 23 10:34:38 2014 (r373140) @@ -21,7 +21,7 @@ COMMENT= SSL and crypto library CONFLICTS?= libressl-* -OPTIONS_DEFINE= SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB SCTP SSL2 SSL3 MD2 RC5 RFC3779 GMP DOCS +OPTIONS_DEFINE= SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB GMP SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS OPTIONS_DEFAULT=SHARED THREADS SSE2 ASM ZLIB SCTP SSL2 SSL3 MD2 .for a in amd64 ia64 OPTIONS_DEFINE_${a}= EC @@ -40,13 +40,14 @@ ASM_DESC?= optimized Assembler code PADLOCK_DESC?= VIA Padlock support SHARED_DESC?= build of shared libs ZLIB_DESC?= zlib compression support +GMP_DESC?= gmp support (LGPLv3) SCTP_DESC?= SCTP protocol support SSL2_DESC?= SSLv2 protocol support SSL3_DESC?= SSLv3 protocol support +RFC3779_DESC?= RFC3779 support (BGP) MD2_DESC?= MD2 hash (obsolete) RC5_DESC?= RC5 cipher (patented) -RFC3779_DESC?= RFC3779 support -GMP_DESC?= gmp support (LGPLv3) +EXPCIPHERS_DESC?= Include experimental ciphers EC_DESC?= Optimize NIST elliptic curves GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp @@ -210,6 +211,10 @@ post-patch: ${WRKSRC}/crypto/des/Makefile ${REINPLACE_CMD} -e 's|SHLIB_VERSION_NUMBER "1.0.0"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ ${WRKSRC}/crypto/opensslv.h +.if ${PORT_OPTIONS:MEXPCIPHERS} + ${REINPLACE_CMD} -e 's|TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0|TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 1|' \ + ${WRKSRC}/ssl/tls1.h +.endif do-configure: ${REINPLACE_CMD} -e "s|options 386|options|" \