From owner-freebsd-bugs Sat Jul 13 17:10:14 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8756837B400 for ; Sat, 13 Jul 2002 17:10:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DA2943E4A for ; Sat, 13 Jul 2002 17:10:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6E0A2JU085320 for ; Sat, 13 Jul 2002 17:10:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6E0A2LM085319; Sat, 13 Jul 2002 17:10:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C2F137B400 for ; Sat, 13 Jul 2002 17:02:08 -0700 (PDT) Received: from smtp.noos.fr (verlaine.noos.net [212.198.2.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E14243E58 for ; Sat, 13 Jul 2002 17:02:07 -0700 (PDT) (envelope-from root@gits.dyndns.org) Received: (qmail 31930190 invoked by uid 0); 14 Jul 2002 00:02:04 -0000 Received: from unknown (HELO gits.gits.dyndns.org) ([212.198.229.153]) (envelope-sender ) by 212.198.2.73 (qmail-ldap-1.03) with SMTP for ; 14 Jul 2002 00:02:04 -0000 Received: from gits.gits.dyndns.org (xq0ugmpt64yrpzne@localhost [127.0.0.1]) by gits.gits.dyndns.org (8.12.5/8.12.5) with ESMTP id g6E023dT055768; Sun, 14 Jul 2002 02:02:03 +0200 (CEST) (envelope-from root@gits.dyndns.org) Received: (from root@localhost) by gits.gits.dyndns.org (8.12.5/8.12.5/Submit) id g6E023PG055767; Sun, 14 Jul 2002 02:02:03 +0200 (CEST) (envelope-from root) Message-Id: <200207140002.g6E023PG055767@gits.gits.dyndns.org> Date: Sun, 14 Jul 2002 02:02:03 +0200 (CEST) From: Cyrille Lefevre Reply-To: Cyrille Lefevre To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gregory Neil Shapiro X-Send-Pr-Version: 3.113 Subject: bin/40540: Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40540 >Category: bin >Synopsis: >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jul 13 17:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.6-STABLE i386 >Organization: ACME >Environment: System: FreeBSD gits 4.6-STABLE FreeBSD 4.6-STABLE #16: Sat Jul 6 19:06:54 CEST 2002 root@gits:/disk2/freebsd/stable/src/sys/compile/CUSTOM i386 >Description: this patch allow multiple alias file to be defined in SENDMAIL_ALIASES. >How-To-Repeat: make SENDMAIL_ALIASES="/etc/mail/aliases /etc/mail/majordomo" kaboum! >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/src/etc/mail/Makefile,v retrieving revision 1.9.2.19 diff -u -r1.9.2.19 Makefile --- Makefile 24 May 2002 15:41:04 -0000 1.9.2.19 +++ Makefile 13 Jul 2002 23:54:54 -0000 @@ -89,6 +89,8 @@ SENDMAIL_CF_DIR?= /usr/src/contrib/sendmail/cf .endif +M4FLAGS= -D_CF_DIR_=${SENDMAIL_CF_DIR}/ + # # The sendmail startup script # @@ -156,16 +158,18 @@ .SUFFIXES: .cf .mc .mc.cf: ${M4FILES} - ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \ + ${M4} ${M4FLAGS} ${SENDMAIL_M4_FLAGS} \ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET} # # Aliases are handled separately since they normally reside in /etc # and can be rebuild without the help of makemap. # -${SENDMAIL_ALIASES}.db: ${SENDMAIL_ALIASES} - ${SENDMAIL} -bi +.for _f in ${SENDMAIL_ALIASES} +${_f}.db: ${_f} + ${SENDMAIL} -bi -OAliasFile=${.ALLSRC} chmod ${SENDMAIL_MAP_PERMS} ${.TARGET} +.endfor # # ------------------------------------------------------------------------ @@ -203,7 +207,7 @@ .endif .endif -aliases: ${SENDMAIL_ALIASES}.db +aliases: ${SENDMAIL_ALIASES:%=%.db} maps: ${SENDMAIL_MAP_OBJ} >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message