From owner-svn-ports-head@freebsd.org Thu Apr 13 16:52:11 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 4D71CD3CB89; Thu, 13 Apr 2017 16:52:11 +0000 (UTC) (envelope-from mat@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 28CC6FF6; Thu, 13 Apr 2017 16:52:11 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3DGqAfO033041; Thu, 13 Apr 2017 16:52:10 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3DGq952033037; Thu, 13 Apr 2017 16:52:09 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201704131652.v3DGq952033037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 13 Apr 2017 16:52:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438453 - in head: Mk/Uses www/libwww www/mod_auth_gssapi www/mod_spdy X-SVN-Group: ports-head 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: Thu, 13 Apr 2017 16:52:11 -0000 Author: mat Date: Thu Apr 13 16:52:09 2017 New Revision: 438453 URL: https://svnweb.freebsd.org/changeset/ports/438453 Log: Add a BROKEN_OPENSSL and IGNORE_OPENSSL, to mark ports that are BROKEN/IGNORE for specific OpenSSL flavors. Convert a few ports as an example. Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D10340 Modified: head/Mk/Uses/ssl.mk head/www/libwww/Makefile (contents, props changed) head/www/mod_auth_gssapi/Makefile (contents, props changed) head/www/mod_spdy/Makefile (contents, props changed) Modified: head/Mk/Uses/ssl.mk ============================================================================== --- head/Mk/Uses/ssl.mk Thu Apr 13 16:39:36 2017 (r438452) +++ head/Mk/Uses/ssl.mk Thu Apr 13 16:52:09 2017 (r438453) @@ -77,6 +77,26 @@ OPENSSL_PORT= security/${SSL_DEFAULT} .error You are using an unsupported SSL provider ${SSL_DEFAULT} . endif +. if defined(BROKEN_OPENSSL) && ${BROKEN_OPENSSL:M${SSL_DEFAULT}} +. if defined(BROKEN_OPENSSL_REASON_${SSL_DEFAULT}) +BROKEN= ${BROKEN_OPENSSL_REASON_${SSL_DEFAULT}} +. elif defined(BROKEN_OPENSSL_REASON) +BROKEN= ${BROKEN_OPENSSL_REASON} +. else +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +. endif + +. if defined(IGNORE_OPENSSL) && ${IGNORE_OPENSSL:M${SSL_DEFAULT}} +. if defined(IGNORE_OPENSSL_REASON_${SSL_DEFAULT}) +IGNORE= ${IGNORE_OPENSSL_REASON_${SSL_DEFAULT}} +. elif defined(IGNORE_OPENSSL_REASON) +IGNORE= ${IGNORE_OPENSSL_REASON} +. else +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +. endif + OPENSSLDIR?= ${OPENSSLBASE}/openssl .if defined(_SSL_BUILD_DEP) BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT} Modified: head/www/libwww/Makefile ============================================================================== --- head/www/libwww/Makefile Thu Apr 13 16:39:36 2017 (r438452) +++ head/www/libwww/Makefile Thu Apr 13 16:52:09 2017 (r438453) @@ -22,15 +22,11 @@ USES= gmake libtool perl5 ssl tar:tgz USE_PERL5= build USE_LDCONFIG= yes +BROKEN_OPENSSL= openssl-devel + post-install: ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ ${STAGEDIR}${PREFIX}/include/w3c-libwww/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so -.include - -.if ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - -.include +.include Modified: head/www/mod_auth_gssapi/Makefile ============================================================================== --- head/www/mod_auth_gssapi/Makefile Thu Apr 13 16:39:36 2017 (r438452) +++ head/www/mod_auth_gssapi/Makefile Thu Apr 13 16:52:09 2017 (r438453) @@ -29,11 +29,8 @@ SUB_FILES= ${APMOD_FILE} APMOD_FILE= 240_${PORTNAME}.conf.sample PLIST_SUB+= APMOD_FILE=${APMOD_FILE} -.include - -.if ${SSL_DEFAULT:Mlibressl*} -IGNORE= mod_auth_gssapi currently only supports OpenSSL -.endif +IGNORE_OPENSSL= libressl libressl-devel +IGNORE_OPENSSL_REASON= mod_auth_gssapi currently only supports OpenSSL do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} @@ -43,4 +40,4 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so -.include +.include Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Thu Apr 13 16:39:36 2017 (r438452) +++ head/www/mod_spdy/Makefile Thu Apr 13 16:52:09 2017 (r438453) @@ -82,11 +82,10 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} -.include +BROKEN_OPENSSL= libressl libressl-devel +BROKEN_OPENSSL_REASON= incompatible with LibreSSL, please use www/apache24 with mod_http2 -.if ${SSL_DEFAULT:Mlibressl*} -IGNORE= ${PORTNAME} is incompatible with LibreSSL, please use www/apache24 with mod_http2 -.endif +.include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 CXXFLAGS+= -Wno-unused-local-typedef