Commit Graph

89 Commits

Author SHA1 Message Date
kevans
fee3b5b8cc pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL
When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that
conflict, and hilarity ensues. There's currently three different places that
we might install mailer.conf:

- ^/etc/Makefile (package=runtime, contingent on MK_MAIL != no)
- ^/libexec/dma/dmagent/Makefile (package=dma, contingent on MK_SENDMAIL !=
no)
- ^/usr.sbin/mailwrapper/Makefile (package=utilities, contingent on
not-installed)

The mailwrapper installation will effectively never happen because the ^/etc
one will first.

This patch simplifies the whole situation; remove the ^/etc/Makefile version
and install it primarily in mailwrapper if MK_MAILWRAPPER != "no". The
scenarios covered in mailwrapper are:

- sendmail(8) is installed, dma(8) may or may not be installed
- neither sendmail(8) nor dma(8) is installed

In the first scenario, sendmail(8) is dominant so we can go ahead and
install the version in ^/etc/mail. In the unlisted scenario, sendmail(8) is
not installed but dma(8) is, we'll let ^/libexec/dma/dmagent do the
installation. In the second listed scenario, we still want to install an
example mailer.conf so just install the base sendmail(8) version.

Reviewed by:	bapt
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D24924
2020-06-02 02:38:54 +00:00
gshapiro
ff46fdfeab Add support for the authinfo map
Submitted by:	keramida
2019-02-04 02:18:27 +00:00
delphij
32a7549145 Replace send-mail with the more standarized sendmail, we do not create
links for send-mail in mailwrapper so it did not work anyway.

MFC after:	2 weeks
2017-12-27 06:23:50 +00:00
will
afad9375d8 Add a ${CP} alias for copying files in the build.
Some users build FreeBSD as non-root in Perforce workspaces.  By default,
Perforce sets files read-only unless they're explicitly being edited.
As a result, the -f argument must be used to cp in order to override the
read-only flag when copying source files to object directories.  Bare use of
'cp' should be avoided in the future.

Update all current users of 'cp' in the src tree.

Reviewed by:	emaste
MFC after:	1 week
Sponsored by:	Spectra Logic
2015-01-16 21:39:08 +00:00
will
8fbdaa50ea Fix incremental builds involving non-root users with read-only source files.
Makefiles should not assume that source files can be overwritten.  This is the
common case for Perforce source trees.

This is a followup commit to r211243 in the same vein.

MFC after:	1 month
Sponsored by:	Spectra Logic
MFSpectraBSD:	r1036319 on 2014/01/29, r1046711 on 2014/03/06
2014-09-18 14:41:57 +00:00
rwatson
991e942bf2 Merge a number of changes required to hook up OpenBSM 1.2-alpha2's
auditdistd (distributed audit daemon) to the build:

- Manual cross references
- Makefile for auditdistd
- rc.d script, rc.conf entrie
- New group and user for auditdistd; associated aliases, etc.

The audit trail distribution daemon provides reliable,
cryptographically protected (and sandboxed) delivery of audit tails
from live clients to audit server hosts in order to both allow
centralised analysis, and improve resilience in the event of client
compromises: clients are not permitted to change trail contents
after submission.

Submitted by:	pjd
Sponsored by:	The FreeBSD Foundation (auditdistd)
2012-12-01 15:11:46 +00:00
maxim
e53fb1d8bb o Add user 'hast'. 2011-01-31 07:47:28 +00:00
gshapiro
45260b3031 Add the URL for RFC2142
PR:		conf/127510
2009-03-23 00:40:07 +00:00
gshapiro
415a32c270 Use better examples (and comment them out for safety).
PR:             118837
Submitted by:   Matthew Seaman
MFC after:      1 week
2008-02-17 05:22:08 +00:00
maxim
d1e4c87cf9 Finish adding _dhcp user. 2005-06-07 03:41:20 +00:00
maxim
7dde49bc61 Add user _pflogd. 2004-06-30 16:47:08 +00:00
gshapiro
dc0bb91824 Remove trailing space.
Submitted by:	jens
2004-06-06 17:28:31 +00:00
maxim
ed9eabcb8c o Add user proxy. 2004-03-20 19:13:06 +00:00
gshapiro
60f4a2b500 Bow to popular demand and default SENDMAIL_SUBMIT_MC to
`hostname`.submit.mc which is templated from freebsd.submit.mc if the
default file does not exist.  This makes the building of the submit.cf
behavior identical to that of the the sendmail.cf.

PR:		44256
Submitted by:	Matt Emmerton <matt@gsicomp.on.ca>
MFC after:	5 days
2003-07-06 19:17:04 +00:00
gshapiro
6f119a739e 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
imp
1bf91a17ef xten isn't needed after tw is gone.
Approved by: re@ (scottl)
2003-04-27 05:49:53 +00:00
gshapiro
a1a4db3471 Fix formatting (spaces -> tab)
MFC after:	1 week
2003-03-25 00:54:05 +00:00
gshapiro
da275a07b3 Allow multiple aliases files to be rebuilt
PR:		bin/40540
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
MFC after:	3 days
2003-02-08 21:55:31 +00:00
gshapiro
0cb596bf64 Add a comment regarding the use of the msgs alias with sendmail to help
users who want to enable it.

