--- a/components/sendmail/sendmail.p5m Thu Mar 05 15:53:36 2015 -0800
+++ b/components/sendmail/sendmail.p5m Wed Mar 04 13:49:36 2015 -0800
@@ -23,11 +23,15 @@
# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
-# The man pages are all at the top of a "files" directory; setting the hash to
+# The man pages are all at the top of a "files" directory; set the hash to
# point to the files therein.
<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
-# Bypassing the mangler for these files because they are pre-Solarified.
+# Set the hash for the cf/ hierarchy similarly.
+<transform file path=etc/mail/(cf/.+)$ -> set action.hash %<\1> >
+# Bypass the mangler for these files because they are pre-Solarified.
<transform file path=usr/share/man/.+$ -> add mangler.bypass true >
+<transform file path=etc/mail/cf/.* -> default group mail>
+#
set name=pkg.fmri \
value=pkg:/service/network/smtp/sendmail@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Sendmail utilities"
@@ -38,164 +42,104 @@
set name=info.classification value=org.opensolaris.category.2008:System/Core
set name=info.upstream value="Sendmail community"
set name=info.upstream-url value=http://www.sendmail.org/
-set name=org.opensolaris.arc-caseid value=PSARC/2007/068
+set name=org.opensolaris.arc-caseid value=PSARC/2007/068 value=PSARC/2015/111
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=org.opensolaris.version-unlockable value=true
+#
link path=etc/aliases target=./mail/aliases
file init.d-sendmail path=etc/init.d/sendmail group=sys mode=0744 \
original_name=SUNWsndm:etc/init.d/sendmail \
pkg.linted.userland.action003.0=true preserve=true
file aliases path=etc/mail/aliases original_name=SUNWsndm:etc/mail/aliases \
preserve=true
-file cf/README path=etc/mail/cf/README group=mail mode=0444
-file cf/cf/Makefile path=etc/mail/cf/cf/Makefile group=mail mode=0444
+file path=etc/mail/cf/README
+file path=etc/mail/cf/cf/Makefile
link path=etc/mail/cf/cf/main.cf target=sendmail.cf
link path=etc/mail/cf/cf/main.mc target=sendmail.mc
-file cf/cf/sendmail.cf path=etc/mail/cf/cf/sendmail.cf group=mail mode=0444
-file cf/cf/sendmail.mc path=etc/mail/cf/cf/sendmail.mc group=mail mode=0444
-file cf/cf/submit.cf path=etc/mail/cf/cf/submit.cf group=mail mode=0444
-file cf/cf/submit.mc path=etc/mail/cf/cf/submit.mc group=mail mode=0444
+file path=etc/mail/cf/cf/sendmail.cf
+file path=etc/mail/cf/cf/sendmail.mc
+file path=etc/mail/cf/cf/submit.cf
+file path=etc/mail/cf/cf/submit.mc
link path=etc/mail/cf/cf/subsidiary.cf target=sendmail.cf
link path=etc/mail/cf/cf/subsidiary.mc target=sendmail.mc
-file cf/domain/generic.m4 path=etc/mail/cf/domain/generic.m4 group=mail \
- mode=0444
-file cf/domain/solaris-antispam.m4 path=etc/mail/cf/domain/solaris-antispam.m4 \
- group=mail mode=0444
-file cf/domain/solaris-generic.m4 path=etc/mail/cf/domain/solaris-generic.m4 \
- group=mail mode=0444
-file cf/feature/accept_unqualified_senders.m4 \
- path=etc/mail/cf/feature/accept_unqualified_senders.m4 group=mail mode=0444
-file cf/feature/accept_unresolvable_domains.m4 \
- path=etc/mail/cf/feature/accept_unresolvable_domains.m4 group=mail \
- mode=0444
-file cf/feature/access_db.m4 path=etc/mail/cf/feature/access_db.m4 group=mail \
- mode=0444
-file cf/feature/allmasquerade.m4 path=etc/mail/cf/feature/allmasquerade.m4 \
- group=mail mode=0444
-file cf/feature/always_add_domain.m4 \
- path=etc/mail/cf/feature/always_add_domain.m4 group=mail mode=0444
-file cf/feature/badmx.m4 path=etc/mail/cf/feature/badmx.m4 group=mail mode=0444
-file cf/feature/bestmx_is_local.m4 path=etc/mail/cf/feature/bestmx_is_local.m4 \
- group=mail mode=0444
-file cf/feature/bitdomain.m4 path=etc/mail/cf/feature/bitdomain.m4 group=mail \
- mode=0444
-file cf/feature/blacklist_recipients.m4 \
- path=etc/mail/cf/feature/blacklist_recipients.m4 group=mail mode=0444
-file cf/feature/block_bad_helo.m4 path=etc/mail/cf/feature/block_bad_helo.m4 \
- group=mail mode=0444
-file cf/feature/compat_check.m4 path=etc/mail/cf/feature/compat_check.m4 \
- group=mail mode=0444
-file cf/feature/conncontrol.m4 path=etc/mail/cf/feature/conncontrol.m4 \
- group=mail mode=0444
-file cf/feature/delay_checks.m4 path=etc/mail/cf/feature/delay_checks.m4 \
- group=mail mode=0444
-file cf/feature/dnsbl.m4 path=etc/mail/cf/feature/dnsbl.m4 group=mail mode=0444
-file cf/feature/domaintable.m4 path=etc/mail/cf/feature/domaintable.m4 \
- group=mail mode=0444
-file cf/feature/enhdnsbl.m4 path=etc/mail/cf/feature/enhdnsbl.m4 group=mail \
- mode=0444
-file cf/feature/generics_entire_domain.m4 \
- path=etc/mail/cf/feature/generics_entire_domain.m4 group=mail mode=0444
-file cf/feature/genericstable.m4 path=etc/mail/cf/feature/genericstable.m4 \
- group=mail mode=0444
-file cf/feature/greet_pause.m4 path=etc/mail/cf/feature/greet_pause.m4 \
- group=mail mode=0444
-file cf/feature/ldap_routing.m4 path=etc/mail/cf/feature/ldap_routing.m4 \
- group=mail mode=0444
-file cf/feature/limited_masquerade.m4 \
- path=etc/mail/cf/feature/limited_masquerade.m4 group=mail mode=0444
-file cf/feature/local_lmtp.m4 path=etc/mail/cf/feature/local_lmtp.m4 \
- group=mail mode=0444
-file cf/feature/local_no_masquerade.m4 \
- path=etc/mail/cf/feature/local_no_masquerade.m4 group=mail mode=0444
-file cf/feature/local_procmail.m4 path=etc/mail/cf/feature/local_procmail.m4 \
- group=mail mode=0444
-file cf/feature/lookupdotdomain.m4 path=etc/mail/cf/feature/lookupdotdomain.m4 \
- group=mail mode=0444
-file cf/feature/loose_relay_check.m4 \
- path=etc/mail/cf/feature/loose_relay_check.m4 group=mail mode=0444
-file cf/feature/mailertable.m4 path=etc/mail/cf/feature/mailertable.m4 \
- group=mail mode=0444
-file cf/feature/masquerade_entire_domain.m4 \
- path=etc/mail/cf/feature/masquerade_entire_domain.m4 group=mail mode=0444
-file cf/feature/masquerade_envelope.m4 \
- path=etc/mail/cf/feature/masquerade_envelope.m4 group=mail mode=0444
-file cf/feature/msp.m4 path=etc/mail/cf/feature/msp.m4 group=mail mode=0444
-file cf/feature/mtamark.m4 path=etc/mail/cf/feature/mtamark.m4 group=mail \
- mode=0444
-file cf/feature/no_default_msa.m4 path=etc/mail/cf/feature/no_default_msa.m4 \
- group=mail mode=0444
-file cf/feature/nocanonify.m4 path=etc/mail/cf/feature/nocanonify.m4 \
- group=mail mode=0444
-file cf/feature/notsticky.m4 path=etc/mail/cf/feature/notsticky.m4 group=mail \
- mode=0444
-file cf/feature/nouucp.m4 path=etc/mail/cf/feature/nouucp.m4 group=mail \
- mode=0444
-file cf/feature/nullclient.m4 path=etc/mail/cf/feature/nullclient.m4 \
- group=mail mode=0444
-file cf/feature/preserve_local_plus_detail.m4 \
- path=etc/mail/cf/feature/preserve_local_plus_detail.m4 group=mail mode=0444
-file cf/feature/preserve_luser_host.m4 \
- path=etc/mail/cf/feature/preserve_luser_host.m4 group=mail mode=0444
-file cf/feature/promiscuous_relay.m4 \
- path=etc/mail/cf/feature/promiscuous_relay.m4 group=mail mode=0444
-file cf/feature/queuegroup.m4 path=etc/mail/cf/feature/queuegroup.m4 \
- group=mail mode=0444
-file cf/feature/ratecontrol.m4 path=etc/mail/cf/feature/ratecontrol.m4 \
- group=mail mode=0444
-file cf/feature/redirect.m4 path=etc/mail/cf/feature/redirect.m4 group=mail \
- mode=0444
-file cf/feature/relay_based_on_MX.m4 \
- path=etc/mail/cf/feature/relay_based_on_MX.m4 group=mail mode=0444
-file cf/feature/relay_entire_domain.m4 \
- path=etc/mail/cf/feature/relay_entire_domain.m4 group=mail mode=0444
-file cf/feature/relay_hosts_only.m4 \
- path=etc/mail/cf/feature/relay_hosts_only.m4 group=mail mode=0444
-file cf/feature/relay_local_from.m4 \
- path=etc/mail/cf/feature/relay_local_from.m4 group=mail mode=0444
-file cf/feature/relay_mail_from.m4 path=etc/mail/cf/feature/relay_mail_from.m4 \
- group=mail mode=0444
-file cf/feature/require_rdns.m4 path=etc/mail/cf/feature/require_rdns.m4 \
- group=mail mode=0444
-file cf/feature/smrsh.m4 path=etc/mail/cf/feature/smrsh.m4 group=mail mode=0444
-file cf/feature/stickyhost.m4 path=etc/mail/cf/feature/stickyhost.m4 \
- group=mail mode=0444
-file cf/feature/use_client_ptr.m4 path=etc/mail/cf/feature/use_client_ptr.m4 \
- group=mail mode=0444
-file cf/feature/use_ct_file.m4 path=etc/mail/cf/feature/use_ct_file.m4 \
- group=mail mode=0444
-file cf/feature/use_cw_file.m4 path=etc/mail/cf/feature/use_cw_file.m4 \
- group=mail mode=0444
-file cf/feature/uucpdomain.m4 path=etc/mail/cf/feature/uucpdomain.m4 \
- group=mail mode=0444
-file cf/feature/virtuser_entire_domain.m4 \
- path=etc/mail/cf/feature/virtuser_entire_domain.m4 group=mail mode=0444
-file cf/feature/virtusertable.m4 path=etc/mail/cf/feature/virtusertable.m4 \
- group=mail mode=0444
-file cf/m4/cf.m4 path=etc/mail/cf/m4/cf.m4 group=mail mode=0444
-file cf/m4/cfhead.m4 path=etc/mail/cf/m4/cfhead.m4 group=mail mode=0444
-file cf/m4/proto.m4 path=etc/mail/cf/m4/proto.m4 group=mail mode=0444
-file cf/m4/version.m4 path=etc/mail/cf/m4/version.m4 group=mail mode=0444
-file cf/mailer/local.m4 path=etc/mail/cf/mailer/local.m4 group=mail mode=0444
-file cf/mailer/procmail.m4 path=etc/mail/cf/mailer/procmail.m4 group=mail \
- mode=0444
-file cf/mailer/smtp.m4 path=etc/mail/cf/mailer/smtp.m4 group=mail mode=0444
-file cf/mailer/uucp.m4 path=etc/mail/cf/mailer/uucp.m4 group=mail mode=0444
-file cf/ostype/solaris11.m4 path=etc/mail/cf/ostype/solaris11.m4 group=mail \
- mode=0444
-file cf/ostype/solaris2.m4 path=etc/mail/cf/ostype/solaris2.m4 group=mail \
- mode=0444
-file cf/ostype/solaris2.ml.m4 path=etc/mail/cf/ostype/solaris2.ml.m4 \
- group=mail mode=0444
-file cf/ostype/solaris2.pre5.m4 path=etc/mail/cf/ostype/solaris2.pre5.m4 \
- group=mail mode=0444
-file cf/ostype/solaris8.m4 path=etc/mail/cf/ostype/solaris8.m4 group=mail \
- mode=0444
+file path=etc/mail/cf/domain/generic.m4
+file path=etc/mail/cf/domain/solaris-antispam.m4
+file path=etc/mail/cf/domain/solaris-generic.m4
+file path=etc/mail/cf/feature/accept_unqualified_senders.m4
+file path=etc/mail/cf/feature/accept_unresolvable_domains.m4
+file path=etc/mail/cf/feature/access_db.m4
+file path=etc/mail/cf/feature/allmasquerade.m4
+file path=etc/mail/cf/feature/always_add_domain.m4
+file path=etc/mail/cf/feature/badmx.m4
+file path=etc/mail/cf/feature/bestmx_is_local.m4
+file path=etc/mail/cf/feature/bitdomain.m4
+file path=etc/mail/cf/feature/blacklist_recipients.m4
+file path=etc/mail/cf/feature/block_bad_helo.m4
+file path=etc/mail/cf/feature/compat_check.m4
+file path=etc/mail/cf/feature/conncontrol.m4
+file path=etc/mail/cf/feature/delay_checks.m4
+file path=etc/mail/cf/feature/dnsbl.m4
+file path=etc/mail/cf/feature/domaintable.m4
+file path=etc/mail/cf/feature/enhdnsbl.m4
+file path=etc/mail/cf/feature/generics_entire_domain.m4
+file path=etc/mail/cf/feature/genericstable.m4
+file path=etc/mail/cf/feature/greet_pause.m4
+file path=etc/mail/cf/feature/ldap_routing.m4
+file path=etc/mail/cf/feature/limited_masquerade.m4
+file path=etc/mail/cf/feature/local_lmtp.m4
+file path=etc/mail/cf/feature/local_no_masquerade.m4
+file path=etc/mail/cf/feature/local_procmail.m4
+file path=etc/mail/cf/feature/lookupdotdomain.m4
+file path=etc/mail/cf/feature/loose_relay_check.m4
+file path=etc/mail/cf/feature/mailertable.m4
+file path=etc/mail/cf/feature/masquerade_entire_domain.m4
+file path=etc/mail/cf/feature/masquerade_envelope.m4
+file path=etc/mail/cf/feature/msp.m4
+file path=etc/mail/cf/feature/mtamark.m4
+file path=etc/mail/cf/feature/no_default_msa.m4
+file path=etc/mail/cf/feature/nocanonify.m4
+file path=etc/mail/cf/feature/nopercenthack.m4
+file path=etc/mail/cf/feature/notsticky.m4
+file path=etc/mail/cf/feature/nouucp.m4
+file path=etc/mail/cf/feature/nullclient.m4
+file path=etc/mail/cf/feature/preserve_local_plus_detail.m4
+file path=etc/mail/cf/feature/preserve_luser_host.m4
+file path=etc/mail/cf/feature/promiscuous_relay.m4
+file path=etc/mail/cf/feature/queuegroup.m4
+file path=etc/mail/cf/feature/ratecontrol.m4
+file path=etc/mail/cf/feature/redirect.m4
+file path=etc/mail/cf/feature/relay_based_on_MX.m4
+file path=etc/mail/cf/feature/relay_entire_domain.m4
+file path=etc/mail/cf/feature/relay_hosts_only.m4
+file path=etc/mail/cf/feature/relay_local_from.m4
+file path=etc/mail/cf/feature/relay_mail_from.m4
+file path=etc/mail/cf/feature/require_rdns.m4
+file path=etc/mail/cf/feature/smrsh.m4
+file path=etc/mail/cf/feature/stickyhost.m4
+file path=etc/mail/cf/feature/use_client_ptr.m4
+file path=etc/mail/cf/feature/use_ct_file.m4
+file path=etc/mail/cf/feature/use_cw_file.m4
+file path=etc/mail/cf/feature/uucpdomain.m4
+file path=etc/mail/cf/feature/virtuser_entire_domain.m4
+file path=etc/mail/cf/feature/virtusertable.m4
+file path=etc/mail/cf/m4/cf.m4
+file path=etc/mail/cf/m4/cfhead.m4
+file path=etc/mail/cf/m4/proto.m4
+file path=etc/mail/cf/m4/version.m4
+file path=etc/mail/cf/mailer/local.m4
+file path=etc/mail/cf/mailer/procmail.m4
+file path=etc/mail/cf/mailer/smtp.m4
+file path=etc/mail/cf/mailer/uucp.m4
+file path=etc/mail/cf/ostype/solaris11.m4
+file path=etc/mail/cf/ostype/solaris2.m4
+file path=etc/mail/cf/ostype/solaris2.ml.m4
+file path=etc/mail/cf/ostype/solaris2.pre5.m4
+file path=etc/mail/cf/ostype/solaris8.m4
link path=etc/mail/cf/sh/check-hostname \
target=../../../../usr/sbin/check-hostname
link path=etc/mail/cf/sh/check-permissions \
target=../../../../usr/sbin/check-permissions
-file cf/sh/makeinfo.sh path=etc/mail/cf/sh/makeinfo.sh group=mail mode=0444
+file path=etc/mail/cf/sh/makeinfo.sh
file path=etc/mail/helpfile
file local-host-names path=etc/mail/local-host-names \
original_name=SUNWsndm:etc/mail/local-host-names preserve=true