Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Feb 2012 09:32:27 -0900 (AKST)
From:      Mel Flynn <rflynn@acsalaska.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        MAINTAINER <sahil@FreeBSD.org>
Subject:   ports/165046: [PATCH] mail/postfix preserve ident in mailer.conf
Message-ID:  <201202121832.q1CIWREp007339@datakitty.lan.rachie.is-a-geek.net>
Resent-Message-ID: <201202121840.q1CIe92u023953@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         165046
>Category:       ports
>Synopsis:       [PATCH] mail/postfix preserve ident in mailer.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 12 18:40:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     melvyn
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD datakitty.lan.rachie.is-a-geek.net 8.2-STABLE FreeBSD 8.2-STABLE #6 r230977: Sun Feb 5 06:20:11 AKST 2012 mel@datakitty.lan.rachie.is-a-geek.net:/data/obj/data/RELENG_8/src/sys/GENERIC amd64


	
>Description:
When writing mailer.conf, the FreeBSD ident is lost, which makes
mergemaster -F show the file even if it hasn't changed in $SRC.

>How-To-Repeat:
install mail/postfix and opt to update mailer.conf

>Fix:

--- postfix.diff begins here ---
--- files/pkg-install.in.orig	2012-02-10 20:14:34.000000000 -0900
+++ files/pkg-install.in	2012-02-12 06:59:42.000000000 -0900
@@ -81,7 +81,13 @@
 	if [ ${ret} -ne 0 ]; then
 		if yesno "Would you like to activate Postfix in ${MC}" ${DEFAULT_REPLACE_MAILERCONF}; then
 			/bin/mv -f ${MC} ${MC}.old
-			echo "#"						>	${MC}
+			ident=`grep -s '\$FreeBSD: .*\$$' ${MC}.old`
+			if [ ! -z "${ident}" ]; then
+				echo ${ident}				>	${MC}
+				echo '#'				>>	${MC}
+			else
+				echo '#'				>	${MC}
+			fi
 			echo -n "# Execute the Postfix sendmail program"	>>	${MC}
 			echo ", named ${PREFIX}/sbin/sendmail"			>>	${MC}
 			echo "#"						>>	${MC}
--- postfix.diff ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202121832.q1CIWREp007339>