svn commit: r416133 - in head/mail/opensmtpd-devel: . files
Ashish SHUKLA
ashish at FreeBSD.org
Mon May 30 00:17:52 UTC 2016
Author: ashish
Date: Mon May 30 00:17:50 2016
New Revision: 416133
URL: https://svnweb.freebsd.org/changeset/ports/416133
Log:
- Update to 201605221711[1]
- Add option for table db (aliases)[1]
- Add CPE information[1]
PR: 209770[1] 208991
Submitted by: fluffy[1]
Deleted:
head/mail/opensmtpd-devel/files/patch-usernamelen
Modified:
head/mail/opensmtpd-devel/Makefile
head/mail/opensmtpd-devel/distinfo
head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
head/mail/opensmtpd-devel/pkg-plist
Modified: head/mail/opensmtpd-devel/Makefile
==============================================================================
--- head/mail/opensmtpd-devel/Makefile Sun May 29 23:08:43 2016 (r416132)
+++ head/mail/opensmtpd-devel/Makefile Mon May 30 00:17:50 2016 (r416133)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 201602131907
+PORTVERSION= 201605221711
DISTVERSIONSUFFIX= p1
PORTEPOCH= 1
PORTREVISION= 1
@@ -19,58 +19,65 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libevent.so:devel/libevent2
-OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT
+OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT TABLE_DB
-OPTIONS_DEFAULT= CA_BUNDLE PAM
+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
-CONFIGURE_ARGS= --with-table-db \
- --sysconfdir=${PREFIX}/etc/mail/ \
- --with-libasr=${LOCALBASE} \
- --with-libevent=${LOCALBASE} \
- --with-libssl=${OPENSSLBASE} \
- --with-group-queue=${GROUPS}
-
-USE_RC_SUBR= smtpd
-SUB_FILES= pkg-install pkg-deinstall
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
+GROUPS= _smtpd _smtpq
-PLIST_SUB+= SMTPQ_GROUP=${GROUPS}
+OPTIONS_SUB= yes
-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_OFF= libasr.so:dns/libasr-devel
LIBASR_LIB_DEPENDS= libasr.so:dns/libasr
-
-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_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 <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT}
+.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015
WITH_OPENSSL_PORT= yes
.endif
-.if ${PORT_OPTIONS:MSSL_PORT}
-WITH_OPENSSL_PORT= yes
-.endif
+.include <bsd.port.pre.mk>
+
+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 <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/mail/opensmtpd-devel/distinfo
==============================================================================
--- head/mail/opensmtpd-devel/distinfo Sun May 29 23:08:43 2016 (r416132)
+++ head/mail/opensmtpd-devel/distinfo Mon May 30 00:17:50 2016 (r416133)
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-201602131907p1.tar.gz) = 0fd10cff59719523e41fe489ff5c1490c2898a2ce47b98e4bf39f07ba3562252
-SIZE (opensmtpd-201602131907p1.tar.gz) = 686726
+SHA256 (opensmtpd-201605221711p1.tar.gz) = e7f63a4d5c26386cffe61f35d6e4a959a1f6f38b3fbe0351c746326cf2329418
+SIZE (opensmtpd-201605221711p1.tar.gz) = 691693
Modified: head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Sun May 29 23:08:43 2016 (r416132)
+++ head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Mon May 30 00:17:50 2016 (r416133)
@@ -1,9 +1,10 @@
---- mk/smtpd/Makefile.in.orig 2016-02-07 00:04:24 UTC
+--- mk/smtpd/Makefile.in.orig 2016-02-02 20:40:51 UTC
+++ mk/smtpd/Makefile.in
-@@ -1339,12 +1339,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
+@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
+ $(MKDIR_P) $(DESTDIR)$(bindir)
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-
+-
- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
- else \
Modified: head/mail/opensmtpd-devel/pkg-plist
==============================================================================
--- head/mail/opensmtpd-devel/pkg-plist Sun May 29 23:08:43 2016 (r416132)
+++ head/mail/opensmtpd-devel/pkg-plist Mon May 30 00:17:50 2016 (r416133)
@@ -1,15 +1,15 @@
@sample etc/mail/smtpd.conf.sample
libexec/opensmtpd/encrypt
libexec/opensmtpd/mail.local
-libexec/opensmtpd/makemap
-@(,%%SMTPQ_GROUP%%,2555) sbin/smtpctl
+%%TABLE_DB%%libexec/opensmtpd/makemap
+@(,,2555) sbin/smtpctl
sbin/smtpd
man/man5/aliases.5.gz
man/man5/forward.5.gz
man/man5/smtpd.conf.5.gz
man/man5/table.5.gz
-man/man8/makemap.8.gz
-man/man8/newaliases.8.gz
+%%TABLE_DB%%man/man8/makemap.8.gz
+%%TABLE_DB%%man/man8/newaliases.8.gz
man/man8/sendmail.8.gz
man/man8/smtpctl.8.gz
man/man8/smtpd.8.gz
More information about the svn-ports-head
mailing list