Attachment #167067 for bug #206357




# $FreeBSD: head/mail/opensmtpd-devel/Makefile 390363 2015-06-23 10:43:59Z ashish $

PORTNAME=	opensmtpd
PORTVERSION=	201602131907
PORTEPOCH=	1
CATEGORIES=	mail
MASTER_SITES=	http://www.opensmtpd.org/archives/ \
		http://distfiles.pirateparty.in/ashish/
PKGNAMESUFFIX=	-devel
DISTVERSIONSUFFIX=	p1

MAINTAINER=	ashish@FreeBSD.org
COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD


LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

OPTIONS_DEFINE=	CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT

OPTIONS_DEFAULT=	CA_BUNDLE PAM

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

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

LIBASR_LIB_DEPENDS_OFF=	libasr.so:${PORTSDIR}/dns/libasr-devel
LIBASR_LIB_DEPENDS=	libasr.so:${PORTSDIR}/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:${PORTSDIR}/security/ca_root_nss

PAM_CONFIGURE_WITH=	auth-pam=smtpd

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT}
WITH_OPENSSL_PORT=	yes
.endif

.if ${PORT_OPTIONS:MSSL_PORT}
WITH_OPENSSL_PORT=	yes
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/mail/opensmtpd-devel/distinfo (-2 / +2 lines)
1	SHA256 (opensmtpd-201506112227p1.tar.gz) = f938796d2655f554e695adff6a3f3bbc4b1326912327b98acc7e29f705b9cf63	1	SHA256 (opensmtpd-201602131907p1.tar.gz) = 0fd10cff59719523e41fe489ff5c1490c2898a2ce47b98e4bf39f07ba3562252
2	SIZE (opensmtpd-201506112227p1.tar.gz) = 706259	2	SIZE (opensmtpd-201602131907p1.tar.gz) = 686726

Lines 1-6 Link Here

