Merge pull request #7 from pyhalov/oi-updates

Oi updates

Author: pyhalov

.hgtags

@@ -154,3 +154,5 @@ ff3c422dd0e3cfb3d9c554f878ed833134576533 s12b27
 8c4b7bd87647791770ab557c59df04102daf41b2 s12b34
 1082c7f263dc7f173300c310f4a3218c2d14946a s12b35
 20b83de1f13197e25a6ca3b025fc26a9cf0cdfde s12b36
+50bd24a7036854d736b270d61e86e89dac11910e s12b37
+0612a636198c6b059aae638559fee5d99fd584bb s12b38

doc/client_api_versions.txt

@@ -1,3 +1,55 @@
+Version 80:
+Compatible with clients using versions 72-79.
+
+    pkg.client.api.ImageInterface has changed as follows:
+
+	* Added optional 'implicit' parameter to gen_facets() and
+	  gen_variants() methods to get effective value of facets and
+	  boolean variants.
+
+Version 79:
+Compatible with clients using versions 72-78.
+
+    pkg.client.api.PlanDescription has changed as follows:
+
+        * Added get_editable_changes() function to return the list of
+	  "editable" files that will be moved, removed, installed, or
+	  updated during the planned operation.
+
+Version 78:
+Compatible with clients using versions 72-77.
+
+    pkg.client.api.ImageInterface has changed as follows:
+
+        * Added 'li_recurse' parameter to
+            - gen_plan_update()
+            - gen_plan_uninstall()
+            - gen_plan_install()
+            - gen_plan_change_varcets()
+
+          These allow to run the above operations recursively in linked images.
+
+        * Added 'ignore_missing' parameter to
+             - gen_plan_uninstall()
+             - gen_plan_update()
+
+          This changes the behavior of uninstall and update to not fail if a
+          package for the requested operation is not found.
+
+Version 77:
+Compatible with clients using versions 72-76.
+
+    pkg.client.api.ImageInterface has changed as follows:
+
+        * Added 'act_timeout' parameter to
+            - gen_plan_update()
+            - gen_plan_uninstall()
+            - gen_plan_install()
+            - gen_plan_change_varcets()
+
+          These allow to use synchronous SMF actuators including a timeout. 
+
+
 Version 76:
 Compatible with clients using versions 72-75 [1].
 

doc/facets.txt

@@ -27,7 +27,9 @@ Name                  values
 facet.locale.*        true, false
 facet.doc.man	      true, false
 facet.doc	      true, false
+facet.debug.*         true, false
 facet.devel.*         true, false
+facet.optional.*      true, false
 variant.arch	      sparc, i386, zos
 variant.debug.*	      true, false
 
@@ -55,11 +57,11 @@ In order to simplify grouping of facets, wildcarding is supported
 when setting facets, but not variants.  For example,
 facet.doc.* matches facet.doc.man, facet.doc.info and facet.doc.html.
 For ease of installation and backwards compatibility, facets that
-are unspecified in the image are automatically included; for the
-same reasons, any variant matching the name variant.debug.* is
-automatically set to false.  When multiple image facet patterns
-match, the longest match is selected. For example, the image
-may have:
+are unspecified in the image are automatically included except for those
+starting with 'facet.debug.' or 'facet.optional.'; for the same reasons,
+any variant matching the name variant.debug.* is automatically set to
+false.  When multiple image facet patterns match, the longest match is
+selected. For example, the image may have:
 
 
 facet.locale.*  false
@@ -113,6 +115,8 @@ facet.doc.info		 true
 facet.doc.man		 true
 facet.doc.html		 true
 facet.devel		 true
+facet.debug.<all>	 false
+facet.optional.<all>	 false
 facet.platform.sun4u	 true 
 facet.platform.sun4v	 true
 variant.arch		 one of sparc, i386 as set by platform code

exception_lists/copyright

