From matt@gsicomp.on.ca  Fri Oct 18 21:06:59 2002
Return-Path: <matt@gsicomp.on.ca>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F1C0C37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 21:06:58 -0700 (PDT)
Received: from tomts12-srv.bellnexxia.net (tomts12.bellnexxia.net [209.226.175.56])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1D16E43E75
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 21:06:58 -0700 (PDT)
	(envelope-from matt@gsicomp.on.ca)
Received: from xena.gsicomp.on.ca ([65.95.177.83])
          by tomts12-srv.bellnexxia.net
          (InterMail vM.5.01.04.19 201-253-122-122-119-20020516) with ESMTP
          id <20021019040655.PNVL25284.tomts12-srv.bellnexxia.net@xena.gsicomp.on.ca>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sat, 19 Oct 2002 00:06:55 -0400
Received: from dhcp2.gsicomp.on.ca (dhcp2.gsicomp.on.ca [192.168.0.11])
	by xena.gsicomp.on.ca (8.11.3/8.11.3) with ESMTP id g9J2kup69460
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 22:46:56 -0400 (EDT)
	(envelope-from matt@dhcp2.gsicomp.on.ca)
Received: (from matt@localhost)
	by dhcp2.gsicomp.on.ca (8.12.6/8.12.6) id g9J46skA001031;
	Sat, 19 Oct 2002 00:06:54 -0400 (EDT)
	(envelope-from matt)
Message-Id: <200210190406.g9J46skA001031@dhcp2.gsicomp.on.ca>
Date: Sat, 19 Oct 2002 00:06:54 -0400 (EDT)
From: Matt Emmerton <matt@gsicomp.on.ca>
Reply-To: Matt Emmerton <matt@gsicomp.on.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: /etc/mail/Makefile doesn't build submit.cf file
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44256
>Category:       bin
>Synopsis:       /etc/mail/Makefile doesn't build submit.cf file
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    gshapiro
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 21:10:01 PDT 2002
>Closed-Date:    Sat Jul 12 16:36:24 PDT 2003
>Last-Modified:  Sat Jul 12 16:36:24 PDT 2003
>Originator:     Matt Emmerton
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD laptop.gsicomp.on.ca 5.0-CURRENT FreeBSD 5.0-CURRENT #13: Thu Oct 17 21:13:55 EDT 2002 root@laptop.gsicomp.on.ca:/usr/obj/usr/src/sys/LAPTOP.20020914.01 i386

cvsup'd and rebuilt kernel/world on Oct 17

>Description:

	When issuing a 'make' from /etc/mail, the sendmail.cf file 
	(or `hostname`.cf file) is generated from the corresponding .mc
	file, and if `hostname`.mc doesn't exist, freebsd.mc is used as
	a template.

	According to the makefile, the same should hold true for the
	generation of the submit.cfg file, but this does not occur.

>How-To-Repeat:

	Touch freebsd.submit.mc, issue 'make'.  No `hostname`.submit.mc
	or submit.cf is created.

>Fix:

--- etc/mail/Makefile.orig	Mon Jul 29 05:40:05 2002
+++ etc/mail/Makefile	Fri Oct 18 23:42:53 2002
@@ -69,9 +69,15 @@
 	cp freebsd.mc ${SENDMAIL_MC}
 .endif
 
-SENDMAIL_SUBMIT_MC?=	freebsd.submit.mc
-
 INSTALL_CF=		${SENDMAIL_MC:R}.cf
+
+.ifndef SENDMAIL_SUBMIT_MC
+SENDMAIL_SUBMIT_MC!=	hostname
+SENDMAIL_SUBMIT_MC:=	${SENDMAIL_SUBMIT_MC}.submit.mc
+
+${SENDMAIL_SUBMIT_MC}:
+	cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
+.endif
 
 .ifndef SENDMAIL_SET_USER_ID
 INSTALL_SUBMIT_CF=	${SENDMAIL_SUBMIT_MC:R}.cf
>Release-Note:
>Audit-Trail:

From: "Matthew Emmerton" <matt@gsicomp.on.ca>
To: <freebsd-gnats-submit@FreeBSD.org>, <matt@gsicomp.on.ca>
Cc: <ru@FreeBSD.org>
Subject: Re: bin/44256: /etc/mail/Makefile doesn't build submit.cf file
Date: Wed, 23 Oct 2002 19:22:11 -0400

 My report is slightly inaccurate, as the makefile *will* create a submit.cf,
 but it doesn't create it in the `hostname`.submit.cf format that sendmail.cf
 is created in, and will not use a `hostname`.submit.mc as a template if it
 exists.
 
 I still believe that using `hostname`.submit.mc as a template is a good
 idea -- not only does it help people like me who deploy handfuls of boxes at
 one (each with custom configs), but it keeps things symmetric.
 
 
 

