Index: branches/2018Q2/mail/opensmtpd/Makefile =================================================================== --- branches/2018Q2/mail/opensmtpd/Makefile (revision 468395) +++ branches/2018Q2/mail/opensmtpd/Makefile (revision 468396) @@ -1,64 +1,64 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= opensmtpd PORTVERSION= 5.9.2p1 PORTEPOCH= 1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ http://distfiles.pirateparty.in/ashish/ MAINTAINER= fluffy@FreeBSD.org COMMENT= Security- and simplicity-focused SMTP server from OpenBSD LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent OPTIONS_DEFINE= CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB CA_BUNDLE_DESC= Install CA bundle for SSL LIBASRDEVEL_DESC= Use development version of libasr MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) TABLE_DB_DESC= Build table-db plugin (aliases) USES= cpe groff libtool ssl GNU_CONFIGURE= yes CPE_VENDOR= openbsd USE_RC_SUBR= smtpd SUB_FILES= pkg-install pkg-deinstall pkg-message CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]* USERS= _smtpd _smtpq GROUPS= _smtpd _smtpq OPTIONS_SUB= yes CA_BUNDLE_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss LIBASRDEVEL_LIB_DEPENDS_OFF= libasr.so:dns/libasr LIBASRDEVEL_LIB_DEPENDS= libasr.so:dns/libasr-devel PAM_CONFIGURE_WITH= auth-pam=smtpd TABLE_DB_CONFIGURE_WITH= table-db CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-libssl=${OPENSSLBASE} \ --sysconfdir=${PREFIX}/etc/mail/ post-patch: ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap .include Index: branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c =================================================================== --- branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c (nonexistent) +++ branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c (revision 468396) @@ -0,0 +1,11 @@ +--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000 ++++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000 +@@ -274,7 +274,7 @@ + * if any + */ + n = iobuf_fqueue(&s->iobuf, +- "Return-Path: %s\n" ++ "Return-Path: <%s>\n" + "Delivered-To: %s\n", + e->sender, + e->rcpt ? e->rcpt : e->dest); Property changes on: branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2/mail/opensmtpd-devel/Makefile =================================================================== --- branches/2018Q2/mail/opensmtpd-devel/Makefile (revision 468395) +++ branches/2018Q2/mail/opensmtpd-devel/Makefile (revision 468396) @@ -1,70 +1,70 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= opensmtpd PORTVERSION= 201606220754 DISTVERSIONSUFFIX= p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ http://distfiles.pirateparty.in/ashish/ PKGNAMESUFFIX= -devel MAINTAINER= fluffy@FreeBSD.org COMMENT= Security- and simplicity-focused SMTP server from OpenBSD LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM TABLE_DB OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB CA_BUNDLE_DESC= Install CA bundle for SSL LIBASR_DESC= Use stable version of libasr MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) TABLE_DB_DESC= Build table-db plugin (aliases) USES= cpe groff libtool ssl GNU_CONFIGURE= yes CPE_VENDOR= openbsd USE_RC_SUBR= smtpd SUB_FILES= pkg-install pkg-deinstall pkg-message CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]* USERS= _smtpd _smtpq GROUPS= _smtpd _smtpq OPTIONS_SUB= yes CA_BUNDLE_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss LIBASR_LIB_DEPENDS= libasr.so:dns/libasr LIBASR_LIB_DEPENDS_OFF= libasr.so:dns/libasr-devel PAM_CONFIGURE_WITH= auth-pam=smtpd TABLE_DB_CONFIGURE_WITH= table-db CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-libssl=${OPENSSLBASE} \ --sysconfdir=${PREFIX}/etc/mail/ post-patch: ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in # https://github.com/OpenSMTPD/OpenSMTPD/issues/700 ${REINPLACE_CMD} -r -e \ '/SMTPD_VERSION/s/"[^"]+"$$/"${PORTVERSION}${DISTVERSIONSUFFIX}"/' \ ${WRKSRC}/smtpd/smtpd.h post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap .include Index: branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c =================================================================== --- branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c (nonexistent) +++ branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c (revision 468396) @@ -0,0 +1,11 @@ +--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000 ++++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000 +@@ -274,7 +274,7 @@ + * if any + */ + n = iobuf_fqueue(&s->iobuf, +- "Return-Path: %s\n" ++ "Return-Path: <%s>\n" + "Delivered-To: %s\n", + e->sender, + e->rcpt ? e->rcpt : e->dest); Property changes on: branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 468395) +++ branches/2018Q2 (revision 468396) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r468319