@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 syntax: glob
 
 src/man/*.txt
 src/tests/baseline.txt
+doc/*

src/Makefile

@@ -20,10 +20,12 @@
 #
 
 #
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-PYTHON = /usr/bin/python2.6
+PYTHON26 = /usr/bin/python2.6
+PYTHON27 = /usr/bin/python2.7
+PYTHON34 = /usr/bin/python3.4
 
 all := TARGET = all
 install := TARGET = install
@@ -49,33 +51,36 @@ PYLINT_VER_CMD = PYTHONPATH= /usr/bin/pkg info pkg:/developer/python/pylint | \
 SUBDIRS=brand zoneproxy tsol
 
 all: $(SUBDIRS)
-	$(PYTHON) setup.py build
+	$(PYTHON26) setup.py build
+	$(PYTHON27) setup.py build
 
 clean: $(SUBDIRS)
-	$(PYTHON) setup.py clean
+	$(PYTHON27) setup.py clean
 	@cd pkg; pwd; make clean
 
 clobber: $(SUBDIRS)
-	$(PYTHON) setup.py clobber
+	$(PYTHON27) setup.py clobber
 	@cd pkg; pwd; make clobber
 
 #
 # run pylint as part of the install target.
 # it's the best way to ensure things stay pylint clean.
 #
 install: $(SUBDIRS)
-	$(PYTHON) setup.py install
+	$(PYTHON26) setup.py install
+	$(PYTHON27) setup.py install
 
 lint:
-	$(PYTHON) setup.py lint
+	$(PYTHON27) setup.py lint
 	@cd zoneproxy; pwd; make lint
 
 clint:
-	$(PYTHON) setup.py clint
+	$(PYTHON27) setup.py clint
 	@cd zoneproxy; pwd; make lint
 
 pylint: install
-	PYLINT_VER=$(PYLINT_VER_CMD:sh) $(PYTHON) setup.py pylint
+	PYLINT_VER=$(PYLINT_VER_CMD:sh) $(PYTHON26) setup.py pylint
+	PYLINT_VER=$(PYLINT_VER_CMD:sh) $(PYTHON27) setup.py pylint
 
 #
 # This rule propagates the current make target through all of the
@@ -88,15 +93,15 @@ $(SUBDIRS): FRC
 packages: install pylint
 	@cd pkg; pwd; $(MAKE) $(TARGET) check \
 		PATH=$$(hg root 2>/dev/null || git rev-parse --show-toplevel)/proto/root_$$(uname -p)/usr/bin:$$PATH \
-		PYTHONPATH=$$(hg root 2>/dev/null || git rev-parse --show-toplevel)/proto/root_$$(uname -p)/usr/lib/python2.6/vendor-packages
+		PYTHONPATH=$$(hg root 2>/dev/null || git rev-parse --show-toplevel)/proto/root_$$(uname -p)/usr/lib/python2.7/vendor-packages
 
 test:
-	$(PYTHON) setup.py test
+	$(PYTHON27) setup.py test
 
 test-verbose:
-	$(PYTHON) setup.py test -v
+	$(PYTHON27) setup.py test -v
 
 test-generate:
-	$(PYTHON) setup.py test -g
+	$(PYTHON27) setup.py test -g
 
 FRC:

src/brand/attach

@@ -22,6 +22,7 @@
 
 #
 # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 #
 
 . /usr/lib/brand/ipkg/common.ksh
@@ -196,6 +197,13 @@ gather_zone_publisher_details() {
 			typeset publisher.name=$name
 			typeset publisher.keyfile=""
 			typeset publisher.certfile=""
+			typeset publisher.sigpol=""
+
+			# Get the signature policy.  This code assumes
+			# specific output ( "signature-policy = <policy>"
+			# or empty-string).
+			publisher.sigpol=$($PKG publisher ${publisher.name} | \
+			    grep signature-policy | sed 's/ //g')
 
 			get_publisher_attrs ${publisher.name} origin | \
 			    IFS=" " read publisher.sticky publisher.preferred \
@@ -302,6 +310,10 @@ print_publisher_pkg_defn() {
 
 	eval publisher="${publishers[$pname]}"
 
+	if [[ "${publisher.sigpol}" != "" ]]; then
+		args="$args --set-property ${publisher.sigpol}"
+	fi
+
 	if [[ ${publisher.preferred} == "true" ]]; then
 		args="$args -P"
 	fi

src/brand/fmri_compare.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 
+from __future__ import print_function
 import pkg.fmri
 import sys
 
@@ -38,22 +39,21 @@ def usage():
         x = pkg.fmri.PkgFmri(sys.argv[1])
         y = pkg.fmri.PkgFmri(sys.argv[2])
 except pkg.fmri.FmriError, e:
-        print >> sys.stderr, "error: %s" % str(e)
+        print ("error: %s" % str(e) , file=sys.stderr)
         sys.exit(1)
 
 if not x.is_same_pkg(y):
-        print >> sys.stderr, \
-            "error: can only compare two versions of the same package."
+        print ("error: can only compare two versions of the same package.", file=sys.stderr)
         sys.exit(1)
 
 if x < y:
-        print "<"
+        print("<")
 elif x > y:
-        print ">"
+        print(">")
 elif x == y:
-        print "="
+        print("=")
 else:
-        print >> sys.stderr, "panic"
+        print ("panic", file=sys.stderr)
         sys.exit(1)
 
 sys.exit(0)

src/brand/pkgcreatezone

@@ -22,6 +22,7 @@
 
 #
 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 #
 
 #
@@ -398,6 +399,13 @@ LC_ALL=C $PKG image-create -f --no-refresh --zone --full \
 # Retrieve publisher attributes and update our new publisher
 attrs=$(get_publisher_attr_args $publisher "origin")
 
+# Get the signature policy from the global zone.  This code assumes
+# specific output ( "signature-policy = <policy>"  or empty-string).
+sigpol=$($PKG publisher $publisher | grep signature-policy | sed 's/ = /=/')
+if [ "$sigpol" != "" ]; then
+	sigpol="--set-property $sigpol"
+fi
+
 # Change the value of PKG_IMAGE so that future PKG operation will work
 # on the newly created zone rather than the global zone
 
@@ -407,7 +415,7 @@ export PKG_IMAGE
 # --no-refresh is used here so that update operations can be
 # coalesced.
 # Update our new publisher
-LC_ALL=C $PKG set-publisher --no-refresh $attrs $publisher \
+LC_ALL=C $PKG set-publisher --no-refresh $sigpol $attrs $publisher \
     || fail_incomplete "$f_img"
 
 # add extra publishers