From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 6 08:20:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C2AF16A41F for ; Fri, 6 Jan 2006 08:20:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62ABF43D4C for ; Fri, 6 Jan 2006 08:20:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k068K3ue080447 for ; Fri, 6 Jan 2006 08:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k068K3eu080446; Fri, 6 Jan 2006 08:20:03 GMT (envelope-from gnats) Resent-Date: Fri, 6 Jan 2006 08:20:03 GMT Resent-Message-Id: <200601060820.k068K3eu080446@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Petr Rehor Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2526E16A41F; Fri, 6 Jan 2006 08:15:10 +0000 (GMT) (envelope-from reho@rx.cz) Received: from charon.rx.cz (199.106.broadband4.iol.cz [85.71.106.199]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F39A43D46; Fri, 6 Jan 2006 08:15:08 +0000 (GMT) (envelope-from reho@rx.cz) Received: from charon.rx.cz (localhost [127.0.0.1]) by charon.rx.cz (8.13.4/8.13.4) with ESMTP id k068F2f6028153; Fri, 6 Jan 2006 09:15:03 +0100 (CET) (envelope-from reho@199.106.broadband4.iol.cz) Received: (from root@localhost) by charon.rx.cz (8.13.4/8.13.4/Submit) id k068F2U3028152; Fri, 6 Jan 2006 09:15:02 +0100 (CET) (envelope-from reho) Message-Id: <200601060815.k068F2U3028152@charon.rx.cz> Date: Fri, 6 Jan 2006 09:15:02 +0100 (CET) From: Petr Rehor To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: perl@FreeBSD.org Subject: ports/91379: [patch] mail/p5-Mail-SpamAssassin : install overwrites existing config file v310.pre X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Petr Rehor List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 08:20:07 -0000 >Number: 91379 >Category: ports >Synopsis: [patch] mail/p5-Mail-SpamAssassin : install overwrites existing config file v310.pre >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 06 08:20:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Petr Rehor >Release: FreeBSD 6.0-RELEASE-c3 i386 >Organization: >Environment: System: FreeBSD charon.rx.cz 6.0-RELEASE-c3 FreeBSD 6.0-RELEASE-c3 #0: Tue Nov 8 20:44:39 UTC 2005 root@marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386 >Description: Any customised v310.pre is silently zapped and replaced with the default on a port upgrade. >How-To-Repeat: >Fix: --- p5-Mail-SpamAssassin.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v retrieving revision 1.85 diff -u -r1.85 Makefile --- Makefile 4 Jan 2006 06:35:11 -0000 1.85 +++ Makefile 6 Jan 2006 08:05:40 -0000 @@ -165,6 +165,7 @@ @${FIND} ${WRKSRC} -name \*.orig -delete @${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \ -e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \ + -e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL .if defined(WITH_RAZOR) @@ -189,6 +190,9 @@ @[ -f ${PREFIX}/etc/mail/spamassassin/init.pre ] || \ ${CP} ${PREFIX}/etc/mail/spamassassin/init.pre.sample \ ${PREFIX}/etc/mail/spamassassin/init.pre + @[ -f ${PREFIX}/etc/mail/spamassassin/v310.pre ] || \ + ${CP} ${PREFIX}/etc/mail/spamassassin/v310.pre.sample \ + ${PREFIX}/etc/mail/spamassassin/v310.pre .if defined(WITH_TOOLS) @${MKDIR} ${DATADIR}/tools @for f in ${WRKSRC}/tools/*; do \ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/pkg-plist,v retrieving revision 1.31 diff -u -r1.31 pkg-plist --- pkg-plist 17 Sep 2005 15:05:19 -0000 1.31 +++ pkg-plist 6 Jan 2006 08:07:13 -0000 @@ -8,7 +8,9 @@ @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi etc/mail/spamassassin/init.pre.sample @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre -etc/mail/spamassassin/v310.pre +@unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi +etc/mail/spamassassin/v310.pre.sample +@exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre etc/rc.d/sa-spamd.sh %%SITE_PERL%%/Mail/SpamAssassin.pm %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm --- p5-Mail-SpamAssassin.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: