Commit Graph

35 Commits

Author SHA1 Message Date
Brad Davis
64fe1b5e1d Only create /var/log/sendmail.st if start sendmail.
For those of us that never use or start sendmail, it is unneeded.

Approved by:	bapt (mentor)
2018-06-06 01:51:05 +00:00
Warner Losh
6dcff5b77c Move /etc/ to SRCTOP
Prefer ${SRCTOP}/ to ${.CURDIR}/../ and ${.CURDIR}/../../ as appropriate.

Differential Revision:  https://reviews.freebsd.org/D9932
Sponsored by:		Netflix
Silence On:		arch@ (twice)
2017-03-12 18:58:55 +00:00
Peter Wemm
ff446b05f1 If world is built with a custom sendmail.cf, use it for the distribution
target.  This is the feeder for mergemaster / etcupdate.  This change
makes installworld/mergemaster/etcupdate behave the same regardless of
whether SENDMAIL_MC or SENDMAIL_CF is used.

If you use a custom SENDMAIL_MC/CF in make.conf and excluded it from
mergemaster.rc/etcupdate.conf to work around the conflicts, you may wish
to revert that or change it from 'ignore' to 'always install'.

If you do not use a custom SENDMAIL_MC/CF, there should be no change in
behavior.
2015-10-12 21:02:36 +00:00
Gregory Neil Shapiro
e18480699e Remove build specific details from sendmail.cf/submit.cf in support of
https://wiki.freebsd.org/ReproducibleBuilds

The contrib/sendmail change will be made in the upstream source for a
future sendmail release.

Reviewed by:	des
MFC after:	3 days
2015-01-27 04:06:47 +00:00
Ruslan Ermilov
bee2fe7236 Catch up with etc/Makefile,v 1.324 -- split "install" and "distribution"
targets, have "distribution" always install original (as from the release
media) files, whether SENDMAIL_MC is set or not.  Do error handling the
make(1) way.

Reviewed by:	gshapiro
Approved by:	gshapiro
2004-01-22 17:51:02 +00:00
Gregory Neil Shapiro
1f9b7c9633 Adding WorkAroundBrokenAAAA seems a necessity even in the submit.mc given
the number of broken DNS servers out there in the world.  Since we are
diverging from the sendmail.org submit.mc, it's time to make our own
freebsd.submit.mc.

PR:		conf/57733
Reviewed by:	nork
MFC after:	2 weeks
2003-10-19 00:03:13 +00:00
Gregory Neil Shapiro
77e399e8be Turn SENDMAIL_CF_DIR into an officially supported make.conf variable
and use it in src/etc/sendmail/Makefile in case the user wants to use
a different path to the sendmail m4 sources (e.g., sendmail port users).

Submitted by:	dinoex
MFC after:	21 days
X-MFC after:	RELENG_4 code freeze ends
2003-09-24 04:19:26 +00:00
Gregory Neil Shapiro
f92921ddff Build the submit.cf file instead of installing the version that ships
with the vendor sendmail distribution.  By doing so, we avoid mergemaster
warnings after every 'make' in /etc/mail/.

Reported by:	Jeremy Chadwick <koitsu@parodius.com>
MFC after:	3 days
X-MFC after:	and re approval
2003-09-01 03:40:33 +00:00
Gregory Neil Shapiro
3e85d47c46 Revert revision 1.25 now that mergemaster does a 'make all' to build
the required .cf file(s).

Submitted by:	ru
X-MFC after:	mergemaster MFC
2003-08-10 20:48:59 +00:00
Gregory Neil Shapiro
6cabd2d9bb Continue trying to build SENDMAIL_CF if the user uses SENDMAIL_CF
instead of SENDMAIL_MC but don't remove on it 'make clean' as the
user may not have the original .mc file and removing it could be
dangerous (e.g., make SENDMAIL_CF=/etc/mail/sendmail.cf clean).

Noticed by:	peter
MFC after:	3 days
2003-07-10 04:53:32 +00:00
Gregory Neil Shapiro
d361b55eb7 Put back install/distribution dependency on the buildable .cf
files to get mergemaster working again.

