Attachment 160931 Details for Bug 203045 – Patch

[patch] Patch

amavisd-new.patch (text/plain), 3.80 KB, created by Dmitry Marakasov on 2015-09-11 15:56:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-09-11 15:56:48 UTC

Size: 3.80 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396669)
>+++ Makefile	(working copy)
>@@ -74,7 +74,7 @@
> MSWORD_DESC=		Ms Word support with textproc/ripole
> TNEF_DESC=		Add external tnef decoder converters/tnef
> 
>-SUB_FILES=	pkg-install pkg-deinstall pkg-message
>+SUB_FILES=	pkg-deinstall pkg-message
> 
> SUB_LIST+=	AMAVISUSER=${AMAVISUSER} \
> 		AMAVISGROUP=${AMAVISGROUP} \
>@@ -83,7 +83,11 @@
> 		DAEMON="${DAEMON}" \
> 		PERL=${PERL}
> 
>-PLIST_SUB+=	AMAVIS_NOP0F=${AMAVIS_NOP0F}
>+PLIST_SUB+=	AMAVISUSER=${AMAVISUSER} \
>+		AMAVISGROUP=${AMAVISGROUP} \
>+		AMAVISDIR=${AMAVISDIR} \
>+		AMAVISQUARANTINE=${AMAVISQUARANTINE} \
>+		AMAVIS_NOP0F=${AMAVIS_NOP0F}
> 
> .include <bsd.port.options.mk>
> 
>@@ -240,9 +244,6 @@
> 			${WRKSRC}/amavisd
> 
> do-install:
>-.if ${PORT_OPTIONS:MP0F}
>-	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
>-.endif
> .for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent
> 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin
> .endfor
>@@ -249,13 +250,20 @@
> 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample
> 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default
> 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample
>-.if ${PORT_OPTIONS:MDOCS}
>+	${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue
>+	${MKDIR} ${STAGEDIR}${AMAVISDIR}/var
>+	${MKDIR} ${STAGEDIR}${AMAVISDIR}/tmp
>+	${MKDIR} ${STAGEDIR}${AMAVISDIR}/db
>+	${MKDIR} ${STAGEDIR}${AMAVISQUARANTINE}
>+
>+do-install-P0F-on:
>+	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
>+
>+do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
> .for i in ${DOCS}
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
> .endfor
> 	@${CP} -pr ${WRKSRC}/README_FILES/images/ ${STAGEDIR}${DOCSDIR}/images
>-.endif
>-	${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue
> 
> .include <bsd.port.post.mk>
>Index: files/pkg-install.in
>===================================================================
>--- files/pkg-install.in	(revision 396669)
>+++ files/pkg-install.in	(working copy)
>@@ -1,23 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-USER=%%AMAVISUSER%%
>-GROUP=%%AMAVISGROUP%%
>-DIR=%%AMAVISDIR%%
>-QUARANTINE=%%AMAVISQUARANTINE%%
>-
>-if [ "$2" = "PRE-INSTALL" ]; then
>-
>-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}
>-    echo "Created \"${DIR}\" directory."
>-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db
>-    echo "Created \"${DIR}/db\" directory."
>-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/tmp
>-    echo "Created \"${DIR}/tmp\" directory."
>-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/var
>-    echo "Created \"${DIR}/var\" directory."
>-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE}
>-    echo "Created \"${QUARANTINE}\" directory."    
>-fi
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 396669)
>+++ pkg-plist	(working copy)
>@@ -61,9 +61,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/images/toc-plus.png
> %%PORTDOCS%%%%DOCSDIR%%/images/up.png
> %%PORTDOCS%%%%DOCSDIR%%/images/warning.png
>-%%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts
>-%%PORTDOCS%%@dir %%DOCSDIR%%/images
>-%%PORTDOCS%%@dir %%DOCSDIR%%
> @sample etc/amavisd-custom.conf.sample
> etc/amavisd.conf-default
> @sample etc/amavisd.conf.sample
>@@ -74,3 +71,8 @@
> sbin/amavisd-release
> sbin/amavisd-requeue
> sbin/amavisd-snmp-subagent
>+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISQUARANTINE%%
>+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/var
>+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/tmp
>+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/db
>+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%

Actions: View | Diff

Attachments on bug 203045: 160931