From m.seaman@inpharmatica.co.uk Fri Jul 16 02:57:12 1999
Return-Path: <m.seaman@inpharmatica.co.uk>
Received: from gallions-reach.inpharmatica.co.uk (gallions-reach.inpharmatica.co.uk [193.115.214.5])
	by hub.freebsd.org (Postfix) with ESMTP id 8A6E51567E
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Jul 1999 02:57:09 -0700 (PDT)
	(envelope-from m.seaman@inpharmatica.co.uk)
Received: from kings-cross.inpharmatica.co.uk (euston.inpharmatica.co.uk [193.115.214.6])
	by gallions-reach.inpharmatica.co.uk (8.8.8/8.8.8) with ESMTP id JAA11460
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Jul 1999 09:57:08 GMT
	(envelope-from m.seaman@inpharmatica.co.uk)
Received: from st-pancras.inpharmatica.co.uk (st-pancras.inpharmatica.co.uk [192.168.121.1])
	by kings-cross.inpharmatica.co.uk (8.9.3/8.9.3) with ESMTP id KAA25060
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Jul 1999 10:57:08 +0100
Received: (from matthew@localhost)
	by st-pancras.inpharmatica.co.uk (8.9.3/8.9.3) id KAA35859;
	Fri, 16 Jul 1999 10:57:08 +0100 (BST)
	(envelope-from matthew@mailhost.inpharmatica.co.uk)
Message-Id: <199907160957.KAA35859@st-pancras.inpharmatica.co.uk>
Date: Fri, 16 Jul 1999 10:57:08 +0100 (BST)
From: m.seaman@inpharmatica.co.uk
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] mergemaster takes no account of SENDMAIL_CF make variable 
X-Send-Pr-Version: 3.2

>Number:         12664
>Category:       ports
>Synopsis:       mergemaster takes no account of SENDMAIL_CF make variable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 16 03:00:01 PDT 1999
>Closed-Date:    Fri Jul 16 21:17:55 PDT 1999
>Last-Modified:  Fri Jul 16 21:18:38 PDT 1999
>Originator:     Matthew Seaman
>Release:        FreeBSD 3.2-STABLE i386
>Organization:
Inpharmatica Ltd
>Environment:

FreeBSD st-pancras.inpharmatica.co.uk 3.2-STABLE FreeBSD 3.2-STABLE #0: Wed Jul 14 16:42:29 BST 1999     root@st-pancras.inpharmatica.co.uk:/export/src/sys/compile/ST-PANCRAS  i386


>Description:

By defining the variable SENDMAIL_CF in, eg. /etc/make.conf it is
possible to cause a make world to install a custom /etc/sendmail.cf
rather than the default freebsd.cf derived from
/usr/src/etc/sendmail/freebsd.mc

However, mergemaster does not abide by this and always compares the installed
/etc/sendmail.cf against freebsd.cf

>How-To-Repeat:

cat <<FOO >>/etc/make.conf
# Overide default /etc/sendmail.cf
SENDMAIL_CF=	foo.cf
FOO
cat <<BAR >>/usr/src/etc/sendmail/foo.mc
OSTYPE(bsd4.4)
FEATURE(nullclient, mailhost.$m)
BAR
cd /usr/src
make world
mergemaster

>Fix:

make install in /usr/src/etc/sendmail is a no-op unless SENDMAIL_CF is defined
	
--- mergemaster.orig	Fri Jul 16 10:38:18 1999
+++ mergemaster	Fri Jul 16 10:39:39 1999
@@ -209,7 +209,9 @@
 
   { cd /usr/src/etc &&
     make DESTDIR=${TEMPROOT} distrib-dirs &&
-    make DESTDIR=${TEMPROOT} distribution;} ||
+    make DESTDIR=${TEMPROOT} distribution &&
+    cd /usr/src/etc/sendmail &&
+    make DESTDIR=${TEMPROOT} install;} ||
   { echo '';
     echo "  *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the";
     echo "      temproot environment";



>Release-Note:
>Audit-Trail:

From: Doug <Doug@gorean.org>
To: m.seaman@inpharmatica.co.uk
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/12664: [PATCH] mergemaster takes no account of SENDMAIL_CF 
 make variable
Date: Fri, 16 Jul 1999 08:20:56 -0700

 	FYI, mergemaster is not part of the freebsd base system, so using send-pr
 to report problems with it is not appropriate. The man page lists the
 proper bug reporting procedure, namely to mail them to me (the author). 
 
 m.seaman@inpharmatica.co.uk wrote:
 
 > By defining the variable SENDMAIL_CF in, eg. /etc/make.conf it is
 > possible to cause a make world to install a custom /etc/sendmail.cf
 > rather than the default freebsd.cf derived from
 > /usr/src/etc/sendmail/freebsd.mc
 > 
 > However, mergemaster does not abide by this and always compares the installed
 > /etc/sendmail.cf against freebsd.cf
 
 	The script (purposely) takes no interest in _how_ the temporary root
 environment is built, that is the province of /usr/src/etc/Makefile. I do
 not want to make custom changes to that process because then mergemaster
 would not be doing its job, which is to show you how your system differs
 from the default installation. If you are specifying a customized
 sendmail.cf file I assume that you are aware of what is contained in it,
 therefore the comparison is at worst a matter of deleting the default file
 in the temp root environment. You might also consider deleting the
 sendmail.cf creation procedure from /usr/src/etc/Makefile which would
 eliminate the comparison entirely. 
  
 	While I always welcome suggestions for improving the script, I am afraid
 that your suggestion would do more harm than good for the vast majority of
 users. 
 
 Thank you for your interest,
 
 Doug
 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Fri Jul 16 21:17:55 PDT 1999 
State-Changed-Why:  
Maintainer of this port rejected the patch. 
>Unformatted:
