cram-md5 is mandatory option for ssmtp. The enclosed patch enables CRAM-MD5 as an option, it also enables XORIGIP as a default option which was the presumed intent. Removing CRAM-MD5 removes an additional library that the dynamic loader needs to map, an extremely small performance enhancement and the removal of libmd when not required (for tight memory requirements). The latter is beneficial in an environment with many jails and an email reporting/monitoring function. (Unfortunately TLS is the only other secure authentication option) Fix: --- /usr/jails/b2/usr/ports/mail/ssmtp/Makefile (revision 324648) +++ /usr/jails/b2/usr/ports/mail/ssmtp/Makefile (working copy) @@ -22,7 +22,7 @@ SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ARGS= --enable-ssl --enable-md5auth +CONFIGURE_ARGS= --enable-ssl MAKE_ENV+= TARGET_ARCH= CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} @@ -31,7 +31,7 @@ MAN8= ssmtp.8 MAN5= ssmtp.conf.5 -OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP +OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP CRAM-MD5 OPTIONS_DEFINE= USERPREFS XORIGIP LOGFILE_DESC= log file USERPREFS_DESC= user defined revaliases @@ -51,6 +51,10 @@ CONFIGURE_ARGS+= --enable-inet6 .endif +.if ${PORT_OPTIONS:MCRAM-MD5} +CONFIGURE_ARGS+= --enable-md5auth +.endif + .if ${PORT_OPTIONS:MUSERPREFS} CFLAGS+= -DUSERPREFS pre-everything:: root@:~ # /root/static/svn diff /usr/jails/b2/usr/ports/mail/ssmtp/Makefile SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ARGS= --enable-ssl --enable-md5auth +CONFIGURE_ARGS= --enable-ssl MAKE_ENV+= TARGET_ARCH= CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} @@ -31,12 +31,12 @@ MAN8= ssmtp.8 MAN5= ssmtp.conf.5 -OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP -OPTIONS_DEFINE= USERPREFS XORIGIP +OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP CRAM-MD5 +OPTIONS_DEFAULT= XORIGIP LOGFILE_DESC= log file USERPREFS_DESC= user defined revaliases XORIGIP_DESC= Add X-Originating-IP header - +CRAM-MD5_DESC= Enable CRAM-MD5 Authentication .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLOGFILE} @@ -51,6 +51,10 @@ CONFIGURE_ARGS+= --enable-inet6 .endif +.if ${PORT_OPTIONS:MCRAM-MD5} +CONFIGURE_ARGS+= --enable-md5auth +.endif + .if ${PORT_OPTIONS:MUSERPREFS} CFLAGS+= -DUSERPREFS pre-everything::--saUpsEzVhc4Eigh1F1iDpkKYxPToxQXFI1tPkdVoC4z2pUpU Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: /usr/jails/b2/usr/ports/mail/ssmtp/Makefile =================================================================== --- /usr/jails/b2/usr/ports/mail/ssmtp/Makefile (revision 324648) +++ /usr/jails/b2/usr/ports/mail/ssmtp/Makefile (working copy) @@ -22,7 +22,7 @@
Maintainer of mail/ssmtp, Please note that PR ports/181641 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181641 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Just an update - I've got a patch in the works with these and additional changes added. Giving the PR submitter 3 days to respond to me with comments.
Please could attached patch be committed?
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Sat Feb 1 19:35:39 2014 New Revision: 342208 URL: http://svnweb.freebsd.org/changeset/ports/342208 QAT: https://qat.redports.org/buildarchive/r342208/ Log: - Add CRAMMD5 option [1] - Add OPENSSL option [2] - Change USE_GMAKE to USES=gmake - Convert to option helpers - Add support for staging - Unmute install commands - Fix WWW: line PR: ports/181641 [1] [2] Submitted by: Dewayne <dewayne.geraghty@heuristicsystems.com.au> [1] maintainer [2] Approved by: maintainer Modified: head/mail/ssmtp/Makefile head/mail/ssmtp/pkg-descr head/mail/ssmtp/pkg-plist Modified: head/mail/ssmtp/Makefile ============================================================================== --- head/mail/ssmtp/Makefile Sat Feb 1 19:20:19 2014 (r342207) +++ head/mail/ssmtp/Makefile Sat Feb 1 19:35:39 2014 (r342208) @@ -3,6 +3,7 @@ PORTNAME= ssmtp PORTVERSION= 2.64 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX} @@ -13,44 +14,33 @@ COMMENT= Extremely simple MTA to get mai USE_BZIP2= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake GROUPS= ssmtp -SHAREGRP= ssmtp BINMODE= 2555 SHAREMODE= 640 -BINGRP= ssmtp SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ARGS= --enable-ssl --enable-md5auth MAKE_ENV+= TARGET_ARCH= CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} MAILERCONF= /etc/mail/mailer.conf -MAN8= ssmtp.8 -MAN5= ssmtp.conf.5 +OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP CRAMMD5 OPENSSL +OPTIONS_DEFAULT= XORIGIP CRAMMD5 OPENSSL +LOGFILE_DESC= Log file +USERPREFS_DESC= User-defined revaliases +XORIGIP_DESC= X-Originating-IP header for REMOTE_ADDR envvar +CRAMMD5_DESC= CRAM-MD5 authentication support + +LOGFILE_CONFIGURE_ON= --enable-logfile +XORIGIP_EXTRA_PATCHES= ${FILESDIR}/remote-addr.patch +IPV6_CONFIGURE_ON= --enable-inet6 +CRAMMD5_CONFIGURE_ON= --enable-md5auth +OPENSSL_CONFIGURE_ON= --enable-ssl -OPTIONS_DEFINE= LOGFILE IPV6 USERPREFS XORIGIP -LOGFILE_DESC= log file -USERPREFS_DESC= user defined revaliases -XORIGIP_DESC= Add X-Originating-IP header - -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MLOGFILE} -CONFIGURE_ARGS+= --enable-logfile -.endif - -.if ${PORT_OPTIONS:MXORIGIP} -EXTRA_PATCHES= ${FILESDIR}/remote-addr.patch -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-inet6 -.endif - .if ${PORT_OPTIONS:MUSERPREFS} CFLAGS+= -DUSERPREFS pre-everything:: @@ -73,14 +63,15 @@ replace: @${ECHO_CMD} "purgestat /usr/bin/true" >> ${MAILERCONF} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/ssmtp ${PREFIX}/sbin/ssmtp - @${MKDIR} ${PREFIX}/etc/ssmtp - @${CHMOD} 750 ${PREFIX}/etc/ssmtp - @${CHGRP} ${SHAREGRP} ${PREFIX}/etc/ssmtp - @${INSTALL_DATA} ${WRKSRC}/revaliases ${PREFIX}/etc/ssmtp/revaliases.sample - @${INSTALL_DATA} ${WRKSRC}/ssmtp.conf ${PREFIX}/etc/ssmtp/ssmtp.conf.sample - @${INSTALL_MAN} ${WRKSRC}/ssmtp.8 ${MANPREFIX}/man/man8/ssmtp.8 - @${INSTALL_MAN} ${WRKSRC}/ssmtp.conf.5 ${MANPREFIX}/man/man5/ssmtp.conf.5 - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${WRKSRC}/ssmtp ${STAGEDIR}${PREFIX}/sbin/ssmtp + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssmtp + @${CHMOD} 750 ${STAGEDIR}${PREFIX}/etc/ssmtp + ${INSTALL_DATA} ${WRKSRC}/revaliases \ + ${STAGEDIR}${PREFIX}/etc/ssmtp/revaliases.sample + ${INSTALL_DATA} ${WRKSRC}/ssmtp.conf \ + ${STAGEDIR}${PREFIX}/etc/ssmtp/ssmtp.conf.sample + ${INSTALL_MAN} ${WRKSRC}/ssmtp.8 ${STAGEDIR}${MANPREFIX}/man/man8/ssmtp.8 + ${INSTALL_MAN} ${WRKSRC}/ssmtp.conf.5 \ + ${STAGEDIR}${MANPREFIX}/man/man5/ssmtp.conf.5 .include <bsd.port.mk> Modified: head/mail/ssmtp/pkg-descr ============================================================================== --- head/mail/ssmtp/pkg-descr Sat Feb 1 19:20:19 2014 (r342207) +++ head/mail/ssmtp/pkg-descr Sat Feb 1 19:35:39 2014 (r342208) @@ -7,4 +7,4 @@ WARNING: the above is all it does; it do aliases or manage a queue. That belongs on a mail hub with a system administrator. -WWW: http://packages.debian.org/stable/mail/ssmtp +WWW: http://packages.debian.org/stable/mail/ssmtp Modified: head/mail/ssmtp/pkg-plist ============================================================================== --- head/mail/ssmtp/pkg-plist Sat Feb 1 19:20:19 2014 (r342207) +++ head/mail/ssmtp/pkg-plist Sat Feb 1 19:35:39 2014 (r342208) @@ -1,4 +1,9 @@ +@group ssmtp sbin/ssmtp etc/ssmtp/revaliases.sample etc/ssmtp/ssmtp.conf.sample +@group +man/man5/ssmtp.conf.5.gz +man/man8/ssmtp.8.gz +@exec chown root:ssmtp %D/etc/ssmtp @dirrmtry etc/ssmtp _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed. Thanks!