--- a/components/isc-dhcp/dhcp.p5m Fri Apr 01 15:20:17 2016 -0700
+++ b/components/isc-dhcp/dhcp.p5m Fri Apr 01 16:02:33 2016 -0700
@@ -18,6 +18,7 @@
#
# CDDL HEADER END
#
+#
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,9 +33,10 @@
set name=info.classification value=org.opensolaris.category.2008:System/Services
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2011/043 value=PSARC/2015/160
+set name=org.opensolaris.arc-caseid value=PSARC/2011/043 value=PSARC/2015/160 \
+ value=PSARC/2016/201
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file server/dhcpd.conf path=etc/inet/dhcpd.conf.example group=sys
+file path=etc/inet/dhcpd.conf.example group=sys
file dhcp_auths path=etc/security/auth_attr.d/service%2Fnetwork%2Fisc-dhcp
file isc-dhcp-relay.xml path=lib/svc/manifest/network/dhcp/isc-dhcp-relay.xml \
group=sys mode=0444
@@ -42,33 +44,20 @@
path=lib/svc/manifest/network/dhcp/isc-dhcp-server.xml group=sys mode=0444
file isc-dhcp path=lib/svc/method/isc-dhcp mode=0555
file path=usr/include/dhcpctl/dhcpctl.h
-file path=usr/include/isc-dhcp/boolean.h
-file path=usr/include/isc-dhcp/commandline.h
-file path=usr/include/isc-dhcp/dst.h
-file path=usr/include/isc-dhcp/formatcheck.h
-file path=usr/include/isc-dhcp/int.h
-file path=usr/include/isc-dhcp/lang.h
-file path=usr/include/isc-dhcp/list.h
-file path=usr/include/isc-dhcp/mem.h
-file path=usr/include/isc-dhcp/print.h
-file path=usr/include/isc-dhcp/result.h
-file path=usr/include/isc-dhcp/string.h
-file path=usr/include/isc-dhcp/types.h
file path=usr/include/omapip/alloc.h
file path=usr/include/omapip/buffer.h
file path=usr/include/omapip/convert.h
file path=usr/include/omapip/hash.h
+file path=usr/include/omapip/isclib.h
file path=usr/include/omapip/omapip.h
file path=usr/include/omapip/omapip_p.h
+file path=usr/include/omapip/result.h
file path=usr/include/omapip/trace.h
link path=usr/lib/$(MACH64)/libdhcpctl.so target=libdhcpctl.so.1
file path=usr/lib/$(MACH64)/libdhcpctl.so.1
-link path=usr/lib/$(MACH64)/libdst.so target=libdst.so.1
-file path=usr/lib/$(MACH64)/libdst.so.1
link path=usr/lib/$(MACH64)/libomapi.so target=libomapi.so.1
file path=usr/lib/$(MACH64)/libomapi.so.1
file path=usr/lib/$(MACH64)/llib-ldhcpctl.ln
-file path=usr/lib/$(MACH64)/llib-ldst.ln
file path=usr/lib/$(MACH64)/llib-lomapi.ln
file SmfDHCPStates.html path=usr/lib/help/auths/locale/SmfDHCPStates.html
file SmfValueDHCP.html path=usr/lib/help/auths/locale/SmfValueDHCP.html
@@ -76,18 +65,15 @@
file path=usr/lib/inet/dhcrelay
link path=usr/lib/libdhcpctl.so target=libdhcpctl.so.1
file path=usr/lib/libdhcpctl.so.1
-link path=usr/lib/libdst.so target=libdst.so.1
-file path=usr/lib/libdst.so.1
link path=usr/lib/libomapi.so target=libomapi.so.1
file path=usr/lib/libomapi.so.1
file path=usr/lib/llib-ldhcpctl
file path=usr/lib/llib-ldhcpctl.ln
-file path=usr/lib/llib-ldst
-file path=usr/lib/llib-ldst.ln
file path=usr/lib/llib-lomapi
file path=usr/lib/llib-lomapi.ln
file path=usr/sbin/omshell
file path=usr/share/man/man1/omshell.1
+file path=usr/share/man/man3/dhcpctl.3
file path=usr/share/man/man3/omapi.3
file path=usr/share/man/man5/dhcp-eval.5
file path=usr/share/man/man5/dhcp-options.5
@@ -104,12 +90,8 @@
dir path=var/db/isc-dhcp owner=dhcpserv group=netadm mode=0755
file dhcpd.leases path=var/db/isc-dhcp/dhcpd4.leases owner=dhcpserv \
group=netadm mode=0644 preserve=true
-file dhcpd.leases path=var/db/isc-dhcp/dhcpd4.leases~ owner=dhcpserv \
- group=netadm mode=0644 preserve=true
file dhcpd.leases path=var/db/isc-dhcp/dhcpd6.leases owner=dhcpserv \
group=netadm mode=0644 preserve=true
-file dhcpd.leases path=var/db/isc-dhcp/dhcpd6.leases~ owner=dhcpserv \
- group=netadm mode=0644 preserve=true
user username=dhcpserv ftpuser=false gcos-field="DHCP Configuration Admin" \
group=netadm uid=18
license isc-dhcp.license license="ISC BSD"