I am not sure how the patch got mangled but below reflects the suggested changes - sorry for the noise. BUGS section removed and I made a note to install sendmail via ports.
Index: mailer.conf.5 =================================================================== RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v retrieving revision 1.17 diff -u -p -u -r1.17 mailer.conf.5 --- mailer.conf.5 8 Dec 2015 09:06:32 -0000 1.17 +++ mailer.conf.5 16 Sep 2018 12:06:45 -0000 @@ -76,16 +76,18 @@ newaliases /usr/sbin/smtpctl This example shows how to invoke the traditional .Xr sendmail 8 MTA suite in place of -.Xr smtpd 8 . +.Xr smtpd 8 . You will need to install sendmail from ports since it +is no longer in base. .Bd -literal -# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail -sendmail /usr/libexec/sendmail/sendmail -send-mail /usr/libexec/sendmail/sendmail -mailq /usr/libexec/sendmail/sendmail -makemap /usr/libexec/sendmail/makemap -newaliases /usr/libexec/sendmail/sendmail -hoststat /usr/libexec/sendmail/sendmail -purgestat /usr/libexec/sendmail/sendmail +# Execute the real sendmail program located in +# /usr/local/libexec/sendmail/sendmail +sendmail /usr/local/libexec/sendmail/sendmail +send-mail /usr/local/libexec/sendmail/sendmail +mailq /usr/local/libexec/sendmail/sendmail +makemap /usr/local/libexec/sendmail/makemap +newaliases /usr/local//sendmail/sendmail +hoststat /usr/local/sendmail/sendmail +purgestat /usr/local/sendmail/sendmail .Ed .Sh SEE ALSO .Xr mail 1 , @@ -95,10 +97,3 @@ purgestat /usr/libexec/sendmail/sendmail .Xr smtpd 8 .Sh AUTHORS .An Perry E. Metzger Aq Mt [email protected] -.Sh BUGS -The entire reason this program exists is a crock. -Instead, a command for how to submit mail should be standardized, -and all the "behave differently if invoked with a different name" -behavior of things like -.Xr mailq 8 -should go away. On Sun, Sep 16, 2018 at 6:28 AM Sebastian Benoit wrote: > > Jason McIntyre([email protected]) on 2018.09.16 07:17:24 +0100: > > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote: > > > Damnit! I forgot one line. Please disregard the previous. Now all > > > lines of mailer.conf(5) should reflect that sendmail is no longer in > > > the default install. > > > > > > > i'm ok with this, though the spacing on your diff got mangled and it > > doesn;t apply. > > > > i'd be tempted to remove the text ", named > > /usr/local/libexec/sendmail/sendmail" > > > > anyone want to ok (or commit with my ok)? > > ok benno@ > > possible further improvements: > > * maybe we should mention that sendmail is a package that needs tobe > installed? I dont know if we do that in manpages usually? > > * the BUGS section can go away i think, its wishfull thinking because > these program names are the defacto standard. > > > > jmc > > > > > Index: mailer.conf.5 > > > =================================================================== > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > retrieving revision 1.17 > > > diff -u -p -u -r1.17 mailer.conf.5 > > > --- mailer.conf.5 8 Dec 2015 09:06:32 -0000 1.17 > > > +++ mailer.conf.5 16 Sep 2018 01:41:53 -0000 > > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra > > > MTA suite in place of > > > .Xr smtpd 8 . > > > .Bd -literal > > > -# Execute the "real" sendmail program, named > > > /usr/libexec/sendmail/sendmail > > > -sendmail /usr/libexec/sendmail/sendmail > > > -send-mail /usr/libexec/sendmail/sendmail > > > -mailq /usr/libexec/sendmail/sendmail > > > -makemap /usr/libexec/sendmail/makemap > > > -newaliases /usr/libexec/sendmail/sendmail > > > -hoststat /usr/libexec/sendmail/sendmail > > > -purgestat /usr/libexec/sendmail/sendmail > > > +# Execute the "real" sendmail program, named > > > /usr/local/libexec/sendmail/sendmail > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > +mailq /usr/local/libexec/sendmail/sendmail > > > +makemap /usr/local/libexec/sendmail/makemap > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > .Ed > > > .Sh SEE ALSO > > > .Xr mail 1 , > > > > > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz wrote: > > > > > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no > > > > longer in the default install, the man page has been corrected to > > > > reflect that the sendmail binary would be in > > > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail. > > > > > > > > Index: mailer.conf.5 > > > > =================================================================== > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > > retrieving revision 1.17 > > > > diff -u -p -u -r1.17 mailer.conf.5 > > > > --- mailer.conf.5 8 Dec 2015 09:06:32 -0000 1.17 > > > > +++ mailer.conf.5 16 Sep 2018 01:34:31 -0000 > > > > @@ -79,13 +79,13 @@ MTA suite in place of > > > > .Xr smtpd 8 . > > > > .Bd -literal > > > > # Execute the "real" sendmail program, named > > > > /usr/libexec/sendmail/sendmail > > > > -sendmail /usr/libexec/sendmail/sendmail > > > > -send-mail /usr/libexec/sendmail/sendmail > > > > -mailq /usr/libexec/sendmail/sendmail > > > > -makemap /usr/libexec/sendmail/makemap > > > > -newaliases /usr/libexec/sendmail/sendmail > > > > -hoststat /usr/libexec/sendmail/sendmail > > > > -purgestat /usr/libexec/sendmail/sendmail > > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > > +mailq /usr/local/libexec/sendmail/sendmail > > > > +makemap /usr/local/libexec/sendmail/makemap > > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > > .Ed > > > > .Sh SEE ALSO > > > > .Xr mail 1 , > > > > > >
