From root@gits.dyndns.org  Fri Nov 24 21:43:11 2000
Return-Path: <root@gits.dyndns.org>
Received: from lafontaine.cybercable.fr (lafontaine.cybercable.fr [212.198.0.202])
	by hub.freebsd.org (Postfix) with SMTP id 8334C37B4C5
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Nov 2000 21:43:10 -0800 (PST)
Received: (qmail 12417262 invoked from network); 25 Nov 2000 05:43:00 -0000
Received: from s011.dhcp212-229.cybercable.fr (HELO gits.dyndns.org) ([212.198.229.11]) (envelope-sender <root@gits.dyndns.org>)
          by lafontaine.cybercable.fr (qmail-ldap-1.03) with SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 25 Nov 2000 05:43:00 -0000
Received: (from root@localhost)
	by gits.dyndns.org (8.11.1/8.11.1) id eAP5gxn43331;
	Sat, 25 Nov 2000 06:42:59 +0100 (CET)
	(envelope-from root)
Message-Id: <200011250542.eAP5gxn43331@gits.dyndns.org>
Date: Sat, 25 Nov 2000 06:42:59 +0100 (CET)
From: "Cyrille.Lefevre" <clefevre@citeweb.net>
Sender: root@gits.dyndns.org
Reply-To: "Cyrille.Lefevre" <clefevre@citeweb.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: make etc-sendmail.cf broke mergemaster
X-Send-Pr-Version: 3.2

>Number:         23088
>Category:       conf
>Synopsis:       make etc-sendmail.cf broke mergemaster
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    gshapiro
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 24 21:50:01 PST 2000
>Closed-Date:    Tue Feb 27 18:58:46 PST 2001
>Last-Modified:  Tue Feb 27 18:58:56 PST 2001
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
ACME
>Environment:

FreeBSD gits 4.2-STABLE FreeBSD 4.2-STABLE #0: Tue Nov 21 06:13:59 CET 2000     root@gits:/disk2/4.0-stable/src/sys/compile/CUSTOM  i386

>Description:

	mergemaster doesn't install the right sendmail.cf while
	SENDMAIL_CF is defined in /etc/make.conf.

	also, move the comments about SENDMAIL_CF and a commented
	variable definition from etc/sendmail/Makefile to
	etc/defaults/make.conf.

	the old behaviour has been followed, that is, do nothing
	in make install.

>How-To-Repeat:

	echo SENDMAIL_CF=freefall.cf >> /etc/make.conf
	mergemaster

>Fix:

Index: defaults/make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.97.2.26
diff -u -r1.97.2.26 make.conf
--- defaults/make.conf	2000/11/10 10:48:10	1.97.2.26
+++ defaults/make.conf	2000/11/25 05:23:46
@@ -301,3 +301,8 @@
 #SENDMAIL_LDFLAGS=
 #SENDMAIL_LDADD=
 #SENDMAIL_DPADD=
+#
+# Local sendmail.cf.  Warning! If set, this causes 'make install'
+# to always copy it over /etc/mail/sendmail.cf!!!
+# Caveat emptor!  Be sure you want this before you enable it.
+#SENDMAIL_CF?=	freefall.cf
Index: sendmail/Makefile
===================================================================
RCS file: /home/ncvs/src/etc/sendmail/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sendmail/Makefile	1999/12/19 19:55:18	1.3
+++ sendmail/Makefile	2000/11/25 05:27:59
@@ -15,13 +15,10 @@
 	    $(M4) -D_CF_DIR_=${CFDIR}/ ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
 	$(CHMOD) $(ROMODE) ${.TARGET}
 
-ALL=	freebsd.cf
-
-# Local sendmail.cf, may be set in /etc/make.conf.  Warning! If set, this
-# causes 'make install' to always copy it over /etc/mail/sendmail.cf!!!
-# Caveat emptor!  Be sure you want this before you enable it.
 .if defined(SENDMAIL_CF)
-ALL+=	${SENDMAIL_CF}
+ALL=	${SENDMAIL_CF}
+.else
+ALL=	freebsd.cf
 .endif
 
 CLEANFILES+=$(ALL)
@@ -30,15 +27,15 @@
 
 depend:
 
-install:
 .if defined(SENDMAIL_CF)
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${SENDMAIL_CF} \
-		${DESTDIR}/etc/mail/sendmail.cf
+install: etc-sendmail.cf
+.else
+install:
 .endif
 
 # Helper for src/etc/Makefile
-etc-sendmail.cf: freebsd.cf
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
+etc-sendmail.cf: $(ALL)
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 $(ALL) \
 		${DESTDIR}/etc/mail/sendmail.cf
 
 # this is overkill, but....

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->gshapiro 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Sat Nov 25 15:09:54 PST 2000 
Responsible-Changed-Why:  

This isn't actually a mergemaster problem, as all it does 
is use /usr/src/etc/Makefile, which in turn calls sendmail's 
Makefile. Therefore it falls into Mr. Shapiro's perview. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23088 
State-Changed-From-To: open->feedback 
State-Changed-By: gshapiro 
State-Changed-When: Wed Feb 21 21:41:00 PST 2001 
State-Changed-Why:  
I've checked in changes to the HEAD such that mergemaster should get the  
proper sendmail.cf.  Unless I hear otherwise, I'll close this PR in the near 
future. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23088 
State-Changed-From-To: feedback->closed 
State-Changed-By: gshapiro 
State-Changed-When: Tue Feb 27 18:58:46 PST 2001 
State-Changed-Why:  
The changes are now also in RELENG_4 (-STABLE). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23088 
>Unformatted:
