Attachment 144296 Details for Bug 191518 – patch

[patch] patch

archivesmtp.udiff (text/plain), 4.06 KB, created by netherby on 2014-06-30 19:16:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: netherby

Created: 2014-06-30 19:16:23 UTC

Size: 4.06 KB

patch

obsolete

>diff -ruN archivesmtp.old/Makefile archivesmtp/Makefile
>--- archivesmtp.old/Makefile	2014-01-23 04:00:46.000000000 +1100
>+++ archivesmtp/Makefile	2014-07-01 04:48:10.000000000 +1000
>@@ -1,8 +1,8 @@
> # Created by: Netherby <netherby@dancingfortune.com>
>-# $FreeBSD: head/mail/archivesmtp/Makefile 340722 2014-01-22 17:00:46Z mat $
>+# $FreeBSD$
> 
> PORTNAME=	archivesmtp
>-PORTVERSION=	1.1.b1
>+PORTVERSION=	1.2
> CATEGORIES=	mail
> MASTER_SITES=	http://www.dancingfortune.com/projects/archivesmtp/files/
> 
>@@ -14,22 +14,18 @@
> 		-lmilter
> MAKE_ENV+=	LDADD="${LIBS}"\
> 		BINDIR="${PREFIX}/sbin"\
>-		MANDIR="${MANPREFIX}/man/man"\
>-		NO_MANCOMPRESS="yes"
>+		MANDIR="${MANPREFIX}/man/man"
> 
> USE_RC_SUBR=	archivesmtp
> SUB_FILES=	pkg-message
>-SUB_LIST+=	SOCKETBASE=${SOCKETBASE}\
>-		SOCKETDIR=${SOCKETDIR}
>+SUB_LIST+=	SOCKETBASE="${SOCKETBASE}"\
>+		SOCKETDIR="${SOCKETDIR}"
> PLIST_SUB+=	${SUB_LIST}
> 
>-MAN8=		archivesmtp.8
>-
> # Path for unix/local socket (by default also used for pid file)
> SOCKETBASE?=	/var/run
> SOCKETDIR?=	archivesmtp
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> # Sets up libmilter dependencies and options
>@@ -42,12 +38,8 @@
> 
> post-install:
> 	# Install sample configuration file
>-	${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${PREFIX}/etc
>-	# Create directory for unix/local socket
>-	${MKDIR} ${SOCKETBASE}/${SOCKETDIR}
>-	${CHOWN} nobody ${SOCKETBASE}/${SOCKETDIR}
>-	${CHMOD} 755 ${SOCKETBASE}/${SOCKETDIR}
>-	# Print post install message
>-	@${CAT} ${PKGMESSAGE}
>+	${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${STAGEDIR}${PREFIX}/etc
>+	# Create socket directory
>+	${MKDIR} ${STAGEDIR}${SOCKETBASE}/${SOCKETDIR}
> 
> .include <bsd.port.post.mk>
>diff -ruN archivesmtp.old/distinfo archivesmtp/distinfo
>--- archivesmtp.old/distinfo	2014-01-23 02:30:13.000000000 +1100
>+++ archivesmtp/distinfo	2014-07-01 04:48:10.000000000 +1000
>@@ -1,2 +1,2 @@
>-SHA256 (archivesmtp-1.1.b1.tar.gz) = 0b4c8ddb15262721801c929fd104549c63d569af82ba9aaa5d26294ad88f72d8
>-SIZE (archivesmtp-1.1.b1.tar.gz) = 101835
>+SHA256 (archivesmtp-1.2.tar.gz) = b3ec9e21271dbfd130b2603a9c6f98d1091d9ff9d675094f74a21b2f3b099c54
>+SIZE (archivesmtp-1.2.tar.gz) = 120810
>diff -ruN archivesmtp.old/files/archivesmtp.in archivesmtp/files/archivesmtp.in
>--- archivesmtp.old/files/archivesmtp.in	2014-01-24 11:14:07.000000000 +1100
>+++ archivesmtp/files/archivesmtp.in	2014-07-01 04:48:11.000000000 +1000
>@@ -1,12 +1,15 @@
> #!/bin/sh
> 
>+# $FreeBSD$
>+#
> # PROVIDE: archivesmtp
> # BEFORE: mail
>+# KEYWORD: shutdown
> 
> . /etc/rc.subr
> 
> name="archivesmtp"
>-rcvar=archivesmtp_enable
>+rcvar=`set_rcvar`
> 
> command="%%PREFIX%%/sbin/${name}"
> 
>@@ -18,9 +21,10 @@
> : ${archivesmtp_socket="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"}
> : ${archivesmtp_config="%%PREFIX%%/etc/archivesmtp.conf"}
> : ${archivesmtp_pidfile="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"}
>+# archivesmtp_flags= May be used to set optional behaviours.
> 
> pidfile="${archivesmtp_pidfile}"
> 
>-command_args="${archivesmtp_flags} -p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} &"
>+command_args="-p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} ${archivesmtp_flags} &"
> 
> run_rc_command "$1"
>diff -ruN archivesmtp.old/pkg-descr archivesmtp/pkg-descr
>--- archivesmtp.old/pkg-descr	2014-01-23 02:44:51.000000000 +1100
>+++ archivesmtp/pkg-descr	2014-07-01 04:48:11.000000000 +1000
>@@ -4,6 +4,6 @@
> programs is also supported. The libmilter interface is used and must be
> supported by the MTA for ArchiveSMTP to work.
> 
>-Version: 1.1.b1
>+Version: 1.2
> 
> WWW: http://www.dancingfortune.com/projects/archivesmtp/
>diff -ruN archivesmtp.old/pkg-plist archivesmtp/pkg-plist
>--- archivesmtp.old/pkg-plist	2014-01-23 02:16:56.000000000 +1100
>+++ archivesmtp/pkg-plist	2014-07-01 04:48:11.000000000 +1000
>@@ -1,7 +1,7 @@
> sbin/archivesmtp
> etc/archivesmtp.conf.sample
>-@stopdaemon archivesmtp
>+man/man8/archivesmtp.8.gz
>+@owner nobody
>+@mode 755
> @exec mkdir -p %%SOCKETBASE%%/%%SOCKETDIR%%
>-@exec chown nobody %%SOCKETBASE%%/%%SOCKETDIR%%
>-@cwd %%SOCKETBASE%%
>-@dirrm %%SOCKETDIR%%
>+@dirrmtry %%SOCKETBASE%%/%%SOCKETDIR%%

Actions: View | Diff

Attachments on bug 191518: 144296