PR:		misc/39951
2003-02-08 19:00:12 +00:00
ru
a8adf98c82 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
ru
cd7c90d38f s/${INSTALL} -c/${INSTALL} ${COPY}/ 2002-07-18 12:07:49 +00:00
maxim
954ff8bf68 Trim EOL spaces.
Reviewed by:	gshapiro
2002-06-30 12:08:36 +00:00
maxim
d0a28864e1 Add an alias for sshd. 2002-06-30 12:04:41 +00:00
gshapiro
f6c55bbe1c Add a new make.conf knob, SENDMAIL_MAP_PERMS, which specifies the
permissions to use for alias and map database files built by
/etc/mail/Makefile.  The default is 0640 to assist users in avoiding
a file locking local denial of service.

MFC after:	1 day
		pending RE approval
2002-05-24 01:46:39 +00:00
gshapiro
c4bd09146b Add a warning regarding localhost-only listening daemons inside jails.
Apparently binding only to 127.0.0.1 inside of a jail actually binds
to the jail IP address as well (in effect, bind to all available
interfaces in the jail).

Submitted by:	Helge Oldach <test-smtp@oldach.net>
MFC after:	1 day
		pending RE approval
2002-05-22 16:37:32 +00:00
gshapiro
e35948a6ef Fix typo.
Submitted by:	Marius Strom <marius@marius.org>
MFC after:	1 day
		and RE approval
2002-05-08 05:17:46 +00:00
gshapiro
1a7fe4db89 sys.mk no longer includes bsd.own.mk so I need to include it here for
the definition of SHAREMODE.

Submitted by:	Udo Schweigert <Udo.Schweigert@siemens.com>
2002-04-23 17:08:08 +00:00
gshapiro
fef0f2cd24 Fix up submit.cf alternation instructions in light of new SENDMAIL_SUBMIT_MC
make.conf knob.

MFC after:	1 week
2002-04-14 19:24:28 +00:00
gshapiro
b7ddd3c1a9 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
gshapiro
b42614032f Add the missing hoststat and purgestat commands. These are normally
symlinks to the sendmail binary but in FreeBSD's case, they are
symlinks to mailwrapper.

Submitted by:	tisco
MFC after:	4 days
2002-04-05 04:25:14 +00:00
gshapiro
cd7393b940 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
ru
2abc929acf Back out last commit. (This file is installed under /etc/mail.)
Requested by:	gshapiro
2002-04-04 07:42:12 +00:00
ru
d4b911cb52 Use a relative path to contrib/sendmail/cf. 2002-04-04 07:18:29 +00:00
gshapiro
e33a1d7e19 Update the /etc/mail/Makefile "start" target code to match the new startup
logic and added a new set of targets for controlling the MSP queue runner
(start-mspq, stop-mspq, and restart-mspq).

Reminded by: Mark Santcroos <marks@ripe.net>
MFC after:	1 week
2002-03-28 03:30:27 +00:00
gshapiro
20c7c9d94e Use the proper terminology. 2002-03-21 06:09:20 +00:00
ru
ab0f432b2d Fixed a few typos. 2002-02-27 14:43:55 +00:00
gshapiro
0db14425f9 Add information about how the new sendmail set-group-ID mail submission
works and ways to work around common problems people might have.
Include information on reverting to a set-user-ID root sendmail binary in
case anyone really needs to do this.
2002-02-17 22:14:29 +00:00
gshapiro
be0f0b6ad9 Don't build a submit.cf file if SENDMAIL_SET_USER_ID is set 2002-02-17 22:12:57 +00:00
gshapiro
e6e6869999 Grammar fix for comment 2001-12-30 04:40:18 +00:00
gshapiro
93d7c55532 Add aliases pointing to postmaster for the two new mail related accounts.
Reminded by:	sheldonh
MFC after:	3 days
2001-12-11 17:29:57 +00:00
gshapiro
823ad9f7c7 Handle the sendmail_outbound_enable knob in the start target.
PR:		32033
MFC after:	3 days
2001-11-20 03:31:54 +00:00
gshapiro
0895cfbecc Do not clobber users hostname.mc file if freebsd.mc changes (likely after an
installworld).

Submitted by:	Steve Watt <steve@Watt.COM>
MFC after:	2 days
2001-10-08 22:35:24 +00:00
gshapiro
46051bb094 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
gshapiro
054d1f29d9 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
gshapiro
cef3dba089 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
gshapiro
2acef0770e Allow users to add local Makefile targets.
Submitted by:	dinoex
MFC after:	7 days
2001-05-15 16:03:54 +00:00
gshapiro
6f3eff7106 Make the default .mc file be hostname.mc if SENDMAIL_MC make.conf knob
is not set.  This allows admins to create a per-machine configuration file
while leaving the freebsd.mc template pristine.  Provide a rule to create
`hostname`.mc from freebsd.mc if it doesn't exist.

PR:		misc/26299
MFC after:	8 days
2001-05-15 16:01:40 +00:00
gshapiro
52397444f0 Allow users to override the default map type used for building maps. 2001-04-01 22:54:15 +00:00
gshapiro
2e3ab92612 The userdb database is different from the rest of the databases. It *must*
be a btree.

PR:		bin/26149
2001-04-01 22:48:07 +00:00
gshapiro
97b1e410af Read information from local rc.conf file(s) to get proper settings for
'make start'.

PR:		conf/25639
Submitted by:	Esa Karkkainen <ejk@pp.htv.fi>
2001-03-13 20:58:39 +00:00