Date: Sat, 29 Feb 2020 02:44:56 +0900 From: Hajimu UMEMOTO <ume@FreeBSD.org> To: Jung-uk Kim <jkim@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: <ygek146ppwn.wl-ume@FreeBSD.org> In-Reply-To: <40f473c9-37ee-8834-d15f-4ad69488be5b@FreeBSD.org> References: <201910250321.x9P3LHo9092172@repo.freebsd.org> <40f473c9-37ee-8834-d15f-4ad69488be5b@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, >>>>> On Fri, 28 Feb 2020 10:55:43 -0500 >>>>> Jung-uk Kim <jkim@FreeBSD.org> said: jkim> On 19. 10. 24., Eugene Grosbein wrote: > Author: eugen > Date: Fri Oct 25 03:21:16 2019 > New Revision: 515574 > URL: https://svnweb.freebsd.org/changeset/ports/515574 > > Log: > security/cyrus-sasl2: unbreak building with stock OpenSSL for stable/11 > > Sendmail bundled with FreeBSD has SASL support and the Handbook tells > how to rebuild the Sendmail with SASL enabled if you have installed > cyrus-sasl2 that links with OpenSSL's libcrypto. > > 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. > > This change adds new option SSL to the port (enabled by default). > If disabled, cyrus-sasl2 is built witch stock libcrypto not depending > on ports version of OpenSSL. > > PORTREVISION not changed as default build is not affected. > > Modified: > head/security/cyrus-sasl2/Makefile > head/security/cyrus-sasl2/Makefile.common > > Modified: head/security/cyrus-sasl2/Makefile > ============================================================================== > --- head/security/cyrus-sasl2/Makefile Fri Oct 25 03:15:48 2019 (r515573) > +++ head/security/cyrus-sasl2/Makefile Fri Oct 25 03:21:16 2019 (r515574) > @@ -11,13 +11,14 @@ CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUN > > NO_OPTIONS_SORT= yes > OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ > - OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR > + OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR SSL > OPTIONS_RADIO= SASLDB > OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM LMDB > OPTIONS_GROUP= PLUGIN > OPTIONS_GROUP_PLUGIN= ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM > OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \ > - OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM > + OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM \ > + SSL > OPTIONS_SUB= yes > ALWAYSTRUE_DESC= Alwaystrue password verifier (discouraged) > ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue > @@ -61,6 +62,8 @@ PLAIN_DESC= PLAIN authentication > PLAIN_CONFIGURE_ENABLE= plain > SCRAM_DESC= SCRAM authentication > SCRAM_CONFIGURE_ENABLE= scram > +SSL_DESC= Uncheck this to use system openssl libraries > +SSL_USES= ssl > > DOCS= AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT README > > > Modified: head/security/cyrus-sasl2/Makefile.common > ============================================================================== > --- head/security/cyrus-sasl2/Makefile.common Fri Oct 25 03:15:48 2019 (r515573) > +++ head/security/cyrus-sasl2/Makefile.common Fri Oct 25 03:21:16 2019 (r515574) > @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING > > USES+= gmake > USE_LDCONFIG= yes > -USES+= ssl > GNU_CONFIGURE= yes > > CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \ > @@ -73,6 +72,10 @@ PLIST_FILES+= lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \ > .endif > > .include <bsd.port.pre.mk> > + > +.if ! ${PORT_OPTIONS:MSSL} > +OPENSSLBASE= /usr > +.endif > > .if ${OPENSSLBASE} == /usr > CONFIGURE_ARGS+=--with-openssl=yes jkim> Please revert this commit. It is just wrong as bapt said. You have to jkim> remove "DEFAULT_VERSIONS+=ssl=foo" from /etc/make.conf and rebuild the jkim> port to use base OpenSSL. I dislike this commit as the maintainer of cyrus-sasl2 port. But, it was committed without my approval, sigh. Sincerely, -- Hajimu UMEMOTO ume@mahoroba.org ume@FreeBSD.org http://www.mahoroba.org/~ume/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ygek146ppwn.wl-ume>