From owner-freebsd-bugs@FreeBSD.ORG Sun Apr 28 08:40:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6CBE637 for ; Sun, 28 Apr 2013 08:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id BA8091DD4 for ; Sun, 28 Apr 2013 08:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3S8e0dr006432 for ; Sun, 28 Apr 2013 08:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3S8e0bu006431; Sun, 28 Apr 2013 08:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 28 Apr 2013 08:40:00 GMT Resent-Message-Id: <201304280840.r3S8e0bu006431@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BC8F962C for ; Sun, 28 Apr 2013 08:39:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [69.147.83.34]) by mx1.freebsd.org (Postfix) with ESMTP id AF2171DCF for ; Sun, 28 Apr 2013 08:39:19 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r3S8dJwv014714 for ; Sun, 28 Apr 2013 08:39:19 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r3S8dJNo014713; Sun, 28 Apr 2013 08:39:19 GMT (envelope-from nobody) Message-Id: <201304280839.r3S8dJNo014713@red.freebsd.org> Date: Sun, 28 Apr 2013 08:39:19 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: conf/178215: [PATCH] remove mail/sendmail bits if MK_MAIL/MK_MAILWRAPPER/MK_SENDMAIL == no X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 08:40:00 -0000 >Number: 178215 >Category: conf >Synopsis: [PATCH] remove mail/sendmail bits if MK_MAIL/MK_MAILWRAPPER/MK_SENDMAIL == no >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Apr 28 08:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 10-CURRENT >Organization: EMC Isilon >Environment: FreeBSD fuji-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r+6a3d3f6-dirty: Sat Apr 27 16:03:39 PDT 2013 root@fuji-current.local:/usr/obj/usr/src/sys/FUJI i386 >Description: The attached patch doesn't install mail files in /etc and removes said files if MK_MAILWRAPPER/MK_SENDMAIL are set to no. >How-To-Repeat: >Fix: Patch attached with submission follows: >From ce6cdab4536c6c81267f3d52f53deeb5633a873f Mon Sep 17 00:00:00 2001 From: Garrett Cooper Date: Sun, 28 Apr 2013 01:28:22 -0700 Subject: [PATCH] Remove mail-related items if MK_MAILWRAPPER/MK_SENDMAIL are set to no Also, sort items in etc/rc.d/Makefile Signed-off-by: Garrett Cooper --- etc/Makefile | 5 ++++- etc/rc.d/Makefile | 24 ++++++++++++++++-------- tools/build/mk/OptionalObsoleteFiles.inc | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 3a10b02..cd632fb 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -38,7 +38,6 @@ BIN1= crontab \ rc.bsdextended \ rc.firewall \ rc.initdiskless \ - rc.sendmail \ rc.shutdown \ rc.subr \ remote \ @@ -122,6 +121,10 @@ BIN1+= portsnap.conf BIN1+= pf.os .endif +.if ${MK_SENDMAIL} != "no" +BIN1+= rc.sendmail +.endif + .if ${MK_TCSH} != "no" BIN1+= csh.cshrc csh.login csh.logout .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index aace4b1..c088160 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -104,7 +104,7 @@ FILES= DAEMON \ ntpd \ ntpdate \ ${_opensm} \ - othermta \ + ${_othermta} \ pf \ pflog \ pfsync \ @@ -131,7 +131,7 @@ FILES= DAEMON \ savecore \ sdpd \ securelevel \ - sendmail \ + ${_sendmail} \ serial \ sppp \ ${_sshd} \ @@ -161,10 +161,22 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_BLUETOOTH} != "no" +_ubthidhci= ubthidhci +.endif + .if ${MK_IPX} != "no" _ipxrouted= ipxrouted .endif +.if ${MK_MAILWRAPPER} != "no" +_othermta= othermta +.endif + +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif @@ -173,12 +185,8 @@ _opensm= opensm _sshd= sshd .endif -.if ${MK_NS_CACHING} != "no" -_nscd= nscd -.endif - -.if ${MK_BLUETOOTH} != "no" -_ubthidhci= ubthidhci +.if ${MK_SENDMAIL} != "no" +_sendmail= sendmail .endif .if ${MK_UTMPX} != "no" diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 2ef7a3b..5515386 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3581,7 +3581,23 @@ OLD_FILES+=usr/share/misc/mail.tildehelp .endif .if ${MK_MAILWRAPPER} == no +OLD_DIRS+=etc/mail +OLD_FILES+=etc/mail/access.sample +OLD_FILES+=etc/mail/aliases +OLD_FILES+=etc/mail/aliases.db +OLD_FILES+=etc/mail/freebsd.mc +OLD_FILES+=etc/mail/freebsd.cf +OLD_FILES+=etc/mail/freebsd.submit.mc +OLD_FILES+=etc/mail/freebsd.submit.cf +OLD_FILES+=etc/mail/helpfile OLD_FILES+=etc/mail/mailer.conf +OLD_FILES+=etc/mail/mailertable.sample +OLD_FILES+=etc/mail/sendmail.cf +OLD_FILES+=etc/mail/submit.cf +OLD_FILES+=etc/mail/virtusertable.sample +OLD_FILES+=etc/mail/Makefile +OLD_FILES+=etc/mail/README +OLD_FILES+=etc/rc.d/othermta OLD_FILES+=usr/sbin/mailwrapper OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz .endif @@ -4050,6 +4066,8 @@ OLD_FILES+=etc/periodic/daily/210.backup-aliases OLD_FILES+=etc/periodic/daily/440.status-mailq OLD_FILES+=etc/periodic/daily/460.status-mail-rejects OLD_FILES+=etc/periodic/daily/500.queuerun +OLD_FILES+=etc/rc.d/sendmail +OLD_FILES+=etc/rc.sendmail .if ${MK_MAILWRAPPER} == no OLD_FILES+=bin/rmail .endif -- 1.8.2 >Release-Note: >Audit-Trail: >Unformatted: