From owner-svn-ports-all@freebsd.org Thu Jun 25 01:50:11 2015 Return-Path: Delivered-To: svn-ports-all@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 1D2FE915B20; Thu, 25 Jun 2015 01:50:11 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pd0-x229.google.com (mail-pd0-x229.google.com [IPv6:2607:f8b0:400e:c02::229]) (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 E0C4D19DE; Thu, 25 Jun 2015 01:50:10 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by pdbci14 with SMTP id ci14so42177943pdb.2; Wed, 24 Jun 2015 18:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=x1JDozLHHtR0QfK0/al76PdisJWDF/3PIoipHQdN/wE=; b=u5RRcVnkXV/D/ERLuDZu8ZWk9U9FciBO3AL1uvoc2NX0Jk2KzEkFdHcg1uJqUhJbUu 5hhCQCXQo8fGuw9eE7pLMoxniN9Y2Qw3K750J0R6aV1C0wCQd8IMpd/nfek7wFKaFWnz TQ1h01mcs1SRUzXSiAU6jHqCnNSyuVGOK/BCl82aa9/cWH9B0JhF8HeYzyeIgfKdLRR4 Ml13uplXQ4rQPcceq4B0hmjD26HA5BTgpFjwS7cYqtN2u2q0/q8eqYmD2Z+cETSUPUeB HkL7gvv62VMlPDZ21U4zKxwyhlbTBYDUG6aMt8+em5pOJF4uPSlJHgWAK0fTu/kTWN7G gFfQ== X-Received: by 10.68.243.9 with SMTP id wu9mr85921988pbc.28.1435197010441; Wed, 24 Jun 2015 18:50:10 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::6? (2001-44b8-31ae-7b01-0000-0000-0000-0006.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::6]) by mx.google.com with ESMTPSA id xn2sm9841211pbc.44.2015.06.24.18.50.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 18:50:09 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r390526 - head/ftp/curl References: <201506250022.t5P0MURx089077@svn.freebsd.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Cc: Bryan Drewery , sunpoet@FreeBSD.org, Mathieu , timp87@gmail.com, Adam Weinberger , timur@FreeBSD.org From: Kubilay Kocak X-Enigmail-Draft-Status: N1110 Message-ID: <558B5E47.6000409@FreeBSD.org> Date: Thu, 25 Jun 2015 11:49:59 +1000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: <201506250022.t5P0MURx089077@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 25 Jun 2015 01:50:11 -0000 On 25/06/2015 10:22 AM, Bryan Drewery wrote: > Author: bdrewery > Date: Thu Jun 25 00:22:29 2015 > New Revision: 390526 > URL: https://svnweb.freebsd.org/changeset/ports/390526 > > Log: > Be more explicit about which setting to use. > > PR: 200555 > > Modified: > head/ftp/curl/Makefile > > Modified: head/ftp/curl/Makefile > ============================================================================== > --- head/ftp/curl/Makefile Thu Jun 25 00:17:08 2015 (r390525) > +++ head/ftp/curl/Makefile Thu Jun 25 00:22:29 2015 (r390526) > @@ -167,7 +167,7 @@ IGNORE= only supports LIBSSH2 with Open > (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) || \ > (defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl")) > .if ${PORT_OPTIONS:MGSSAPI_BASE} > -IGNORE= GSSAPI_BASE is set, which is not compatible with OpenSSL/LibreSSL from ports. Unset it or do not use ports SSL. > +IGNORE= GSSAPI_BASE is set, which is not compatible with OpenSSL/LibreSSL from ports. Set GSSAPI_NONE or do not use ports SSL. > .endif > .if ${PORT_OPTIONS:MTLS_SRP} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl" > IGNORE= unsupported TLS-SRP in LibreSSL > This is not aimed at you Bryan (or at anyone specifically), this commit just reminded me. I'm a HUGE non-fan of GSSAPI_NONE (or any FOO_NONE)as an option in the following ports as an explicit option to disable something. dns/bind910 dns/bind99 ftp/curl mail/dovecot2 net/samba36 www/squid We have OPTIONS_RADIO for supporting none or one enabled value from a set of alternatives. That is, if none of KRB5, MIT or BASE are set, kerberos should be disabled, as it is logically equivalent to setting FOO_NONE, without needing an explicit option to say so. If we cant currently check/test whether no option from a set is enabled, and that would be useful, we should add it to bsd.port.options.mk. I imagine this is trivial (for someone who is shell savvy). It would be nice to be able to do something like: .if empty(OPTIONS_RADIO_FOO) do something .endif Alternatively, each of MIT, KRB5 and BASE options could: GSSAPI_FOO_CONFIGURE_OFF=--without-gssapi If we dont like duplicate configure args, then we should be able to test for no enabled options as above. At a minimum these FOO_NONE options are unnecessary/redundant, worse its a POLA violation and a clunky user experience, requiring a user to turn on an option to disable something. I got bitten with this 'you must choose one of FOO' during a curl upgrade'. It took me a while to figure out wth was going on. Maintainers of above ports are CC'd here ./koobs