ports/138801: [Patch] security/amavisd-new: make install overwrites amavisd.conf

[Herbert J. Skuhra]

>Number:         138801
>Category:       ports
>Synopsis:       [Patch] security/amavisd-new: make install overwrites amavisd.conf
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 14 05:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 7.2-RELEASE-p2
>Organization:
>Environment:
FreeBSD amavis 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed Jun 24 00:57:44 UTC 2009     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
ports/136151 removes ".include <bsd.port.pre.mk>" and ".include <bsd.port.post.mk>"

So when you upgrade the port your amavisd.conf is overwriten.

install -o root -g vscan -m 640 /usr/ports/security/amavisd-new/work/amavisd-new-2.6.4/amavisd.conf /usr/local/etc


>How-To-Repeat:
# cp /usr/local/etc/amavisd.conf /usr/local/etc/amavisd.conf.bak
# cd /usr/ports/security/amavisd-new/
# make deinstall
===>  Deinstalling for security/amavisd-new
===>   Deinstalling amavisd-new-2.6.4_2,1
You should manually remove the "vscan" group.
You should manually remove the "vscan" user.
You should manually remove the "/var/amavis" directory.
You should manually remove the "/var/virusmails" directory.
# ls -la /usr/local/etc/amavisd.conf
-rw-r-----  1 root  vscan  10649 13 sep 23:11 /usr/local/etc/amavisd.conf
# make install clean
 
# ls -la /usr/local/etc/amavisd.conf
-rw-r-----  1 root  vscan  34880 14 sep 07:03 /usr/local/etc/amavisd.conf
>Fix:
Re-add ".include <bsd.port.pre.mk>" and ".include <bsd.port.post.mk>"

Patch attached with submission follows:

+++ Makefile    2009-09-13 22:57:20.000000000 +0200
@@ -222,6 +222,8 @@
 RUN_DEPENDS+=  ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 .endif

+.include "bsd.port.pre.mk"
+
 pre-fetch:
        @${ECHO} ""
        @${ECHO} " **** UPGRADE WARNING:  SQL SCHEMA CHANGED ****"
@@ -305,4 +307,4 @@
        ${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue
        @${CAT} ${PKGMESSAGE}

-.include <bsd.port.mk>
+.include "bsd.port.post.mk"


>Release-Note:
>Audit-Trail:
>Unformatted: