Attachment 170807 Details for Bug 209770 – Updated opensmtpd-devel diff

[patch] Updated opensmtpd-devel diff

opensmtpd-devel2.diff (text/plain), 6.42 KB, created by Ashish SHUKLA on 2016-05-29 19:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2016-05-29 19:36:09 UTC

Size: 6.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 409537)
>+++ Makefile	(working copy)
>@@ -2,9 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	opensmtpd
>-PORTVERSION=	201602131907
>+PORTVERSION=	201605221711
> DISTVERSIONSUFFIX=	p1
> PORTEPOCH=	1
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.opensmtpd.org/archives/ \
> 		http://distfiles.pirateparty.in/ashish/
>@@ -16,60 +17,66 @@
> LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
>+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}
> 
>+CPE_VENDOR=	openbsd
>+
> USE_RC_SUBR=	smtpd
>-SUB_FILES=	pkg-install pkg-deinstall
>+SUB_FILES=	pkg-install pkg-deinstall pkg-message
> 
>-CPE_VENDOR=	openbsd
>-
> 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:${PORTSDIR}/dns/libasr-devel
>-LIBASR_LIB_DEPENDS=	libasr.so:${PORTSDIR}/dns/libasr
>+LIBASR_LIB_DEPENDS=	libasr.so:dns/libasr
>+LIBASR_LIB_DEPENDS_OFF=	libasr.so:dns/libasr-devel
> 
>-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
>+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
>+	${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 409536)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-mk_smtpd_Makefile.in
>===================================================================
>--- files/patch-mk_smtpd_Makefile.in	(revision 409536)
>+++ files/patch-mk_smtpd_Makefile.in	(working copy)
>@@ -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									\
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 409536)
>+++ files/pkg-message.in	(working copy)
>@@ -1,4 +1,4 @@
>-If you are upgrading from OpenSMTPD version 201303011853 or earlier, please 
>+If you are upgrading from OpenSMTPD version 201303011853 or earlier, please
> follow the procedure below to update the permissions on the OpenSMTPD
> spool directories:
> 
>Index: files/smtpd.in
>===================================================================
>--- files/smtpd.in	(revision 409536)
>+++ files/smtpd.in	(working copy)
>@@ -18,11 +18,6 @@
> 
> . /etc/rc.subr
> 
>-check_process()
>-{
>-	/bin/pgrep -j none -f "^$smtpd_procname\$"
>-}
>-
> name="smtpd"
> rcvar=smtpd_enable
> 
>@@ -34,18 +29,21 @@
> load_rc_config $name
> 
> : ${smtpd_enable:="NO"}
>-: ${smtpd_config:="%%PREFIX%%/etc/mail/smtpd.conf"}
>-: ${smtpd_procname:="%%PREFIX%%/sbin/smtpd"}
>+: ${smtpd_config:="%%PREFIX%%/etc/mail/${name}.conf"}
>+: ${smtpd_procname:="%%PREFIX%%/sbin/${name}"}
> : ${smtpd_flags:=""}
> 
> command=${smtpd_procname}
>+command_args="-f ${smtpd_config} ${command_args}"
>+required_files="${smtpd_config}"
> 
> procname=${smtpd_procname}
>+pidfile="/var/run/${name}.pid"
> 
> smtpd_checkconfig()
> {
>     echo "Performing sanity check on smtpd configuration:"
>-    eval ${command} ${smtpd_flags} -n
>+    eval ${command} ${command_args} ${smtpd_flags} -n
> }
> 
> smtpd_precmd()
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 409536)
>+++ pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 209770: 170689 | 170807