From owner-svn-ports-head@freebsd.org Thu Apr 13 19:58:30 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 E6EE1D3C806 for ; Thu, 13 Apr 2017 19:58:30 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-oi0-x235.google.com (mail-oi0-x235.google.com [IPv6:2607:f8b0:4003:c06::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A902B62 for ; Thu, 13 Apr 2017 19:58:30 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by mail-oi0-x235.google.com with SMTP id r203so76383078oib.3 for ; Thu, 13 Apr 2017 12:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sunpoet-net.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=cssn4DgPnpaXgc9q9A49iKpHBoO73o27ceVxYVbChXw=; b=mLg0zaJpVDdhEtu0STFwV8ns964jSgpVw9c3wzUTmele8z2dmS9WtZEGBCTe00LlmW mzf58VYeAbUxya340lgZSwd9Ngoy4olrYpMZEhWjdmQODpVLIJjEiB2w2mhHKVG2pzZG cBUF7NaCmtjePEMX1+4+9JJGRjIBAwQb8+/TaHpiBM4KDOPCMjS+uB7L6+XXK+9EhE+9 Bc9wvaDCEyC7ANI2ohv0st/Gqn2oxRRHyMltyv6Upce0Y7s8xvtWFzzvVO8o227ZUJzK bn4ypahPnR60oDZYPbghtlpcWFgQOy4zxYtTwvovsybOcnOufv9QggiGTXFt6OOjSM1G bFfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=cssn4DgPnpaXgc9q9A49iKpHBoO73o27ceVxYVbChXw=; b=Sc8l9d61AUtI36Xem7ayWTMVvPISpj8MPY2qauGrdiN6t0TL7lxkj9UXszEbAA4jsY iUqdhGgttlyRiKdWiaFk/Rt1umEqoouw3fRwuOfMbJqBILhQnFwP1ZouGH59WyBoQlG1 KA2/Rf9zI2j7/qa42GOUxvfWDA4H1qhwr0+sX9SD/SqISQgBs8ghxEKqw0LwSYrymoYb x9pqsmOtPl9bjHMZj5FY33J1i8vG9kzkxzJWbnFZ0Q9mHx2b3xTo/vxfixLcmHfvujL5 Y/gHCYnnF+sGYX9sokhJkau+woTJ/Gnk1VpDpi1bqN3mqnX9m2G+2YSGHfwrzeZirPLm tI9Q== X-Gm-Message-State: AN3rC/7TR2C6D7qBEegbyxeihci0il0PJYGLQo60JyQNdOIDC1FH/7Xi DFoJpP562nm8UBZ+E45iXxgqSxpKQA== X-Received: by 10.157.5.102 with SMTP id 93mr3482804otw.10.1492113509685; Thu, 13 Apr 2017 12:58:29 -0700 (PDT) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.157.23.33 with HTTP; Thu, 13 Apr 2017 12:57:49 -0700 (PDT) In-Reply-To: <201704131652.v3DGq952033037@repo.freebsd.org> References: <201704131652.v3DGq952033037@repo.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 14 Apr 2017 03:57:49 +0800 X-Google-Sender-Auth: Axuleed5Yc7OrbWnmf9y_hSjFbo Message-ID: Subject: Re: svn commit: r438453 - in head: Mk/Uses www/libwww www/mod_auth_gssapi www/mod_spdy To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 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 19:58:31 -0000 On Fri, Apr 14, 2017 at 12:52 AM, Mathieu Arnold wrote: > 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. > Hi mat, May I suggest to use BROKEN_SSL/IGNORE_SSL instead since we already use ssl rather than openssl in DEFAULT_VERSIONS and USES. Regards, sunpoet > 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 > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" >