(-)b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in (-5 / +6 lines)
1	--- mk/smtpd/Makefile.in.orig 2015-06-20 04:17:57.656811000 +0000	1	--- mk/smtpd/Makefile.in.orig 2016-02-07 00:04:24 UTC
2	+++ mk/smtpd/Makefile.in 2015-06-20 04:19:53.711103000 +0000	2	+++ mk/smtpd/Makefile.in
3	@@ -1366,11 +1366,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP	3	@@ -1339,12 +1339,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
4	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5	4	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
5	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8	5	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
6		6
Lines 9-15 Link Here
9	- else \	9	- else \
10	- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \	10	- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
11	- fi	11	- fi
12	+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample	12	-
13		13	+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample
14	$(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5	14	$(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
15	$(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5	15	$(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
		16	$(INSTALL) -m 644 table.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/table.5




Fix for a build failure, taken from

http://article.gmane.org/gmane.mail.opensmtpd.general/2291

--- openbsd-compat/defines.h.orig
+++ openbsd-compat/defines.h
@@ -79,6 +79,10 @@
 # define MAXHOSTNAMELEN  64
 #endif
 
+#ifndef HOST_NAME_MAX
+# define HOST_NAME_MAX 255
+#endif
+
 #ifndef LOGIN_NAME_MAX
 # define LOGIN_NAME_MAX 9
 #endif




diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c
index 3a0ca2a..404ee50 100644
--- smtpd/smtp_session.c
+++ smtpd/smtp_session.c
@@ -84,6 +84,7 @@ enum session_flags {
 	SF_BADINPUT		= 0x0080,
 	SF_FILTERCONN		= 0x0100,
 	SF_FILTERDATA		= 0x0200,
+	SF_USERTOOLONG		= 0x0400,
 };
 
 enum message_flags {


Lines 9-16 Link Here

(-)b/mail/opensmtpd-devel/files/pkg-install.in (-2 / +2 lines)
9	sendmail %%PREFIX%%/sbin/smtpctl	9	sendmail %%PREFIX%%/sbin/smtpctl
10	send-mail %%PREFIX%%/sbin/smtpctl	10	send-mail %%PREFIX%%/sbin/smtpctl
11	mailq %%PREFIX%%/sbin/smtpctl	11	mailq %%PREFIX%%/sbin/smtpctl
12	makemap %%PREFIX%%/libexec/opensmtpd/makemap	12	makemap %%PREFIX%%/sbin/smtpctl
13	newaliases %%PREFIX%%/libexec/opensmtpd/makemap	13	newaliases %%PREFIX%%/sbin/smtpctl
14	EOF	14	EOF
15	fi	15	fi
16		16




If you are upgrading from OpenSMTPD version 201303011853 or earlier, please 
follow the procedure below to update the permissions on the OpenSMTPD
spool directories:

  1. Stop 'smtpd' service:

     # %%PREFIX%%/etc/rc.d/smtpd stop

  2. Update permissions:

     # chown -R _smtpq:wheel /var/spool/smtpd/corrupt
     # chown -R _smtpq:wheel /var/spool/smtpd/purge
     # chown -R _smtpq:wheel /var/spool/smtpd/queue
     # chown -R _smtpq:wheel /var/spool/smtpd/temporary

  3. Start 'smtpd' service:

     # %%PREFIX%%/etc/rc.d/smtpd start




@sample etc/mail/smtpd.conf.sample
libexec/opensmtpd/encrypt
libexec/opensmtpd/mail.local
libexec/opensmtpd/makemap
libexec/opensmtpd/encrypt
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
man/man8/sendmail.8.gz
man/man8/smtpctl.8.gz
man/man8/smtpd.8.gz
man/man8/makemap.8.gz
man/man8/smtpctl.8.gz
man/man5/table.5.gz
man/man5/smtpd.conf.5.gz
man/man5/forward.5.gz
man/man5/aliases.5.gz

Return to bug 206357

Lines 2-14 Link Here

(-)b/mail/opensmtpd-devel/Makefile (-11 / +24 lines)
2	# $FreeBSD: head/mail/opensmtpd-devel/Makefile 390363 2015-06-23 10:43:59Z ashish $	2	# $FreeBSD: head/mail/opensmtpd-devel/Makefile 390363 2015-06-23 10:43:59Z ashish $
3		3
4	PORTNAME= opensmtpd	4	PORTNAME= opensmtpd
5	PORTVERSION= 201506112227	5	PORTVERSION= 201602131907
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://www.opensmtpd.org/archives/ \	8	MASTER_SITES= http://www.opensmtpd.org/archives/ \
9	http://distfiles.pirateparty.in/ashish/	9	http://distfiles.pirateparty.in/ashish/
10	PKGNAMESUFFIX= -devel	10	PKGNAMESUFFIX= -devel
11	DISTNAME= ${PORTNAME}-${PORTVERSION}p1	11	DISTVERSIONSUFFIX= p1
12		12
13	MAINTAINER= ashish@FreeBSD.org	13	MAINTAINER= ashish@FreeBSD.org
14	COMMENT= Security- and simplicity-focused SMTP server from OpenBSD	14	COMMENT= Security- and simplicity-focused SMTP server from OpenBSD
Lines 18-34 Link Here
18		18
19	LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2	19	LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
20		20
21	OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF	21	OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT
22		22
23	OPTIONS_DEFAULT= CA_BUNDLE PAM	23	OPTIONS_DEFAULT= CA_BUNDLE PAM
24		24
25	CA_BUNDLE_DESC= Install CA bundle for OpenSSL	25	CA_BUNDLE_DESC= Install CA bundle for SSL
26	LIBASR_DESC= Use stable version of libasr	26	LIBASR_DESC= Use stable version of libasr
27	MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5)	27	MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5)
		28	SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port
28		29
		30	USES= cpe libtool
		31	USE_OPENSSL= yes
29	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \	33	CONFIGURE_ARGS= --with-table-db \
31	--with-mailwrapper --with-ssl-dir=${OPENSSLBASE} --enable-table-db	34	--sysconfdir=${PREFIX}/etc/mail/ \
		35	--with-libasr=${LOCALBASE} \
		36	--with-libevent=${LOCALBASE} \
		37	--with-libssl=${OPENSSLBASE} \
		38	--with-group-queue=${GROUPS}
32		39
33	USE_RC_SUBR= smtpd	40	USE_RC_SUBR= smtpd
34	SUB_FILES= pkg-install pkg-deinstall	41	SUB_FILES= pkg-install pkg-deinstall
Lines 43-55 Link Here
43	LIBASR_LIB_DEPENDS_OFF= libasr.so:${PORTSDIR}/dns/libasr-devel	50	LIBASR_LIB_DEPENDS_OFF= libasr.so:${PORTSDIR}/dns/libasr-devel
44	LIBASR_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr	51	LIBASR_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr
45		52
46	CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt	53	CA_BUNDLE_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
47	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	54	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
48		55
49	USE_OPENSSL= yes	56	PAM_CONFIGURE_WITH= auth-pam=smtpd
		57
		58	.include <bsd.port.options.mk>
		59
		60	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT}
50	WITH_OPENSSL_PORT= yes	61	WITH_OPENSSL_PORT= yes
		62	.endif
51		63
52	post-deinstall:	64	.if ${PORT_OPTIONS:MSSL_PORT}
53	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL	65	WITH_OPENSSL_PORT= yes
		66	.endif
54		67
55	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Removed Link Here

(-)a/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h (-17 lines)
1	Fix for a build failure, taken from
2
3	http://article.gmane.org/gmane.mail.opensmtpd.general/2291
4
5	--- openbsd-compat/defines.h.orig
6	+++ openbsd-compat/defines.h
7	@@ -79,6 +79,10 @@
8	# define MAXHOSTNAMELEN 64
9	#endif
10
11	+#ifndef HOST_NAME_MAX
12	+# define HOST_NAME_MAX 255
13	+#endif
14	+
15	#ifndef LOGIN_NAME_MAX
16	# define LOGIN_NAME_MAX 9
17	#endif

Added Link Here

(-)b/mail/opensmtpd-devel/files/patch-usernamelen (+13 lines)
1	diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c
2	index 3a0ca2a..404ee50 100644
3	--- smtpd/smtp_session.c
4	+++ smtpd/smtp_session.c
5	@@ -84,6 +84,7 @@ enum session_flags {
6	SF_BADINPUT = 0x0080,
7	SF_FILTERCONN = 0x0100,
8	SF_FILTERDATA = 0x0200,
9	+ SF_USERTOOLONG = 0x0400,
10	};
11
12	enum message_flags {
13

Added Link Here

(-)b/mail/opensmtpd-devel/files/pkg-message.in (+18 lines)
1	If you are upgrading from OpenSMTPD version 201303011853 or earlier, please
2	follow the procedure below to update the permissions on the OpenSMTPD
3	spool directories:
4
5	1. Stop 'smtpd' service:
6
7	# %%PREFIX%%/etc/rc.d/smtpd stop
8
9	2. Update permissions:
10
11	# chown -R _smtpq:wheel /var/spool/smtpd/corrupt
12	# chown -R _smtpq:wheel /var/spool/smtpd/purge
13	# chown -R _smtpq:wheel /var/spool/smtpd/queue
14	# chown -R _smtpq:wheel /var/spool/smtpd/temporary
15
16	3. Start 'smtpd' service:
17
18	# %%PREFIX%%/etc/rc.d/smtpd start

Lines 1-15 Link Here

(-)b/mail/opensmtpd-devel/pkg-plist (-9 / +8 lines)
1	etc/mail/smtpd.conf.sample	1	@sample etc/mail/smtpd.conf.sample
		2	libexec/opensmtpd/encrypt
2	libexec/opensmtpd/mail.local	3	libexec/opensmtpd/mail.local
3	libexec/opensmtpd/makemap
4	libexec/opensmtpd/encrypt
5	sbin/smtpctl	4	sbin/smtpctl
6	sbin/smtpd	5	sbin/smtpd
		6	man/man5/aliases.5.gz
		7	man/man5/forward.5.gz
		8	man/man5/smtpd.conf.5.gz
		9	man/man5/table.5.gz
		10	man/man8/makemap.8.gz
7	man/man8/newaliases.8.gz	11	man/man8/newaliases.8.gz
8	man/man8/sendmail.8.gz	12	man/man8/sendmail.8.gz
		13	man/man8/smtpctl.8.gz
9	man/man8/smtpd.8.gz	14	man/man8/smtpd.8.gz
10	man/man8/makemap.8.gz
11	man/man8/smtpctl.8.gz
12	man/man5/table.5.gz
13	man/man5/smtpd.conf.5.gz
14	man/man5/forward.5.gz
15	man/man5/aliases.5.gz