Import sfw build 144
Bugs Fixed
----------
6775306 CUPS svc manifest has wrongly placed <restarter> tag
6945050 15-pkcs11_engine-0.9.8a.patch contains old header files
6957713 upgrade OpenSSL in OpenSolaris to 0.9.8o
6961481 easy handles stuck in multi at WAITDO state
diff -ur init/cups.xml.in cups-1.4.2/init/cups.xml.in
--- init/cups.xml.in Thu Jul 31 10:16:48 2008
+++ init/cups.xml.in Tue Jun 29 04:43:51 2010
@@ -116,6 +116,10 @@
type='service'
version='1'>
+ <restarter>
+ <service_fmri value='svc:/network/inetd:default' />
+ </restarter>
+
<dependency
name='filesystem_minimal'
grouping='require_all'
@@ -155,10 +159,6 @@
timeout_seconds='60' />
<instance name='default' enabled='false' >
- <restarter>
- <service_fmri value='svc:/network/inetd:default' />
- </restarter>
-
<dependency
name='cupsd'
grouping='require_all'