Attachment 143820 Details for Bug 187101 – Move state dir to /var/run/amavis and support STAGEDIR

[patch] Move state dir to /var/run/amavis and support STAGEDIR

amavisd-milter-1.6.0_1.patch (text/plain), 4.03 KB, created by Petr Rehor on 2014-06-15 22:37:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Rehor

Created: 2014-06-15 22:37:07 UTC

Size: 4.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357924)
>+++ Makefile	(working copy)
>@@ -1,12 +1,13 @@
>-# Created by: Petr Rehor <prehor@gmail.com>
>+# Created by: Petr Rehor <rx@rx.cz>
> # $FreeBSD$
> 
> PORTNAME=	amavisd-milter
> PORTVERSION=	1.6.0
>+PORTREVISION=	1
> CATEGORIES=	security mail
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	prehor@gmail.com
>+MAINTAINER=	rx@rx.cz
> COMMENT=	Milter for amavisd-new
> 
> RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
>@@ -24,23 +25,23 @@
> 
> # Shared defaults with security/amavisd-new
> AMAVISUSER?=	vscan
>+AMAVISGROUP?=	vscan
> AMAVISDIR?=	/var/amavis
> 
>+RUNDIR=		/var/run/amavis
>+
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--localstatedir=${AMAVISDIR} --with-working-dir=tmp
>+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=tmp
> USE_RC_SUBR=	${PORTNAME}
> 
>-SUB_FILES=	pkg-message
> SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
>-		AMAVISDIR=${AMAVISDIR}
>+		AMAVISGROUP=${AMAVISGROUP} \
>+		AMAVISDIR=${AMAVISDIR} \
>+		RUNDIR=${RUNDIR}
>+PLIST_SUB=	${SUB_LIST}
> 
> PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
> 
>-NO_STAGE=	yes
>-PLIST_FILES=	sbin/amavisd-milter
>-PLIST_SUB=	RC_DIR=${RC_DIR} \
>-		RC_SUFX=${RC_SUFX}
>-
> MAN8=		amavisd-milter.8
> 
> .include <bsd.port.pre.mk>
>@@ -72,12 +73,9 @@
> .endif
> 
> post-install:
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
>-.endif
>-	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.post.mk>
>Index: files/amavisd-milter.in
>===================================================================
>--- files/amavisd-milter.in	(revision 357924)
>+++ files/amavisd-milter.in	(working copy)
>@@ -25,12 +25,13 @@
> # Set defaults
> : ${amavisd_milter_enable:="NO"}
> : ${amavisd_milter_user="%%AMAVISUSER%%"}
>-: ${amavisd_milter_socket:="%%AMAVISDIR%%/amavisd-milter.sock"}
>+: ${amavisd_milter_socket:="%%RUNDIR%%/amavisd-milter.sock"}
> : ${amavisd_milter_socket_perm:="0666"}
>+: ${amavisd_am_pdp_socket:="%%AMAVISDIR%%/amavisd.sock"}
> 
>-pidfile="${amavisd_milter_pidfile:-%%AMAVISDIR%%/amavisd-milter.pid}"
>+pidfile="${amavisd_milter_pidfile:-%%RUNDIR%%/amavisd-milter.pid}"
> command="%%PREFIX%%/sbin/amavisd-milter"
>-command_args="-p ${pidfile} -s ${amavisd_milter_socket}"
>+command_args="-p ${pidfile} -s ${amavisd_milter_socket} -S ${amavisd_am_pdp_socket}"
> required_files="%%PREFIX%%/etc/amavisd.conf"
> start_postcmd="amavisd_milter_postcmd"
> 
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 357924)
>+++ files/pkg-message.in	(working copy)
>@@ -1,12 +0,0 @@
>-
>-*******************************************************************
>-
>- To configure amavisd-milter, sendmail and amavisd-new point
>- your browser to http://amavisd-milter.sourceforge.net
>-
>- Enable amavisd-milter in /etc/rc.conf with the following line:
>-
>-	amavisd_milter_enable="YES"
>-
>-*******************************************************************
>-
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 0)
>+++ pkg-message	(working copy)
>@@ -0,0 +1,12 @@
>+
>+*******************************************************************
>+
>+ To configure amavisd-milter, sendmail and amavisd-new point
>+ your browser to http://amavisd-milter.sourceforge.net
>+
>+ Enable amavisd-milter in /etc/rc.conf with the following line:
>+
>+	amavisd_milter_enable="YES"
>+
>+*******************************************************************
>+
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 0)
>+++ pkg-plist	(working copy)
>@@ -0,0 +1,8 @@
>+@unexec if service amavisd-milter status | grep -q "amavisd-milter is running"; then service amavisd-milter stop; fi
>+
>+sbin/amavisd-milter
>+
>+@unexec rmdir %%RUNDIR%% 2>/dev/null || true
>+@exec mkdir -p %%RUNDIR%%
>+@exec chmod 755 %%RUNDIR%%
>+@exec chown %%AMAVISUSER%%:%%AMAVISGROUP%% %%RUNDIR%%

Flags:

rx: maintainer-approval+

Actions: View | Diff

Attachments on bug 187101: 143820 | 144193