Noticed by:	Shin-ichi YOSHIMOTO <yosimoto@waishi.jp>
2003-07-07 03:19:46 +00:00
Gregory Neil Shapiro
50536c6135 Get rid of unneeded depend target
Submitted by:	ru
MFC after:	5 days
2003-07-06 18:54:18 +00:00
Gregory Neil Shapiro
255bbde216 - Prevent buildworld from trying to write to /etc/mail/
- Stop 'make clean' from removing SENDMAIL_CF
- install and distribute targets should not attempt to build anything
- SENDMAIL_ADDITIONAL_CF were not installed in the distribution case
- If SENDMAIL_SET_USER_ID was defined, submit.cf was needlessly installed
  in the distribution case
- Collapse install and distribution target into one to remove code
  duplication

Submitted by:	ru
MFC after:	5 days
2003-07-06 18:51:10 +00:00
Gregory Neil Shapiro
043fc4cb15 Style fixes: tab after a dependency operator should be a single space
second level indent of tab should be four spaces

Submitted by:	ru
MFC after:	3 days
2003-07-06 18:07:06 +00:00
Ruslan Ermilov
d2893b161b Drop support for COPY, -c has been the default mode of install(1)
for a long time now.

Approved by:	bde
2002-07-29 09:40:17 +00:00
Ruslan Ermilov
0b87f79976 s/${INSTALL} -c/${INSTALL} ${COPY}/ 2002-07-18 12:07:49 +00:00
Gregory Neil Shapiro
519c4f1816 Change the default permissions for the sendmail statistics file to 0640
instead of 0644 to help protect users against a file locking local
denial of service.

MFC after:	1 day
		pending RE approval
2002-05-24 01:44:53 +00:00
Gregory Neil Shapiro
3bf762b7f6 Non-sendmail users use the FreeBSD sendmail startup functionality to start
alternative MTAs.  Therefore, always install rc.sendmail, regardless of
NO_SENDMAIL make.conf setting.  Users can still set mta_start_script to a
different script.

This commit is after a repo-copy of src/etc/sendmail/rc.sendmail to
src/etc/rc.sendmail.

Noticed by:	Calvin NG <calvinng@brel.com>
MFC after:	3 days
2002-04-21 20:32:28 +00:00
Gregory Neil Shapiro
14d6d7657a Provide a new make.conf knob, SENDMAIL_SUBMIT_MC to allow users to pick
the .mc file used for /etc/mail/submit.cf.  By default,
/etc/mail/freebsd.submit.mc is installed and used.

Requested by:	fenner
Submitted by:	ume
MFC after:	1 week
2002-04-14 19:20:26 +00:00
Gregory Neil Shapiro
619b80c4e6 Quoting Peter Wemm, "At great personal risk, touch the sendmail startup
again."

As an alternative to sendmail_enable=NONE, solve the boot time problem
for non-sendmail users completely by moving all of the sendmail startup
code from /etc/rc to /etc/rc.sendmail.  The source for that script will
be kept in src/etc/sendmail/rc.sendmail so make.conf's NO_SENDMAIL will
prevent it from being installed.  A new rc.conf variable,
mta_start_script specifies the script to run to start the user's
preferred MTA.  For backward compatibility, it will default to
/etc/rc.sendmail.  The specified script is called out of /etc/rc after
checking to make sure it exists.  A new rc.sendmail.8 man page has also
been added which now houses the sendmail_* variable descriptions
formerly in rc.conf.5.

Use /etc/rc.sendmail in /etc/mail/Makefile to reduce code duplication.

Reviewed by:	-current, -stable, obrien, peter, ru
MFC after:	1 week
2002-04-05 02:30:49 +00:00
Gregory Neil Shapiro
d7bbec76f2 Make sure we don't remove /etc/mail/sendmail.cf on make clean since this
will break a running system during a buildworld.

Noticed by:	Alexandr Listopad <laa@laa.zp.ua>
MFC after:	1 week
2002-02-24 02:38:23 +00:00
Gregory Neil Shapiro
910976f7b0 Add new build knob, SENDMAIL_SET_USER_ID, which installs sendmail as a
set-user-ID root binary instead of the new method (set-group-ID smmsp).
Therefore, we shouldn't install /etc/mail/submit.cf if it is set.
2002-02-17 22:09:15 +00:00
Gregory Neil Shapiro
c8e968571f Since buildworld builds cf files specified in SENDMAIL_ADDITIONAL_MC,
installworld should install them.

