Date: Tue, 5 Nov 2019 14:52:08 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org> Cc: Eugene Grosbein <eugen@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r515574 - head/security/cyrus-sasl2 Message-ID: <20191105135208.dt5tz3gqnzt4bcr5@ivaldir.net> In-Reply-To: <20191105134710.3hfqxau5mqxpnfbo@ogg.in.absolight.net> References: <201910250321.x9P3LHo9092172@repo.freebsd.org> <20191105131059.bpgmjwj3ma5isi3i@ivaldir.net> <20191105134710.3hfqxau5mqxpnfbo@ogg.in.absolight.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--mb5dxmxujnzimd66 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 05, 2019 at 02:47:10PM +0100, Mathieu Arnold wrote: > On Tue, Nov 05, 2019 at 02:12:22PM +0100, Baptiste Daroussin wrote: > > On Fri, Oct 25, 2019 at 03:21:17AM +0000, Eugene Grosbein wrote: > > > Author: eugen > > > Date: Fri Oct 25 03:21:16 2019 > > > New Revision: 515574 > > > URL: https://svnweb.freebsd.org/changeset/ports/515574 > > >=20 > > > Log: > > > security/cyrus-sasl2: unbreak building with stock OpenSSL for stabl= e/11 > > > =20 > > > Sendmail bundled with FreeBSD has SASL support and the Handbook tel= ls > > > how to rebuild the Sendmail with SASL enabled if you have installed > > > cyrus-sasl2 that links with OpenSSL's libcrypto. > > > =20 > > > Sendmail uses old OpenSSL 1.0.2 API, so cyrus-sasl2 should be built > > > with stock libcrypto even if newer OpenSSL is installed for Ports. > > > =20 > > > This change adds new option SSL to the port (enabled by default). > > > If disabled, cyrus-sasl2 is built witch stock libcrypto not dependi= ng > > > on ports version of OpenSSL. > > > =20 > > > PORTREVISION not changed as default build is not affected. > > >=20 > > > Modified: > > > head/security/cyrus-sasl2/Makefile > > > head/security/cyrus-sasl2/Makefile.common > > >=20 > > > Modified: head/security/cyrus-sasl2/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/security/cyrus-sasl2/Makefile Fri Oct 25 03:15:48 2019 (r515= 573) > > > +++ head/security/cyrus-sasl2/Makefile Fri Oct 25 03:21:16 2019 (r515= 574) > > > @@ -11,13 +11,14 @@ CYRUS_CONFIGURE_ARGS=3D --with-saslauthd=3D${SASL= AUTHD_RUN > > > =20 > > > NO_OPTIONS_SORT=3D yes > > > OPTIONS_DEFINE=3D ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ > > > - OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR > > > + OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR SSL > > > OPTIONS_RADIO=3D SASLDB > > > OPTIONS_RADIO_SASLDB=3D BDB1 BDB GDBM LMDB > > > OPTIONS_GROUP=3D PLUGIN > > > OPTIONS_GROUP_PLUGIN=3D ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN S= CRAM > > > OPTIONS_DEFAULT=3D ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRA= M \ > > > - OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM > > > + OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM \ > > > + SSL > > > OPTIONS_SUB=3D yes > > > ALWAYSTRUE_DESC=3D Alwaystrue password verifier (discouraged) > > > ALWAYSTRUE_CONFIGURE_ENABLE=3Dalwaystrue > > > @@ -61,6 +62,8 @@ PLAIN_DESC=3D PLAIN authentication > > > PLAIN_CONFIGURE_ENABLE=3D plain > > > SCRAM_DESC=3D SCRAM authentication > > > SCRAM_CONFIGURE_ENABLE=3D scram > > > +SSL_DESC=3D Uncheck this to use system openssl libraries > > > +SSL_USES=3D ssl > > > =20 > > I don't think this is the right approach. > >=20 > > 1/ the option (double negative) is confusing. > > 2/ the default on for it makes it depends always on ports openssl, and = mixing > > port openssl and base openssl is always a mess for end users. >=20 > Mmmm, unless I am missing something, I think you are both wrong. > USES=3Dssl means "this port uses openssl", it does absolutely nothing > about using openssl from ports or from the base system, this is left to > the user by setting DEFAULT_VERSIONS+=3Dssl=3Dxxx in their make.conf. >=20 You are right. To be honnest I have only read the commit log ;) Best regards Bapt --mb5dxmxujnzimd66 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl3BfoUACgkQY4mL3PG3 Plq0Tw/+Ie0qNOJBdzKnkCMIUS65BzXGLTMp8/D5lYkJb/2SNr3hVpw+hYcNFyQF OiNHPayvxjo3wGdB/9deHwige+psP9oE1UsTXCeFlw1oDb2FwGPvlRILsJmK4Phy FNoWnURzwJoB/eAtZMYelmQ/SGeOW/X/KHE7sVQi331twF/frU2Bloppw1XYPARF +HywxamTPIUoHAmaizeM5d+jtTT3QUqkyp9apwUKK8yj1UsEulZDgkzFp6DbqAsc FIZ8qQbSCmeU0Q/L7cWkr72dmbtvcCp2VJJ0PIbjrkbvtXmpSY2y0QD0B2B/9lHF pTgYhXmbaX2xIhkEj9+uKF+YgUE89OFLNesCvDw5IUTkkZcMuyyqZTa1pgOkRhxV 3e3yDWW7x+Ml9GgzsT+HjvnTc3LWmqtO4jcIUCtkiQNaLBl6OgP7wEdU2QxRWmH1 zKoq7wfYX9nDwC28ds0f8ZKElPpIcGs+oHi78owKpPFIkXtjwrkBPdyEiJBANCGR DAeQgngPVO135daB1A1HcZZTWyMxYZckTg/z7cOKFNElcbN3WxUxwmGvLHF12XRc bAZS34t8sYoT6OT+wHUVUdXjH8oAwQ+emujKBrJJsUgApvpPmFZoKAX6dmW8u368 Ybte0sfXWX+cWE7vNSeTcvi1Sc3VWo6Nqx8Vw+Ktq/heLYUFcaw= =bT4a -----END PGP SIGNATURE----- --mb5dxmxujnzimd66--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191105135208.dt5tz3gqnzt4bcr5>