Index: head/mail/opensmtpd-devel/Makefile =================================================================== --- head/mail/opensmtpd-devel/Makefile (revision 417138) +++ head/mail/opensmtpd-devel/Makefile (revision 417139) @@ -1,82 +1,82 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= opensmtpd -PORTVERSION= 201606062303 +PORTVERSION= 201606152203 DISTVERSIONSUFFIX= p1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ http://distfiles.pirateparty.in/ashish/ PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org COMMENT= Security- and simplicity-focused SMTP server from OpenBSD LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent2 OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT 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) SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port TABLE_DB_DESC= Build table-db plugin (aliases) USES= cpe libtool USE_OPENSSL= yes 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 SSL_PORT_VARS= with_openssl_port=yes TABLE_DB_CONFIGURE_WITH= table-db .include .if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015 WITH_OPENSSL_PORT= yes .endif .include 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 .if ${PORT_OPTIONS:MTABLE_DB} post-install: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap .endif .include Index: head/mail/opensmtpd-devel/distinfo =================================================================== --- head/mail/opensmtpd-devel/distinfo (revision 417138) +++ head/mail/opensmtpd-devel/distinfo (revision 417139) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465270468 -SHA256 (opensmtpd-201606062303p1.tar.gz) = f54a496ec4729073bba2efec2daca69a469b2fd7666dbcc309d21324f76d16ad -SIZE (opensmtpd-201606062303p1.tar.gz) = 692651 +TIMESTAMP = 1466396280 +SHA256 (opensmtpd-201606152203p1.tar.gz) = f91a91a6936bd634ba0643dea91b189d454b03d3c454f38f365bf73921aaf222 +SIZE (opensmtpd-201606152203p1.tar.gz) = 692715 Index: head/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c =================================================================== --- head/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c (revision 417138) +++ head/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c (nonexistent) @@ -1,36 +0,0 @@ ---- smtpd/smtpd.c.orig 2016-06-06 20:51:18 UTC -+++ smtpd/smtpd.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: smtpd.c,v 1.277 2016/05/28 21:21:20 eric Exp $ */ -+/* $OpenBSD: smtpd.c,v 1.278 2016/06/07 06:52:49 gilles Exp $ */ - - /* - * Copyright (c) 2008 Gilles Chehade -@@ -843,9 +843,12 @@ start_child(int save_argc, char **save_a - if (save_argc >= SMTPD_MAXARG - 2) - fatalx("too many arguments"); - -- if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1) -+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) - fatal("socketpair"); - -+ io_set_nonblocking(sp[0]); -+ io_set_nonblocking(sp[1]); -+ - switch (pid = fork()) { - case -1: - fatal("%s: fork", save_argv[0]); -@@ -884,9 +887,12 @@ setup_peers(struct mproc *a, struct mpro - { - int sp[2]; - -- if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1) -+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) - fatal("socketpair"); - -+ io_set_nonblocking(sp[0]); -+ io_set_nonblocking(sp[1]); -+ - if (imsg_compose(&a->imsgbuf, IMSG_SETUP_PEER, b->proc, b->pid, sp[0], - NULL, 0) == -1) - fatal("imsg_compose"); Property changes on: head/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property