PR:		29928
Submitted by:	wollman
MFC after:	3 days
2001-11-20 03:41:05 +00:00
Gregory Neil Shapiro
9078d242bf Revert change to always include _FFR_TLS_O_T as it requires FEATURE(access_db)
Problem found by:	nsayer
2001-08-01 02:12:39 +00:00
Gregory Neil Shapiro
f88f925efc If the user sets SENDMAIL_MC to /etc/mail/sendmail.mc, install is told to
install /etc/mail/sendmail.cf to /etc/mail/sendmail.cf and exits with an
error:

===> etc/sendmail
install -c -o root -g wheel -m 644 /etc/mail/sendmail.cf /etc/mail/sendmail.cf
install: /etc/mail/sendmail.cf and /etc/mail/sendmail.cf are the same file
*** Error code 64

Catch this in the Makefile and don't call install if the source and target
are the same file.

Reported by:	Alexandr Listopad <laa@reis.zp.ua>
MFC after:	1 week
2001-07-23 02:19:02 +00:00
Gregory Neil Shapiro
f4843be999 New make knob, SENDMAIL_M4_FLAGS, modifies the flags passed to m4 when
building a .cf file from a .mc file.

Include -D_FFR_TLS_O_T to enable tls policy control since the sendmail binary
build enables that FFR as well.

PR:		conf/28361
MFC after:	1 week
2001-07-23 01:33:54 +00:00
Gregory Neil Shapiro
a38a3724b6 Move installation of sendmail helpfile into etc/sendmail/Makefile. It is
a user configurable file and it would benefit from mergemaster.
2001-03-01 03:50:28 +00:00
Gregory Neil Shapiro
fab9e3acac Fix dependencies and cleanup spacing in the file 2001-02-28 04:04:07 +00:00
Gregory Neil Shapiro
e6c77250ef Need one additional make.conf knob, SENDMAIL_ADDITIONAL_MC to satisfy bug
report.  It allows building multiple .cf files at build time.

PR:		bin/19897
2001-02-22 19:44:16 +00:00
Gregory Neil Shapiro
25219d25e6 Add a new make knob, SENDMAIL_MC, which is meant to replace SENDMAIL_CF as
users should be configuring via m4 now.  If set, use m4 to create the .cf
file.  Also, if either SENDMAIL_MC or SENDMAIL_CF is set, 'make install' or
'make distribution' in src/etc/sendmail/ will install the appropriate .cf as
/etc/mail/sendmail.cf.  This fixes some mergemaster problems.

PR:		conf/13016
2001-02-22 04:11:52 +00:00
Gregory Neil Shapiro
e10536edc1 Install freebsd.mc and freebsd.cf in /etc/mail so users have the base files
for creating their own configuration.
2001-02-22 04:01:16 +00:00
Gregory Neil Shapiro
e4e1027a2e Move creation of the sendmail statistics file from the usr.sbin/sendmail
Makefile to the etc/sendmail Makefile to be consistent with all of the
other /var file creations.  In doing so, change the Makefile target from
etc-sendmail.cf to distribution as it installs more than just the sendmail.cf.
2001-02-22 03:55:08 +00:00
David E. O'Brien
8bdd91e3a1 Install sendmail.cf into /etc/mail.
The current offical Sendmail Inc. version uses /var/mail/ and when we upgrade
our repository to that version, we will get the change.  It is best to make
the path change in 4.0-R (which may not have the latest Sendmail Inc. version,
than to change in mid-4.x stream when we may upgrade.

Ok'ed by:	Peter (quite a while ago)
1999-12-19 19:55:19 +00:00
Peter Wemm
9b7a44a60e $Id$ -> $FreeBSD$ 1999-08-27 23:37:10 +00:00
Peter Wemm
76bfe4c335 Builder for sendmail.cf's, in particular freebsd.cf.
This needs to be revisited - we need a simple way of building/installing
these at runtime from the installed system's /etc/mail directory.
freebsd.mc,v and freefall.mc,v have been repository copied here.
1998-08-04 15:53:18 +00:00