diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-20 11:55:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-20 11:55:51 +0000 |
| commit | 45bb95d9cdaf14d6998c192509a67f6da0617971 (patch) | |
| tree | 723140fd318deb8cde1a7b958da03c4338967c4d | |
| parent | 1f08385768db431ea5cf7fa5d3c37d4991908a2f (diff) | |
| parent | 74f421779ff7f726f382f060248dd75a46ba936f (diff) | |
| download | illumos-joyent-45bb95d9cdaf14d6998c192509a67f6da0617971.tar.gz | |
[illumos-gate merge]
commit 74f421779ff7f726f382f060248dd75a46ba936f
7113 mailq.1 should be mediated
| -rw-r--r-- | manifest | 3 | ||||
| -rw-r--r-- | usr/src/man/man1/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/man/man1/sendmail-mailq.1 (renamed from usr/src/man/man1/mailq.1) | 0 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/service-network-smtp-sendmail.mf | 4 |
4 files changed, 9 insertions, 3 deletions
@@ -11627,7 +11627,7 @@ f usr/share/man/man1/mach.1 0444 root bin f usr/share/man/man1/machid.1 0444 root bin f usr/share/man/man1/mail.1 0444 root bin f usr/share/man/man1/mailcompat.1 0444 root bin -f usr/share/man/man1/mailq.1 0444 root bin +s usr/share/man/man1/mailq.1=sendmail-mailq.1 f usr/share/man/man1/mailstats.1 0444 root bin f usr/share/man/man1/mailx.1 0444 root bin f usr/share/man/man1/makekey.1 0444 root bin @@ -11739,6 +11739,7 @@ f usr/share/man/man1/rusers.1 0444 root bin f usr/share/man/man1/script.1 0444 root bin f usr/share/man/man1/sdiff.1 0444 root bin f usr/share/man/man1/sed.1 0444 root bin +f usr/share/man/man1/sendmail-mailq.1 0444 root bit f usr/share/man/man1/setfacl.1 0444 root bin f usr/share/man/man1/setpgrp.1 0444 root bin s usr/share/man/man1/settime.1=touch.1 diff --git a/usr/src/man/man1/Makefile b/usr/src/man/man1/Makefile index 552ba5450e..ccce069cff 100644 --- a/usr/src/man/man1/Makefile +++ b/usr/src/man/man1/Makefile @@ -225,7 +225,6 @@ MANFILES= acctcom.1 \ madv.so.1.1 \ mail.1 \ mailcompat.1 \ - mailq.1 \ mailstats.1 \ mailx.1 \ make.1 \ @@ -337,6 +336,7 @@ MANFILES= acctcom.1 \ script.1 \ sdiff.1 \ sed.1 \ + sendmail-mailq.1 \ set.1 \ setfacl.1 \ setlabel.1 \ @@ -480,6 +480,7 @@ MANLINKS= batch.1 \ jsh.1 \ ksh.1 \ ldapadd.1 \ + mailq.1 \ neqn.1 \ notify.1 \ onintr.1 \ @@ -652,6 +653,8 @@ sh.1 := LINKSRC = ksh93.1 ldapadd.1 := LINKSRC = ldapmodify.1 +mailq.1 := LINKSRC = sendmail-mailq.1 + ulimit.1 := LINKSRC = limit.1 unlimit.1 := LINKSRC = limit.1 diff --git a/usr/src/man/man1/mailq.1 b/usr/src/man/man1/sendmail-mailq.1 index e750117ec6..e750117ec6 100644 --- a/usr/src/man/man1/mailq.1 +++ b/usr/src/man/man1/sendmail-mailq.1 diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf index 27c3e84a68..e6b0fe4d0a 100644 --- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf +++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf @@ -188,10 +188,10 @@ file path=usr/sbin/editmap mode=0555 file path=usr/sbin/etrn mode=0555 file path=usr/sbin/makemap mode=0555 file path=usr/share/man/man1/mailcompat.1 -file path=usr/share/man/man1/mailq.1 file path=usr/share/man/man1/mailstats.1 file path=usr/share/man/man1/mconnect.1 file path=usr/share/man/man1/praliases.1 +file path=usr/share/man/man1/sendmail-mailq.1 file path=usr/share/man/man1/vacation.1 file path=usr/share/man/man1m/check-hostname.1m file path=usr/share/man/man1m/check-permissions.1m @@ -235,6 +235,8 @@ link path=usr/sbin/newaliases mediator=mta mediator-implementation=sendmail \ target=../lib/smtp/sendmail/newaliases link path=usr/sbin/sendmail mediator=mta mediator-implementation=sendmail \ target=../lib/smtp/sendmail/sendmail +link path=usr/share/man/man1/mailq.1 mediator=mta \ + mediator-implementation=sendmail target=sendmail-mailq.1 link path=usr/share/man/man4/addresses.4 target=aliases.4 link path=usr/share/man/man4/forward.4 target=aliases.4 link path=usr/share/man/man4/sendmail.cf.4 target=sendmail.4 |