From: Giorgos Keramidas <keramida@freebsd.org>
To: Matthew Emmerton <matt@gsicomp.on.ca>
Cc: bug-followup@freebsd.org
Subject: Re: bin/44256: /etc/mail/Makefile doesn't build submit.cf file
Date: Fri, 25 Oct 2002 04:53:34 +0300 (EEST)

 On 2002-10-23 16:30, Matthew Emmerton wrote:
 > My report is slightly inaccurate, as the makefile *will* create a
 > submit.cf, but it doesn't create it in the `hostname`.submit.cf
 > format that sendmail.cf is created in, and will not use a
 > `hostname`.submit.mc as a template if it exists.
 
 It does.  At least, after setting the proper make.conf variables:
 	SENDMAIL_MC
 	SENDMAIL_SUBMIT_MC
 	SENDMAIL_ADDITIONAL_MC
 
 A small change to /etc/mail/Makefile can make SENDMAIL_SUBMIT_MC
 default to `hostname`.submit.mc too, if that's what you are after:
 
 %%%
 --- Makefile.orig	Fri Oct 25 04:49:43 2002
 +++ Makefile	Fri Oct 25 04:51:27 2002
 @@ -69,7 +69,13 @@
  	cp freebsd.mc ${SENDMAIL_MC}
  .endif
 
 -SENDMAIL_SUBMIT_MC?=	freebsd.submit.mc
 +.ifndef SENDMAIL_SUBMIT_MC
 +SENDMAIL_SUBMIT_MC!=	hostname
 +SENDMAIL_SUBMIT_MC:=	${SENDMAIL_SUBMIT_MC}.submit.mc
 +
 +${SENDMAIL_SUBMIT_MC}:
 +	cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
 +.endif
 
  INSTALL_CF=		${SENDMAIL_MC:R}.cf
 
 %%%
 
 Giorgos.
 

From: "Matthew Emmerton" <matt@gsicomp.on.ca>
To: "Giorgos Keramidas" <keramida@freebsd.org>
Cc: <bug-followup@freebsd.org>
Subject: Re: bin/44256: /etc/mail/Makefile doesn't build submit.cf file
Date: Fri, 25 Oct 2002 22:28:41 -0400

 > On 2002-10-23 16:30, Matthew Emmerton wrote:
 > > My report is slightly inaccurate, as the makefile *will* create a
 > > submit.cf, but it doesn't create it in the `hostname`.submit.cf
 > > format that sendmail.cf is created in, and will not use a
 > > `hostname`.submit.mc as a template if it exists.
 > 
 > It does.  At least, after setting the proper make.conf variables:
 > SENDMAIL_MC
 > SENDMAIL_SUBMIT_MC
 > SENDMAIL_ADDITIONAL_MC
 > 
 > A small change to /etc/mail/Makefile can make SENDMAIL_SUBMIT_MC
 > default to `hostname`.submit.mc too, if that's what you are after:
 > 
 > %%%
 > --- Makefile.orig Fri Oct 25 04:49:43 2002
 > +++ Makefile Fri Oct 25 04:51:27 2002
 > @@ -69,7 +69,13 @@
 >   cp freebsd.mc ${SENDMAIL_MC}
 >  .endif
 > 
 > -SENDMAIL_SUBMIT_MC?= freebsd.submit.mc
 > +.ifndef SENDMAIL_SUBMIT_MC
 > +SENDMAIL_SUBMIT_MC!= hostname
 > +SENDMAIL_SUBMIT_MC:= ${SENDMAIL_SUBMIT_MC}.submit.mc
 > +
 > +${SENDMAIL_SUBMIT_MC}:
 > + cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
 > +.endif
 > 
 >  INSTALL_CF= ${SENDMAIL_MC:R}.cf
 > 
 > %%%
 > 
 > Giorgos.
 
 How is this patch different from the one in my PR?
 
 --
 Matt Emmerton
Responsible-Changed-From-To: freebsd-bugs->gshapiro 
Responsible-Changed-By: gshapiro 
Responsible-Changed-When: Sat Feb 8 11:46:21 PST 2003 
Responsible-Changed-Why:  
Over to sendmail maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44256 
State-Changed-From-To: open->patched 
State-Changed-By: gshapiro 
State-Changed-When: Sun Jul 6 12:11:12 PDT 2003 
State-Changed-Why:  
Your patch has been applied to the HEAD.  The PR will be closed 
when it is MFC'ed into RELENG_4. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44256 
State-Changed-From-To: patched->closed 
State-Changed-By: gshapiro 
State-Changed-When: Sat Jul 12 16:36:04 PDT 2003 
State-Changed-Why:  
The change has been MFC'ed to RELENG_4. 

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