--- a/src/man/packagemanager.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/packagemanager.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,7 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH packagemanager 1 "27 May 2012" "SunOS 5.11" "User Commands"
+.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+.TH packagemanager 1 "27 May 2012" "SunOS 5.12" "User Commands"
.SH NAME
packagemanager \- GUI for the Image Packaging System
.SH SYNOPSIS
--- a/src/man/pkg.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkg.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkg 1 "10 Oct 2012" "SunOS 5.12" "User Commands"
+.TH pkg 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkg \- Image Packaging System retrieval client
.SH SYNOPSIS
@@ -16,12 +16,12 @@
.LP
.nf
-/usr/bin/pkg install [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg install [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR]...
[--accept] [--licenses] [--no-be-activate] [--no-index]
[--no-refresh] [--no-backup-be | --require-backup-be]
[--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
- [--reject \fIpkg_fmri_pattern\fR ...] \fIpkg_fmri_pattern\fR ...
+ [--reject \fIpkg_fmri_pattern\fR]... \fIpkg_fmri_pattern\fR ...
.fi
.LP
@@ -35,37 +35,38 @@
.LP
.nf
-/usr/bin/pkg update [-fnvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg update [-fnvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR]...
[--accept] [--licenses] [--no-be-activate] [--no-index]
[--no-refresh] [--no-backup-be | --require-backup-be]
[--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
- [--reject \fIpkg_fmri_pattern\fR ...] [\fIpkg_fmri_pattern\fR ...]
+ [--reject \fIpkg_fmri_pattern\fR]... [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg list [-Hafnsuv] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg list [-Hafnsuv] [-g \fIpath_or_uri\fR]...
[--no-refresh] [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg info [-lr] [-g \fIpath_or_uri\fR ...] [--license]
+/usr/bin/pkg info [-lr] [-g \fIpath_or_uri\fR]... [--license]
[\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg contents [-Hmr] [-a \fIattribute\fR=\fIpattern\fR ...]
- [-g \fIpath_or_uri\fR ...] [-o \fIattribute\fR ...] [-s \fIsort_key\fR]
- [-t \fIaction_name\fR ...] [\fIpkg_fmri_pattern\fR ...]
+/usr/bin/pkg contents [-Hmr] [-a \fIattribute\fR=\fIpattern\fR]...
+ [-g \fIpath_or_uri\fR]... [-o \fIattribute\fR[,\fIattribute\fR]...]...
+ [-s \fIsort_key\fR] [-t \fIaction_name\fR[,\fIaction_name\fR]...]...
+ [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg search [-HIaflpr] [-o \fIattribute\fR ...]
- [-s \fIrepo_uri\fR] \fIquery\fR
+/usr/bin/pkg search [-HIaflpr]
+ [-o \fIattribute\fR[,\fIattribute\fR]...]... [-s \fIrepo_uri\fR] \fIquery\fR
.fi
.LP
@@ -119,7 +120,7 @@
.LP
.nf
-/usr/bin/pkg change-variant [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg change-variant [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR]...
[--accept] [--licenses] [--no-be-activate]
[--no-backup-be | --require-backup-be]
[--backup-be-name \fIname\fR]
@@ -134,12 +135,12 @@
.LP
.nf
-/usr/bin/pkg change-facet [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg change-facet [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR]...
[--accept] [--licenses] [--no-be-activate]
[--no-backup-be | --require-backup-be]
[--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
- \fIfacet_name\fR=[True|False|None] ...
+ \fIfacet_name\fR=(True|False|None) ...
.fi
.LP
@@ -154,12 +155,12 @@
.LP
.nf
-/usr/bin/pkg freeze [-n] [-c \fIreason\fR] [\fIpkg_fmri_pattern\fR] ...
+/usr/bin/pkg freeze [-n] [-c \fIreason\fR] [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg unfreeze [-n] [\fIpkg_name_pattern\fR] ...
+/usr/bin/pkg unfreeze [-n] [\fIpkg_name_pattern\fR ...]
.fi
.LP
@@ -195,10 +196,10 @@
.LP
.nf
/usr/bin/pkg set-publisher [-Ped] [-k \fIssl_key\fR] [-c \fIssl_cert\fR]
- [-g \fIorigin_to_add\fR | --add-origin \fIorigin_to_add\fR ...]
- [-G \fIorigin_to_remove\fR | --remove-origin \fIorigin_to_remove\fR ...]
- [-m \fImirror_to_add\fR | --add-mirror \fImirror_to_add\fR ...]
- [-M \fImirror_to_remove\fR | --remove-mirror \fImirror_to_remove\fR ...]
+ [-g \fIorigin_to_add\fR | --add-origin \fIorigin_to_add\fR]...
+ [-G \fIorigin_to_remove\fR | --remove-origin \fIorigin_to_remove\fR]...
+ [-m \fImirror_to_add\fR | --add-mirror \fImirror_to_add\fR]...
+ [-M \fImirror_to_remove\fR | --remove-mirror \fImirror_to_remove\fR]...
[--enable] [--disable] [--no-refresh] [--reset-uuid]
[--non-sticky] [--sticky] [--search-after \fIpublisher\fR]
[--search-before \fIpublisher\fR] [--search-first]
@@ -223,7 +224,7 @@
[--set-property \fIname_of_property\fR=\fIvalue\fR]
[--add-property-value \fIname_of_property\fR=\fIvalue_to_add\fR]
[--remove-property-value \fIname_of_property\fR=\fIvalue_to_remove\fR]
- [--unset-property \fIname_of_property_to_delete\fR]
+ [--unset-property \fIname_of_property_to_delete\fR]
[--proxy \fIproxy_to_use\fR] [\fIpublisher\fR]
.fi
@@ -234,8 +235,9 @@
.LP
.nf
-/usr/bin/pkg history [-HNl] [-t [\fItime\fR | \fItime\fR-\fItime\fR],...]
- [-o \fIcolumn\fR,...] [-n \fInumber\fR]
+/usr/bin/pkg history [-HNl]
+ [-t \fItime\fR | \fItime\fR-\fItime\fR[,\fItime\fR | \fItime\fR-\fItime\fR]...]...
+ [-o \fIcolumn\fR[,\fIcolumn\fR]...]... [-n \fInumber\fR]
.fi
.LP
@@ -268,11 +270,11 @@
/usr/bin/pkg image-create [-FPUfz] [--force]
[--full | --partial | --user] [--zone]
[-k \fIssl_key\fR] [-c \fIssl_cert\fR] [--no-refresh]
- [--variant \fIvariant_name\fR=\fIvalue\fR ...]
- [-g \fIpath_or_uri\fR | --origin \fIpath_or_uri\fR ...]
- [-m \fIuri\fR | --mirror \fIuri\fR ...]
+ [--variant \fIvariant_name\fR=\fIvalue\fR]...
+ [-g \fIpath_or_uri\fR | --origin \fIpath_or_uri\fR]...
+ [-m \fIuri\fR | --mirror \fIuri\fR]...
[--set-property \fIname_of_property\fR=\fIvalue\fR]
- [--facet \fIfacet_name\fR=(True|False) ...]
+ [--facet \fIfacet_name\fR=(True|False)]...
[(-p | --publisher) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR
.fi
@@ -378,7 +380,7 @@
.ne 2
.mk
.na
-\fB\fBpkg install\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] \fIpkg_fmri_pattern\fR ...\fR
+\fB\fBpkg install\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR]... \fIpkg_fmri_pattern\fR ...\fR
.ad
.sp .6
.RS 4n
@@ -577,7 +579,7 @@
.ad
.sp .6
.RS 4n
-Prevent packages with names matching the given pattern from being installed. If matching packages are already installed, they are removed as part of this operation. Rejected packages that are the target of group dependencies are placed on the avoid list.
+Prevent packages with names matching the given pattern from being installed. If matching packages are already installed, they are removed as part of this operation. Rejected packages that are the target of group dependencies are placed on the avoid list. This option can be specified multiple times.
.RE
.RE
@@ -603,7 +605,7 @@
.ne 2
.mk
.na
-\fB\fBpkg update\fR [\fB-fnvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg update\fR [\fB-fnvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR]... [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -647,7 +649,7 @@
.ne 2
.mk
.na
-\fB\fBpkg list\fR [\fB-Hafnsuv\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--no-refresh\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg list\fR [\fB-Hafnsuv\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--no-refresh\fR] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -799,7 +801,7 @@
.ne 2
.mk
.na
-\fB\fBpkg info\fR [\fB-lr\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--license\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg info\fR [\fB-lr\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--license\fR] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -865,7 +867,7 @@
.ne 2
.mk
.na
-\fB\fBpkg contents\fR [\fB-Hmr\fR] [\fB-a\fR \fIattribute\fR=\fIpattern\fR ...] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIsort_key\fR] [\fB-t\fR \fIaction_name\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg contents\fR [\fB-Hmr\fR] [\fB-a\fR \fIattribute\fR=\fIpattern\fR]... [\fB-g\fR \fIpath_or_uri\fR]... [\fB-o\fR \fIattribute\fR[,\fIattribute\fR]...]... [\fB-s\fR \fIsort_key\fR] [\fB-t\fR \fIaction_name\fR[,\fIaction_name\fR]...]... [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -900,7 +902,7 @@
.ad
.sp .6
.RS 4n
-Limit the output to those actions that have an attribute named in the option argument with a value that matches the (glob) pattern in the option argument (following the attribute name with an equals sign). If multiple \fB-a\fR options are given, then actions matching any of them are displayed.
+Limit the output to those actions that have an \fIattribute\fR named in the option argument with a value that matches the (glob) \fIpattern\fR in the option argument. This option can be specified multiple times. If multiple \fB-a\fR options are given, then actions that match any of them are displayed.
.RE
.sp
@@ -966,7 +968,7 @@
.ad
.sp .6
.RS 4n
-Only list the specified actions. Multiple actions can be specified in a comma-separated list. The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page, such as \fBfile\fR, \fBdirectory\fR, \fBdriver\fR, \fBdepend\fR, \fBset\fR. This option can be specified multiple times.
+Only list the specified actions. The \fB-t\fR option can be specified multiple times, or multiple actions can be specified as the argument to one \fB-t\fR option by separating the action names with commas. The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page, such as \fBfile\fR, \fBdirectory\fR, \fBdriver\fR, \fBdepend\fR, \fBset\fR.
.RE
Several special pseudo attribute names are available for convenience:
@@ -1067,7 +1069,7 @@
.ne 2
.mk
.na
-\fB\fBpkg search\fR [\fB-HIaflpr\fR] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIrepo_uri\fR] \fIquery\fR\fR
+\fB\fBpkg search\fR [\fB-HIaflpr\fR] [\fB-o\fR \fIattribute\fR[,\fIattribute\fR]...]... [\fB-s\fR \fIrepo_uri\fR] \fIquery\fR\fR
.ad
.sp .6
.RS 4n
@@ -1406,7 +1408,7 @@
.ad
.sp .6
.RS 4n
-Revert all files tagged with \fItag-name\fR, and remove any unpackaged files or directories matching pattern in directories with this tag. See "File Actions" in the \fBpkg\fR(5) manual page.
+Revert all files tagged with \fItag-name\fR, and remove any unpackaged files or directories that are under directories with this tag and that match \fIpattern\fR. See the description of the \fBrevert-tag\fR attribute in "File Actions" and "Directory Actions" in the \fBpkg\fR(5) man page for more information about \fItag-name\fR and \fIpattern\fR.
.RE
.sp
@@ -1585,7 +1587,7 @@
.ne 2
.mk
.na
-\fB\fBpkg change-variant\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR |\fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIvariant_name\fR=\fIvalue\fR ...\fR
+\fB\fBpkg change-variant\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR |\fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIvariant_name\fR=\fIvalue\fR ...\fR
.ad
.sp .6
.RS 4n
@@ -1633,7 +1635,7 @@
.ne 2
.mk
.na
-\fB\fBpkg change-facet\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIfacet_name\fR=[\fBTrue\fR|\fBFalse\fR|\fBNone\fR] ...\fR
+\fB\fBpkg change-facet\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIfacet_name\fR=(\fBTrue\fR|\fBFalse\fR|\fBNone\fR) ...\fR
.ad
.sp .6
.RS 4n
@@ -1696,7 +1698,7 @@
.ne 2
.mk
.na
-\fB\fBpkg freeze\fR [\fB-n\fR] [\fB-c\fR \fIreason\fR] [\fIpkg_fmri_pattern\fR] \&...\fR
+\fB\fBpkg freeze\fR [\fB-n\fR] [\fB-c\fR \fIreason\fR] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -1744,7 +1746,7 @@
.ne 2
.mk
.na
-\fB\fBpkg unfreeze\fR [\fB-n\fR] [\fIpkg_name_pattern\fR] ...\fR
+\fB\fBpkg unfreeze\fR [\fB-n\fR] [\fIpkg_name_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -1920,7 +1922,7 @@
.ne 2
.mk
.na
-\fB\fBpkg set-publisher\fR [\fB-Ped\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB-g\fR \fIorigin_to_add\fR | \fB--add-origin\fR \fIorigin_to_add\fR ...] [\fB-G\fR \fIorigin_to_remove\fR | \fB--remove-origin\fR \fIorigin_to_remove\fR ...] [\fB-m\fR \fImirror_to_add\fR | \fB--add-mirror\fR \fImirror_to_add\fR ...] [\fB-M\fR \fImirror_to_remove\fR | \fB--remove-mirror\fR \fImirror_to_remove\fR ...] [\fB--enable\fR] [\fB--disable\fR] [\fB--no-refresh\fR] [\fB--reset-uuid\fR] [\fB--non-sticky\fR] [\fB--sticky\fR] [\fB--search-after\fR \fIpublisher\fR] [\fB--search-before\fR \fIpublisher\fR] [\fB--search-first\fR] [\fB--approve-ca-cert\fR \fIpath_to_CA\fR] [\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR] [\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR] [\fB--unset-property\fR \fIname_of_property_to_delete\fR] [\fB--proxy\fR \fIproxy_to_use\fR] \fIpublisher\fR\fR
+\fB\fBpkg set-publisher\fR [\fB-Ped\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB-g\fR \fIorigin_to_add\fR | \fB--add-origin\fR \fIorigin_to_add\fR]... [\fB-G\fR \fIorigin_to_remove\fR | \fB--remove-origin\fR \fIorigin_to_remove\fR]... [\fB-m\fR \fImirror_to_add\fR | \fB--add-mirror\fR \fImirror_to_add\fR]... [\fB-M\fR \fImirror_to_remove\fR | \fB--remove-mirror\fR \fImirror_to_remove\fR]... [\fB--enable\fR] [\fB--disable\fR] [\fB--no-refresh\fR] [\fB--reset-uuid\fR] [\fB--non-sticky\fR] [\fB--sticky\fR] [\fB--search-after\fR \fIpublisher\fR] [\fB--search-before\fR \fIpublisher\fR] [\fB--search-first\fR] [\fB--approve-ca-cert\fR \fIpath_to_CA\fR] [\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR] [\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR] [\fB--unset-property\fR \fIname_of_property_to_delete\fR] [\fB--proxy\fR \fIproxy_to_use\fR] \fIpublisher\fR\fR
.ad
.sp .6
.RS 4n
@@ -2240,11 +2242,11 @@
.ne 2
.mk
.na
-\fB\fBpkg history\fR [\fB-HNl\fR] [\fB-t\fR [\fItime\fR | \fItime\fR-\fItime\fR],...] [\fB-o\fR \fIcolumn\fR,...] [\fB-n\fR \fInumber\fR]\fR
+\fB\fBpkg history\fR [\fB-HNl\fR] [\fB-t\fR \fItime\fR | \fItime\fR-\fItime\fR[,\fItime\fR | \fItime\fR-\fItime\fR]...]... [\fB-o\fR \fIcolumn\fR[,\fIcolumn\fR]...]... [\fB-n\fR \fInumber\fR]\fR
.ad
.sp .6
.RS 4n
-Display the command history of the applicable image.
+Display the command history of the applicable image. Display the start time of the operation, the name of the operation (for example, \fBinstall\fR), the client (for example, \fBpkg\fR), and the outcome of the operation (Succeeded or Failed).
.sp
.ne 2
.mk
@@ -2268,7 +2270,7 @@
.ad
.sp .6
.RS 4n
-Display log records for a comma-separated list of timestamps, formatted with \fB%Y-%m-%dT%H:%M:%S\fR (see \fBstrftime\fR(3C)). To specify a range of times, use a hyphen (-) between a start and finish timestamp. The keyword \fBnow\fR can be used as an alias for the current time. If the timestamps specified contain duplicate timestamps or overlapping date ranges, only a single instance of each duplicate history event is printed.
+Display log records for a comma-separated list of timestamps, formatted with \fB%Y-%m-%dT%H:%M:%S\fR (see the \fBstrftime\fR(3C) man page). To specify a range of times, use a hyphen (\fB-\fR) between a start and finish timestamp. The keyword \fBnow\fR can be used as an alias for the current time. This option can be specified multiple times. If the timestamps specified contain duplicate timestamps or overlapping ranges, duplicate history events are not displayed. Only a single instance of each history event is displayed.
.RE
.sp
@@ -2279,7 +2281,7 @@
.ad
.sp .6
.RS 4n
-Display log records in long format, which, in addition to the standard format, includes the outcome of the command, the time the command completed, the version and name of the client used, the name of the user who performed the operation, and any errors that were encountered while executing the command.
+Display the long form of the command history of the image. Additional information displayed includes the version of the client, the name of the user who performed the operation, whether a new boot environment was created, the time the operation completed and total time taken, the complete command that was issued, and any errors that were encountered while executing the command. For operations such as \fBupdate\fR, complete FMRIs of changed packages are shown.
.RE
.sp
@@ -2312,7 +2314,7 @@
.ad
.sp .6
.RS 4n
-Display output using the specified comma-separated list of column names. Valid column names are:
+Display output using the specified column names. The \fB-o\fR option can be specified multiple times, or multiple column names can be specified as the argument to one \fB-o\fR option by separating the column names with commas. Valid column names are:
.sp
.ne 2
.mk
@@ -2568,17 +2570,21 @@
.ne 2
.mk
.na
-\fB\fBpkg image-create\fR [\fB-FPUz\fR] [\fB-f\fR |\fB--force\fR] [\fB--full\fR | \fB--partial\fR | \fB--user\fR] [\fB--zone\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB--no-refresh\fR] [\fB--variant\fR \fIvariant_name\fR=\fIvalue\fR ...] [\fB-g\fR \fIpath_or_uri\fR | \fB--origin\fR \fIpath_or_uri\fR ...] [\fB-m\fR \fIuri\fR | \fB--mirror\fR \fIuri\fR ...] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--facet\fR \fIfacet_name\fR=(\fBTrue\fR|\fBFalse\fR) \&...] [(\fB-p\fR | \fB--publisher\fR) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR\fR
+\fB\fBpkg image-create\fR [\fB-FPUz\fR] [\fB-f\fR |\fB--force\fR] [\fB--full\fR | \fB--partial\fR | \fB--user\fR] [\fB--zone\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB--no-refresh\fR] [\fB--variant\fR \fIvariant_name\fR=\fIvalue\fR]... [\fB-g\fR \fIpath_or_uri\fR | \fB--origin\fR \fIpath_or_uri\fR]... [\fB-m\fR \fIuri\fR | \fB--mirror\fR \fIuri\fR]... [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--facet\fR \fIfacet_name\fR=(\fBTrue\fR|\fBFalse\fR)]... [(\fB-p\fR | \fB--publisher\fR) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR\fR
.ad
.sp .6
.RS 4n
-At the location given by \fIdir\fR, create an image suitable for package operations. The default image type is user, as given by the \fB-U\fR (\fB--user\fR) option. The image type can be set to a full image (\fB--F\fR or \fB--full\fR) or to a partial image (\fB-P\fR or \fB--partial\fR) linked to the full image enclosing the given \fIdir\fR path. Additional origins can be specified using \fB-g\fR or \fB--origin\fR. Additional mirrors can be specified using \fB-m\fR or \fB--mirror\fR.
+At the location given by \fIdir\fR, create an image suitable for package operations. Images created by using the \fBimage-create\fR subcommand are not bootable. Most users should use the \fB--be-name\fR or \fB--require-new-be\fR options with \fBpkg\fR commands, or use the \fBbeadm\fR or \fBzoneadm\fR commands to create images. The \fBpkg image-create\fR command is used for tasks such as maintaining packages and operating system distributions.
+.sp
+The default image type is user, which can be specified by using the \fB-U\fR or \fB--user\fR option. Alternatively, the image type can be set to a full image (\fB--F\fR or \fB--full\fR) or to a partial image (\fB-P\fR or \fB--partial\fR) linked to the full image enclosing the given \fIdir\fR path.
+.sp
+Additional origins can be specified using \fB-g\fR or \fB--origin\fR. Additional mirrors can be specified using \fB-m\fR or \fB--mirror\fR.
.sp
A package repository URI must be provided using the \fB-p\fR or \fB--publisher\fR option. If a publisher name is also provided, then only that publisher is added when the image is created. If a publisher name is not provided, then all publishers known by the specified repository are added to the image. An attempt to retrieve the catalog associated with this publisher is made following the initial creation operations.
.sp
For publishers using client SSL authentication, a client key and client certificate can be registered via the \fB-c\fR and \fB-k\fR options. This key and certificate are used for all publishers added during image creation.
.sp
-If the image is to be run within non-global zone context, then the \fB-z\fR (\fB--zone\fR) option can be used to set an appropriate variant.
+If the image is to be run within non-global zone context, use the \fB-z\fR (\fB--zone\fR) option to set an appropriate variant.
.sp
.ne 2
.mk
--- a/src/man/pkg.5 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkg.5 Wed Mar 06 14:19:07 2013 -0800
@@ -1,7 +1,6 @@
'\" te
-.\" Copyright (c) 2009, 2013, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH pkg 5 "13 Oct 2012" "SunOS 5.12" "Standards, Environments, and Macros"
+.\" Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkg 5 "1 Mar 2013" "SunOS 5.12" "Standards, Environments, and Macros"
.SH NAME
pkg \- Image Packaging System
.SH DESCRIPTION
@@ -46,7 +45,7 @@
The fourth part of the version, which if present must follow a colon (:), is a timestamp. The timestamp represents when the package was published.
.sp
.LP
-When performing comparisons between versions, no component of the full version is considered unless the components to its left are the same. Thus, "4.3-1" is greater than "4.2-7" because "4.3" is greater than "4.2", and "4.3-3" is greater than "4.3-1" because "3" is greater than "1".
+When performing comparisons between versions, no component of the full version is considered unless the components to its left are the same. Thus, \fB4.3-1\fR is greater than \fB4.2-7\fR because \fB4.3\fR is greater than \fB4.2\fR, and \fB4.3-3\fR is greater than \fB4.3-1\fR because \fB3\fR is greater than \fB1\fR.
.sp
.LP
Many parts of the system, when appropriate, abridge FMRIs when displaying them, and accept input in shorter forms to reduce the volume of information displayed or required. Typically, the scheme, publisher, build version, and timestamp can be elided. Sometimes all of the versioning information can be omitted.
@@ -69,7 +68,7 @@
Names of attributes cannot have whitespace, quotation marks, or equals signs (=) in them. All characters after the first equals sign belong to the value. Values can have all of those, though spaces must be enclosed in single or double quotation marks. Single quotation marks do not need to be escaped inside a string that is enclosed in double quotation marks, and double quotation marks do not need to be escaped inside a string that is enclosed in single quotation marks. A quotation mark can be prefixed with a backslash (\e) character to avoid terminating the quoted string. A backslash can be escaped with a backslash.
.sp
.LP
-Attributes can be named more than once with multiple values. These are treated as unordered lists.
+Actions can have multiple attributes. Some attributes can be named multiple times with different values for a single action. Multiple attributes with the same name are treated as unordered lists.
.sp
.LP
Actions with many attributes can create long lines in a manifest file. Such lines can be wrapped by terminating each incomplete line with a backslash. Note that this continuation character must occur between attribute/value pairs. Neither attributes nor their values nor the combination can be split.
@@ -78,7 +77,7 @@
The attributes listed below are not an exhaustive set. In fact, the attributes that can be attached to an action are arbitrary, and the standard sets of attributes are easy to augment to incorporate future developments.
.sp
.LP
-Certain action attributes cause additional operations to be executed outside of the packaging context. These attributes are documented in the "Actuators" section below.
+Some attributes cause additional operations to be executed outside of the packaging context. These attributes are documented in the "Actuators" section below.
.SS "File Actions"
.sp
.LP
@@ -235,19 +234,29 @@
.ad
.sp .6
.RS 4n
-This attribute is used to tag editable files that should be reverted as a set. Multiple \fBrevert-tag\fR values can be specified. The file reverts to its manifest-defined state when \fBpkg revert\fR is invoked with any of those tags specified. See \fBpkg\fR(1). This attribute can also be used on directories; in that case the value of the attribute should be of the form tagname=pattern. When \fBpkg revert\fR any unpackaged files or directories in the same filesystem matching the specified pattern (using shell globbing characters) are removed.
+This attribute is used to tag editable files that should be reverted as a set. The value of the \fBrevert-tag\fR attribute is a \fItagname\fR. Multiple \fBrevert-tag\fR attributes can be specified for a single \fBfile\fR action. The file reverts to its manifest-defined state when \fBpkg revert\fR is invoked with any of those tags specified. See the \fBpkg\fR(1) man page for information about the \fBpkg revert\fR command.
+.sp
+The \fBrevert-tag\fR attribute can also be specified at the directory level. See "Directory Actions" below.
.RE
.SS "Directory Actions"
.sp
.LP
-The \fBdir\fR action is like the \fBfile\fR action in that it represents a file system object. The \fBdir\fR action represents a directory instead of an ordinary file. The \fBdir\fR action has the same four standard attributes as the \fBfile\fR action, and \fBpath\fR is the key attribute. The \fBdir\fR action also accepts the revert-tag attribute as described above.
+The \fBdir\fR action is like the \fBfile\fR action in that it represents a file system object. The \fBdir\fR action represents a directory instead of an ordinary file. The \fBdir\fR action has the same \fBpath\fR, \fBmode\fR, \fBowner\fR, and \fBgroup\fR attributes that the \fBfile\fR action has, and \fBpath\fR is the key attribute. The \fBdir\fR action also accepts the \fBrevert-tag\fR attribute, but the value of the attribute is different for \fBfile\fR and \fBdir\fR actions.
.sp
.LP
Directories are reference counted in IPS. When the last package that either explicitly or implicitly references a directory no longer does so, that directory is removed. If that directory contains unpackaged file system objects, those items are moved into \fB$IMAGE_META/lost+found\fR. See the "Files" section for more information about \fB$IMAGE_META\fR.
.sp
-.LP
-To move unpackaged contents into a new directory, the following attribute might be useful:
+.ne 2
+.mk
+.na
+\fB\fBrevert-tag\fR\fR
+.ad
+.sp .6
+.RS 4n
+This attribute is used to identify unpackaged files that should be removed as a set. See "File Actions" above for a description of how to specify this attribute for \fBfile\fR actions. For directories, the value of the \fBrevert-tag\fR attribute is \fItagname\fR\fB=\fR\fIpattern\fR. Multiple \fBrevert-tag\fR attributes can be specified for a single \fBdir\fR action. When \fBpkg revert\fR is invoked with a matching \fItagname\fR, any unpackaged files or directories under this \fBdir\fR directory that match \fIpattern\fR (using shell globbing characters) are removed. See the \fBpkg\fR(1) man page for information about the \fBpkg revert\fR command.
+.RE
+
.sp
.ne 2
.mk
@@ -256,7 +265,7 @@
.ad
.sp .6
.RS 4n
-This names a directory of salvaged items. A directory with such an attribute inherits on creation the salvaged directory contents if they exist.
+This attribute can be used to move unpackaged contents into a new directory. The value of this attribute is the name of a directory of salvaged items. A directory with a \fBsalvage-from\fR attribute inherits on creation any contents of the directory named in the value of the \fBsalvage-from\fR attribute.
.RE
.SS "Link Actions"
@@ -890,7 +899,10 @@
.SS "User Actions"
.sp
.LP
-The \fBuser\fR action defines a UNIX user as defined in \fB/etc/passwd\fR, \fB/etc/shadow\fR, \fB/etc/group\fR, and \fB/etc/ftpd/ftpusers\fR files. Users defined with this attribute have entries added to the appropriate files.
+The \fBuser\fR action defines a UNIX user as defined in \fB/etc/passwd\fR, \fB/etc/shadow\fR, \fB/etc/group\fR, and \fB/etc/ftpd/ftpusers\fR files. Entries are added to the appropriate files for users defined with this \fBuser\fR action.
+.sp
+.LP
+The \fBuser\fR action is intended to define a user for a daemon or other software to use. Do not use the \fBuser\fR action to define administrative or interactive accounts.
.sp
.LP
The following attributes are recognized:
@@ -957,7 +969,7 @@
.ad
.sp .6
.RS 4n
-The user's home directory. Default value is /.
+The user's home directory. This directory must be in the system image directories and not under another mount point such as \fB/home\fR. Default value is \fB/\fR.
.RE
.sp
@@ -1073,10 +1085,10 @@
.SH ACTUATORS
.sp
.LP
-In certain contexts, additional operations can be appropriate to execute in preparation for or following the introduction of a particular action. These additional operations are generally needed only on a live system image, and are operating system specific. When multiple actions involved in a package installation or removal have identical actuators, then the operation corresponding to actuator presence is executed once for that installation or removal.
+In certain contexts, additional operations can be appropriate to execute in preparation for or following the introduction of a particular action. These additional operations are operating system specific and are generally needed only on a live system image. A live image is the image mounted at \fB/\fR of the active, running boot environment of the current zone. When multiple actions involved in a package installation or removal have identical actuators, then the operation corresponding to actuator presence is executed once for that installation or removal.
.sp
.LP
-Incorrectly specified actuators can result in package installation failure, if the actuator cannot determine a means of making safe installation progress.
+Incorrectly specified actuators can result in package installation failure if the actuator cannot determine a means of making safe installation progress.
.sp
.LP
The following actuators are defined:
@@ -1385,7 +1397,7 @@
.SH SEE ALSO
.sp
.LP
-\fBpkg\fR(1), \fBpkg\fR(1), \fBpkg\fR(1M), \fBpkg\fR(1M), \fBsvcs\fR(1), \fBsvcadm\fR(1M)
+\fBpkg\fR(1), \fBpkgsend\fR(1), \fBpkg.depotd\fR(1M), \fBpkg.sysrepo\fR(1M), \fBsvcs\fR(1), \fBsvcadm\fR(1M)
.sp
.LP
\fIAdding and Updating Oracle Solaris 11.1 Software Packages\fR
--- a/src/man/pkg.depot-config.1m Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkg.depot-config.1m Wed Mar 06 14:19:07 2013 -0800
@@ -1,35 +1,60 @@
-.\" $ tbl pkglint\-man\-src.txt | \
-.\" neqn /usr/share/lib/pub/eqnchar - | \
-.\" nroff -u0 -Tlp -man - | col -x
-.\"
-.TH pkg.depot-config 1M "21 Nov 2012" "SunOS 5.12" "System Administration Commands"
+'\" te
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkg.depotd-config 1M "14 Feb 2013" "SunOS 5.12" "System Administration Commands"
.SH NAME
-\fBpkg.depot-config\fR \- image packaging system http depot configuration generator
+pkg.depotd-config \- Image Packaging System HTTP depot configuration generator
.SH SYNOPSIS
.LP
.nf
-pkg.depot-config ( -d repository_dir | -S ) -r runtime_dir
- [-c cache_dir] [-s cache_size] [-p port] [-h hostname]
- [-l logs_dir] [-T template_dir] [-A]
- [-t server_type] ( [-F] [-P server_prefix] )
+/usr/lib/pkg.depot-config ( -d \fIrepository_dir\fR | -S )
+ -r \fIruntime_dir\fR [-c \fIcache_dir\fR] [-s \fIcache_size\fR] [-p \fIport\fR]
+ [-h \fIhostname\fR] [-l \fIlogs_dir\fR] [-T \fItemplate_dir\fR]
+ [-A] [-t \fIserver_type\fR] ( [-F] [-P \fIserver_prefix\fR] )
.fi
.SH DESCRIPTION
.sp
.LP
-\fBpkg.depot-config\fR(1) is used to generate the configuration files for the Image Packaging System (IPS) depot-config. pkg.depot-config is called by the svc:/application/pkg/depot:default Service Management Facility (SMF) service. Changes in the configuration should be made to the properties in the SMF service.
+\fBpkg.depotd-config\fR generates the configuration files for the Image Packaging System (IPS) depot. The IPS depot provides scalable read-only access to IPS package repositories over HTTP.
+.sp
+.LP
+The IPS depot is configured using the \fBsvc:/application/pkg/depot\fR Service Management Facility (SMF) service in conjunction with one or more instances of the \fBsvc:/application/pkg/server\fR service.
+.sp
+.LP
+\fBpkg.depot-config\fR generates a configuration for use by the \fBpkg/depot\fR service, or the \fBpkg.depot-config\fR command can be invoked on the command line to generate a standalone configuration.
+.sp
.LP
-The depot-config provides a scalable, read-only depot server for IPS which is accessible over HTTP. A read/write depot server which supports HTTP and HTTPS for individual repositories is provided by pkg.depotd(1M) and instances of the svc:/application/pkg/server SMF service.
+To change depot configuration, modify the properties of the \fBpkg/depot\fR service or the appropriate \fBpkg/server\fR service instance and refresh the instance. Modifying \fBpkg/server\fR service instance states can cause the \fBpkg/depot\fR service to be refreshed and the depot configuration files to be regenerated.
+.sp
.LP
-The depot-config is capable of serving the contents of several pkg(5) repositories provided they have file permissions such that the files and directories in the repositories can be read by the 'pkg5srv' user.
+To serve multiple repositories, you need a separate \fBpkg/server\fR service instance for each repository but only one \fBpkg/depot\fR service instance. Each instance of the \fBpkg/server\fR service provides a read/write depot server that supports HTTP and HTTPS for an individual repository. The \fBpkg/depot:default\fR service instance provides a scalable, read-only depot server that supports HTTP for multiple repositories.
+.sp
+.LP
+Each repository is supported by a \fBpkg/server\fR service instance. A repository might also be supported by the \fBpkg/depot:default\fR service. If the \fBpkg/standalone\fR property of a particular \fBpkg/server\fR instance is set to \fBtrue\fR, then the repository is served by the \fBpkg.depotd\fR process. If the \fBpkg/standalone\fR property of a particular \fBpkg/server\fR instance is set to \fBfalse\fR, then the repository is served by the \fBpkg/depot:default\fR service. Each \fBpkg/server\fR instance either runs \fBpkg.depotd\fR or contributes configuration information to \fBpkg/depot:default\fR.
+.sp
.LP
-The depot can be configured as a standalone web server, with the configuration generated automatically from a set of SMF properties and the Apache web server processes managed by the svc:/application/pkg/depot-config:default service.
+When you enable a \fBpkg/server\fR instance for which the \fBpkg/standalone\fR property set to \fBfalse\fR and the \fBpkg/readonly\fR property set to \fBtrue\fR, the \fBpkg/depot:default\fR configuration is refreshed, and that repository is served by the \fBpkg/depot:default\fR service. When you disable that same \fBpkg/server\fR instance, the \fBpkg/depot:default\fR service is refreshed, and that repository is no longer served by the \fBpkg/depot:default\fR service.
+.sp
.LP
-The depot can also be configured manually by using the -F option to produce a web-server configuration file which can be added to an existing web server. In this case, the depot runs with reduced functionality: pkg(1) search support and the depot browser user interface are not available, however all other functionality required by pkg(5) clients, such as pkg(1) or packagemanager(1) to install and update Solaris 11 systems is available.
+You can configure the depot manually by using the \fBpkg.depot-config\fR command with the \fB-F\fR option. The \fB-F\fR option produces a web server configuration file that can be added to an existing web server. In this case, the depot runs with reduced functionality: \fBpkg\fR(1) search support and the depot browser user interface are not available. All other \fBpkg\fR(1) functionality required to install and update Oracle Solaris 11 systems is available.
+.sp
.LP
-Repositories are made available to the depot server in two ways. The first way is using the -S option, which causes the depot server to query the system for all instances of the svc:/application/pkg/server SMF service which are marked as 'online' and have the SMF properties 'pkg/standalone' set to 'false' and 'pkg/readonly' set to 'true'.
+Use one of the following methods to pass repository paths and configuration to the depot server:
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Use the \fBpkg.depot-config\fR command with the \fB-S\fR option. The \fB-S\fR option causes \fBpkg.depotd\fR to query the system for all instances of the \fBpkg/server\fR service that are marked as \fBonline\fR and have the \fBpkg/standalone\fR property set to \fBfalse\fR and the \fBpkg/readonly\fR property set to \fBtrue\fR.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Use the \fBpkg.depot-config\fR command with the \fB-d\fR option. The \fB-d\fR option provides a path to the \fBpkg\fR(5) repository to use. Multiple \fB-d\fR options are accepted.
+.RE
+.sp
.LP
-The second way repositories can be made available to the depot server is to use the -d option, providing a path to the pkg(5) repository that should be used. Multiple -d options are accepted. The svc:/application/pkg/depot SMF service does not use the -d option.
+Repositories must have file permissions that permit the files and directories in the repositories to be read by the \fBpkg5srv\fR user.
.SH OPTIONS
.sp
.LP
@@ -38,11 +63,11 @@
.ne 2
.mk
.na
-\fB\fB-d\fR \fIprefix=repository_dir\fR\fR
+\fB\fB-d\fR \fIprefix\fR=\fIrepository_dir\fR\fR
.ad
-.RS 21n
-.rt
-Mutually exclusive with the -S option, -d takes an '=' separated pair of values. The first value is used as a prefix into the depot-config web server namespace where this repository can be accessed. The second value is a directory containing the v4 pkg(5) file repository, which is included in the the depot server configuration. Multiple -d options are allowed. At least one -d option is required if the -S option is not used.
+.sp .6
+.RS 4n
+Specify the path to a \fBpkg\fR(5) file repository to use. The \fIprefix\fR is used as a prefix into the \fBdepot-config\fR web server namespace where this repository can be accessed. The \fIrepository_dir\fR is a directory that contains a version 4 \fBpkg\fR(5) file repository, which is included in the depot server configuration. The \fB-d\fR option cannot be used with the \fB-S\fR option. At least one \fB-d\fR option is required if the \fB-S\fR option is not used. Multiple \fB-d\fR options are allowed.
.RE
.sp
@@ -51,9 +76,9 @@
.na
\fB\fB-S\fR\fR
.ad
-.RS 21n
-.rt
-Mutually exclusive with the -d option, -S causes pkg.depotd(1M) to query the system for all online instances of svc:/application/pkg/server that have the properties 'pkg/readonly' set to 'true' and 'pkg/standalone' set to 'false', allowing the depot to run alongside svc:/application/pkg/server instances which do not have these properties set.
+.sp .6
+.RS 4n
+Query the system for repositories to use. The \fB-S\fR option causes \fBpkg.depotd\fR to query the system for all instances of the \fBpkg/server\fR service that are marked as \fBonline\fR and have the \fBpkg/standalone\fR property set to \fBfalse\fR and the \fBpkg/readonly\fR property set to \fBtrue\fR. These property values allow the depot to run concurrently with \fBpkg/server\fR instances that do not have these properties set. See the \fBpkg.depotd\fR(1M) man page for information about \fBpkg.depotd\fR. The \fB-S\fR option cannot be used with the \fB-d\fR option.
.RE
.sp
@@ -62,9 +87,9 @@
.na
\fB\fB-r\fR \fIruntime_dir\fR\fR
.ad
-.RS 21n
-.rt
-The default output directory where configuration files are written. This option is set in the SMF service using the 'config/runtime_dir' property. When using the SMF service, the contents of this directory are recreated during service startup.
+.sp .6
+.RS 4n
+Specify the default output directory for configuration files. This directory can also be specified by setting the \fBconfig/runtime_dir\fR property in the \fBpkg/server\fR service. When the \fBconfig/runtime_dir\fR property is used, the contents of this directory are recreated during service startup.
.RE
.sp
@@ -73,9 +98,9 @@
.na
\fB\fB-c\fR \fIcache_dir\fR\fR
.ad
-.RS 21n
-.rt
-The cache directory where the depot stores its cache. The cache directory is also used to store server-side pkg(5) search indexes if the -A option is also used. This option is set in the SMF service using the 'config/cache_dir' property.
+.sp .6
+.RS 4n
+Specify the directory where the depot stores its cache. If the \fB-A\fR option is also used, the cache directory is also used to store server-side \fBpkg\fR(5) search indexes. This directory can also be specified by setting the \fBconfig/cache_dir\fR property in the \fBpkg/server\fR service.
.RE
.sp
@@ -84,9 +109,9 @@
.na
\fB\fB-s\fR \fIcache_size\fR\fR
.ad
-.RS 21n
-.rt
-An integer value in megabytes that defines the maximum cache size for the depot-config. This setting should be configured using the 'config/cache_max' SMF property. If set to 0, which is the default, no caching is performed by the web server. If all file-repositories being served by the server are local to the server itself (i.e. not accessed over NFS) the default value of 0 is sufficient.
+.sp .6
+.RS 4n
+Specify the maximum cache size for the depot. The \fIcache_size\fR value is an integer number of megabytes. If \fIcache_size\fR is 0, no caching is performed by the web server. The default value of \fIcache_size\fR is 0. If all file repositories served by the depot server are local to the depot server (not accessed over NFS), the default value of 0 is sufficient. This cache size can also be specified by setting the \fBconfig/cache_max\fR property in the \fBpkg/server\fR service.
.RE
.sp
@@ -95,9 +120,9 @@
.na
\fB\fB-p\fR \fIport\fR\fR
.ad
-.RS 21n
-.rt
-The port number that depot will listen to. It defaults to port 80. This option is set in the SMF service using the 'config/port' property.
+.sp .6
+.RS 4n
+Specify the port number that the depot will listen to. The default value of \fIport\fR is 80. This port can also be specified by setting the \fBconfig/port\fR property in the \fBpkg/server\fR service.
.RE
.sp
@@ -106,9 +131,9 @@
.na
\fB\fB-h\fR \fIhostname\fR\fR
.ad
-.RS 21n
-.rt
-The hostname used as the argument to the Apache ServerName directive. It defaults to '0.0.0.0'. This option is set in the SMF service using the 'config/host' property.
+.sp .6
+.RS 4n
+Specify the host name to use as the argument to the Apache \fBServerName\fR directive. The default value of \fIhostname\fR is \fB0.0.0.0\fR. This host name can also be specified by setting the \fBconfig/host\fR property in the \fBpkg/server\fR service.
.RE
.sp
@@ -117,9 +142,9 @@
.na
\fB\fB-l\fR \fIlogs_dir\fR\fR
.ad
-.RS 21n
-.rt
-The log directory used by the depot to store log files. It defaults to '/var/log/pkg/depot'. This option is set in the SMF service using the 'config/log_dir' property.
+.sp .6
+.RS 4n
+Specify the directory where the depot stores log files. The default value of \fIlogs_dir\fR is \fB/var/log/pkg/depot\fR. This directory can also be specified by setting the \fBconfig/log_dir\fR property in the \fBpkg/server\fR service.
.RE
.sp
@@ -128,20 +153,20 @@
.na
\fB\fB-T\fR \fItemplate_dir\fR\fR
.ad
-.RS 21n
-.rt
-The -T option sets the template directory used to build the depot configuration and access additional files needed to run the depot. It defaults to '/etc/pkg/depot' and should not normally need to be changed. This option is set in the SMF service using the 'config/template_dir' property.
+.sp .6
+.RS 4n
+Specify the directory where the depot builds the depot configuration and stores additional files needed to the run the depot. The default value of \fItemplate_dir\fR is \fB/etc/pkg/depot\fR. This directory can also be specified by setting the \fBconfig/template_dir\fR property in the \fBpkg/server\fR service. This directory should not need to be changed.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-A\fR\fR
+\fB\fB-A\fR \fR
.ad
-.RS 21n
-.rt
-Whether the depot should respond to "pkgrepo refresh" operations, allowing any search indices maintained by the depot to be refreshed. This option is set in the SMF service using the 'config/allow_refresh' property. It defaults to the value 'false'. It is recommended to disallow index rebuilding on production servers: the search index will be refreshed automatically when the depot starts.
+.sp .6
+.RS 4n
+Refresh any search indices maintained by the depot when \fBpkgrepo refresh\fR is invoked. By default, search indices maintained by the depot are not refreshed when \fBpkgrepo refresh\fR is invoked. This option can also be specified by setting the \fBconfig/allow_refresh\fR property in the \fBpkg/server\fR service. Best practice is to not use the \fB-A\fR option or the \fBconfig/allow_refresh\fR property to refresh the index on production servers because the search index is refreshed automatically when the depot starts.
.RE
.sp
@@ -150,22 +175,20 @@
.na
\fB\fB-t\fR \fIserver_type\fR\fR
.ad
-.RS 21n
-.rt
-The -t option is intended for forwards-compatibility, allowing pkg.depot-config to potentially output configuration for different web servers in the future. The default value 'apache2' is the only value accepted at present. This option is not yet exposed through the SMF service.
+.sp .6
+.RS 4n
+Specify the type of web server that \fBpkg.depot-config\fR should output configuration information for. In this release, the value \fBapache2\fR is both the default value and the only accepted value for \fIserver_type\fR.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-F\fR\fR
+\fB\fB-F\fR \fR
.ad
-.RS 21n
-.rt
-Whether pkg.depot-config should produce a partial configuration for a web server, allowing that web server to serve basic pkg(5) install operations for clients using an existing web service. In the case of the Apache web server running on Solaris, it could be placed in /etc/apache2/2.2/conf.d - users of other operating systems should consult their OS documentation to determine how to use this file. This option is not exposed using the SMF service, as that service does not control the web server.
-.LP
-As noted in the introduction, some depot operations are not available when using this configuration. The -F option is mutually exclusive with the -p and -A options.
+.sp .6
+.RS 4n
+Produce a partial configuration that enables a web server to serve basic \fBpkg\fR(5) installation operations for clients using an existing web service. For an Apache web server running on the Oracle Solaris OS, the partial configuration file could be placed in \fB/etc/apache2/2.2/conf.d\fR. For other operating systems, consult your OS documentation to determine how to use this partial configuration file. See also the \fB-P\fR option.
.RE
.sp
@@ -174,68 +197,108 @@
.na
\fB\fB-P\fR \fIserver_prefix\fR\fR
.ad
-.RS 21n
-.rt
-The prefix used to map the depot into the web server namespace,
-intended for use with the -F option.
+.sp .6
+.RS 4n
+Specify the prefix used to map the depot into the web server namespace. The \fB-P\fR option is intended to be used with the \fB-F\fR option.
.RE
.SH PROVIDING ADDITIONAL SERVER CONFIGURATION
-
+.sp
+.LP
+When the \fB-F\fR option is not used, and the default \fB-t apache2\fR is set, the \fBsvc:/application/pkg/depot\fR service looks in \fB/etc/pkg/depot/conf.d\fR at startup for additional Apache configuration files that can be used to extend the server configuration. Consult the Apache web server documentation for details on the directives that are used to configure the web server.
+.SH EXAMPLES
.LP
-When the -F option is not used, and the default '-t apache2' is set, the svc:/application/pkg/depot service looks in /etc/pkg/depot/conf.d at startup for additional Apache configuration files which may be used to extend the server configuration. Consult the Apache web server documentation for details on the directives that are used to configure the web server.
-
-.SH EXAMPLES
-
+\fBExample 1 \fRShowing How a Repository Is Served
+.sp
.LP
-Example 1: Running \fBpkg.depot-config\fR
+The system in this example is running multiple instances of \fBsvc:/application/pkg/server\fR and a single instance of \fBsvc:/application/pkg/depot\fR. The \fBpkg/server:standalone\fR instance has an associated \fBpkg.depotd\fR process. The \fBpkg.depotd\fR process serves the repository configured in the \fBpkg/server:standalone\fR service. The \fBpkg/server:userland\fR instance has no associated processes. The \fBpkg/depot:default\fR service serves the repository configured in the \fBpkg/server:userland\fR service.
.sp
.in +2
.nf
-$ \fBpkg.depot-config\fR XXX need more examples here
+$ \fBsvcs pkg/server\fR
+STATE STIME FMRI
+disabled Feb_06 svc:/application/pkg/server:default
+online Feb_03 svc:/application/pkg/server:userland
+online Feb_03 svc:/application/pkg/server:standalone
+$ \fBsvcs pkg/depot\fR
+STATE STIME FMRI
+online Feb_07 svc:/application/pkg/depot:default
+$ \fBsvcprop -p pkg/standalone -p pkg/readonly \e\fR
+\fBpkg/server:standalone\fR
+true
+true
+$ \fBsvcprop -p pkg/standalone -p pkg/readonly \e\fR
+\fBpkg/server:userland\fR
+false
+true
+$ \fBsvcs -p svc:/application/pkg/server:standalone\fR
+STATE STIME FMRI
+online Feb_03 svc:/application/pkg/server:standalone
+ Jan_31 1206 pkg.depotd
+$ \fBsvcs -p svc:/application/pkg/server:userland\fR
+STATE STIME FMRI
+online Feb_03 svc:/application/pkg/server:userland
.fi
+.in -2
+.sp
.LP
-Example 2: More interesting stuff with pkg.depot-config
+\fBExample 2 \fRShowing Processes Associated With the Depot
+.sp
+.LP
+The following command shows \fBhttpd.worker\fR processes associated with the \fBpkg/depot\fR service.
- $ XXX need more examples
-
+.sp
+.in +2
+.nf
+$ \fBsvcs -p pkg/depot\fR
+STATE STIME FMRI
+online 16:59:49 svc:/application/pkg/depot:default
+ 16:59:48 6731 httpd.worker
+ 16:59:48 6736 httpd.worker
+ 16:59:48 6737 httpd.worker
+ 16:59:48 6738 httpd.worker
+ 17:00:05 6744 httpd.worker
+ 17:05:59 6915 httpd.worker
+.fi
+.in -2
+.sp
.SH EXIT STATUS
-
-.SP
+.sp
+.LP
The following exit values are returned:
.sp
-.ne2
+.ne 2
.mk
.na
\fB\fB0\fR\fR
.ad
-.sp .6
-.RS 4n
+.RS 13n
+.rt
Command succeeded.
.RE
.sp
-.ne2
+.ne 2
.mk
.na
\fB\fB1\fR\fR
.ad
-.sp .6
-.RS 4n
+.RS 13n
+.rt
Command failed.
.RE
.sp
-.ne2
+.ne 2
.mk
.na
\fB\fB2\fR\fR
.ad
-.sp .6
-.RS 4n
+.RS 13n
+.rt
Invalid command line options were specified.
.RE
@@ -243,32 +306,28 @@
.sp
.LP
See \fBattributes\fR(5) for descriptions of the following attributes:
-.SS "/usr/lib/pkg.depot-config"
.sp
-.\" Can't seem to get normal box drawing working properly
-.nf
- ____________________________________________________________
- | ATTRIBUTE TYPE | ATTRIBUTE VALUE |
- |_____________________________|_____________________________|
- | Availability | pkg:/package/pkg/depot |
- |_____________________________|_____________________________|
- | Interface Stability | Uncommitted |
- |_____________________________|_____________________________|
-.fi
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availability\fBpackage/pkg/depot\fR
+_
+Interface StabilityUncommitted
+.TE
.SH SEE ALSO
.sp
.LP
-\fBpkg\fR(1), \fBpkg.depotd\fR(1M), \fBpkgsend\fR(1), \fBpkg\fR(5)
-
-.SH NOTES
+\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
-The image packaging system is an under-development feature. Command names, invocation, formats, and operations are all subject to change. Development is hosted in the OpenSolaris community at:
+\fICopying and Creating Oracle Solaris 11.1 Package Repositories\fR
.sp
.LP
-http://hub.opensolaris.org/bin/view/Project+pkg/
-.sp
-.LP
-
+\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
--- a/src/man/pkg.depotd.1m Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkg.depotd.1m Wed Mar 06 14:19:07 2013 -0800
@@ -1,7 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH pkg.depotd 1M "5 Jun 2012" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+.TH pkg.depotd 1M "5 Jun 2012" "SunOS 5.12" "System Administration Commands"
.SH NAME
pkg.depotd \- Image Packaging System depot server
.SH SYNOPSIS
--- a/src/man/pkg.sysrepo.1m Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkg.sysrepo.1m Wed Mar 06 14:19:07 2013 -0800
@@ -1,7 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH pkg.sysrepo 1M "27 May 2012" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+.TH pkg.sysrepo 1M "27 May 2012" "SunOS 5.12" "System Administration Commands"
.SH NAME
pkg.sysrepo \- Image Packaging System system repository configuration
.SH SYNOPSIS
--- a/src/man/pkgdepend.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgdepend.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkgdepend 1 "22 Jun 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkgdepend 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgdepend \- Image Packaging System dependency analyzer
.SH SYNOPSIS
@@ -17,8 +17,9 @@
.LP
.nf
-/usr/bin/pkgdepend resolve [-moSv] [-d \fIoutput_dir\fR]
- [-s \fIsuffix\fR] \fImanifest_file\fR ...
+/usr/bin/pkgdepend resolve [-EmoSv] [-d \fIoutput_dir\fR]
+ [-e \fIexternal_package_file\fR]... [-s \fIsuffix\fR]
+ \fImanifest_file\fR ...
.fi
.SH DESCRIPTION
@@ -225,7 +226,7 @@
.ne 2
.mk
.na
-\fB\fBpkgdepend resolve\fR [\fB-moSv\fR] [\fB-d\fR \fIoutput_dir\fR] [\fB-s\fR \fIsuffix\fR] \fImanifest_file\fR ...\fR
+\fB\fBpkgdepend resolve\fR [\fB-EmoSv\fR] [\fB-d\fR \fIoutput_dir\fR] [\fB-e\fR \fIexternal_package_file\fR]... [\fB-s\fR \fIsuffix\fR] \fImanifest_file\fR ...\fR
.ad
.sp .6
.RS 4n
@@ -234,6 +235,30 @@
.ne 2
.mk
.na
+\fB\fB-e\fR \fIexternal_package_file\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only resolve against packages from the system whose names match a pattern in \fIexternal_package_file\fR. This option can be specified multiple times. The \fB-e\fR option cannot be used with the \fB-S\fR option.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-E\fR\fR
+.ad
+.sp .6
+.RS 4n
+If \fB-e\fR is specified, show the packages that were expected to be external dependencies but were not external dependencies. Packages that were expected to be external dependencies are packages from the system whose names match a pattern in \fIexternal_package_file\fR.
+.sp
+If \fB-e\fR is not specified, show the external dependencies of the resolved packages. External dependencies of the resolved packages are packages not named on the command line that are targets of dependencies in the resolved packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-m\fR\fR
.ad
.sp .6
@@ -356,7 +381,8 @@
.sp
.in +2
.nf
-$ \fBpkgdepend generate -d / -D 'PLATFORM=sun4v' -D 'PLATFORM=sun4u' foo\fR
+$ \fBpkgdepend generate -d / -D 'PLATFORM=sun4v' \e\fR
+\fB-D 'PLATFORM=sun4u' foo\fR
.fi
.in -2
.sp
--- a/src/man/pkgdiff.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgdiff.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgdiff 1 "20 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgdiff 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgdiff \- compare package manifests
.SH SYNOPSIS
@@ -8,14 +8,13 @@
.nf
/usr/bin/pkgdiff [-i \fIattribute\fR]... [-o \fIattribute\fR]
[-t \fIaction_name\fR[,\fIaction_name\fR]...]...
- [-v \fIname\fR=\fIvalue\fR]...
- \fI(file1 | -)\fR \fI(file2 | -)\fR
+ [-v \fIname\fR=\fIvalue\fR]... (\fIfile1\fR | -) (\fIfile2\fR | -)
.fi
.SH DESCRIPTION
.sp
.LP
-\fBpkgdiff\fR compares two package manifests and reports differences. \fBpkgdiff\fR sorts each manifest and action into a consistent order before comparison. One of the manifests can be read from stdin by specifying \fI-\fR in place of the filename.
+\fBpkgdiff\fR compares two package manifests and reports differences. One of the manifests can be read from \fBstdin\fR by specifying \fB-\fR in place of the file name. \fBpkgdiff\fR sorts each manifest and action into a consistent order before comparison.
.sp
.LP
Output is in the following form:
@@ -96,7 +95,7 @@
.ad
.sp .6
.RS 4n
-Ignore \fIattribute\fR if present during comparisons. File hash values can be ignored with \fB-i\fR \fIhash\fR. This option cannot be used with the \fB-o\fR option. This option can be repeated.
+Ignore \fIattribute\fR if present during comparisons. File hash values can be ignored with \fB-i\fR \fIhash\fR. This option cannot be used with the \fB-o\fR option. This option can be specified multiple times.
.RE
.sp
@@ -114,11 +113,11 @@
.ne 2
.mk
.na
-\fB\fB-t\fR \fIaction_name\fR\fR
+\fB\fB-t\fR \fIaction_name\fR[,\fIaction_name\fR]...\fR
.ad
.sp .6
.RS 4n
-Only compare the specified actions. Multiple actions can be specified in a comma-separated list. The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page, such as \fBfile\fR, \fBdir\fR, \fBdriver\fR, \fBdepend\fR, and \fBset\fR. This option can be specified multiple times.
+Only compare the specified actions. Multiple actions can be specified in a comma-separated list. The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page. For example, the following values could be specified for \fIaction_name\fR: \fBfile\fR, \fBdir\fR, \fBdriver\fR, \fBdepend\fR, \fBset\fR. This option can be specified multiple times.
.RE
.sp
@@ -129,7 +128,7 @@
.ad
.sp .6
.RS 4n
-Only compute differences for this variant value. For example, only compute differences for \fBarch=sparc\fR. This variant tag is removed for all actions before comparison. Only one value can be specified per variant. This option can be repeated for different variants.
+Only compute differences for this variant value. For example, only compute differences for \fBarch=sparc\fR. This variant tag is removed for all actions before comparison. Only one value can be specified per variant. This option can be specified multiple times for different variants.
.RE
.SH EXIT STATUS
--- a/src/man/pkgmerge.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgmerge.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,13 +1,13 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkgmerge 1 "15 Oct 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkgmerge 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgmerge \- Image Packaging System package merging utility
.SH SYNOPSIS
.LP
.nf
/usr/bin/pkgmerge [-n] -d \fIdest_repo\fR
- [-p \fIpublisher_prefix\fR ...]
+ [-p \fIpublisher_prefix\fR]...
-s \fIvariant\fR=\fIvalue\fR[,...],\fIsrc_repo\fR ...
[\fIpkg_fmri_pattern\fR ...]
.fi
--- a/src/man/pkgmogrify.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgmogrify.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,13 +1,13 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkgmogrify 1 "4 Jun 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkgmogrify 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgmogrify \- Image Packaging System manifest transmogrifier
.SH SYNOPSIS
.LP
.nf
-/usr/bin/pkgmogrify [-vi] [-I \fIincludedir\fR ...]
- [-D \fImacro\fR=\fIvalue\fR ...] [-O \fIoutputfile\fR]
+/usr/bin/pkgmogrify [-vi] [-I \fIincludedir\fR]...
+ [-D \fImacro\fR=\fIvalue\fR]... [-O \fIoutputfile\fR]
[-P \fIprintfile\fR] [\fIinputfile\fR ...]
.fi
@@ -63,7 +63,7 @@
.ad
.sp .6
.RS 4n
-Define \fImacro\fR as a macro, with the value \fIvalue\fR. Macros appear in the input file as \fB$(macro)\fR. Substitution is repeated until no more translations are found. Common idioms include:
+Define \fImacro\fR as a macro, with the value \fIvalue\fR. This option can be specified multiple times. Macros appear in the input file as \fB$(macro)\fR. Substitution is repeated until no more translations are found. Common idioms include:
.RS +4
.TP
.ie t \(bu
@@ -102,7 +102,7 @@
.ad
.sp .6
.RS 4n
-Add the specified directory to the search path for both files specified on the command line and embedded include directives.
+Add the specified directory to the search path, both for files specified on the command line and for embedded include directives. This option can be specified multiple times.
.RE
.sp
--- a/src/man/pkgrecv.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgrecv.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgrecv 1 "12 Oct 2012" "SunOS 5.12" "User Commands"
+.TH pkgrecv 1 "4 Mar 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgrecv \- Image Packaging System content retrieval utility
.SH SYNOPSIS
@@ -8,8 +8,9 @@
.nf
/usr/bin/pkgrecv [-s \fIsrc_uri\fR] [-a] [-d (\fIpath\fR|\fIdest_uri\fR)]
[-c \fIcache_dir\fR] [-kr] [-m \fImatch\fR] [-n] [--raw]
- [--key \fIsrc_key\fR --cert \fIsrc_cert\fR] [--dkey \fIdest_key\fR
- --dcert \fIdest_cert\fR] (\fIfmri\fR|\fIpattern\fR) ...
+ [--key \fIsrc_key\fR --cert \fIsrc_cert\fR]
+ [--dkey \fIdest_key\fR --dcert \fIdest_cert\fR]
+ (\fIfmri\fR|\fIpattern\fR) ...
.fi
.LP
@@ -20,7 +21,16 @@
.SH DESCRIPTION
.sp
.LP
-\fBpkgrecv\fR retrieves packages from a \fBpkg\fR(5) repository or package archive and republishes the retrieved packages to a different package repository or package archive. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR, \fBpkg.depotd\fR, and package publication tools.
+\fBpkgrecv\fR retrieves all versions of each matching \fIfmri\fR or \fIpattern\fR from the \fIsrc_uri\fR \fBpkg\fR(5) repository or package archive and republishes the retrieved packages to the \fIdest_uri\fR package repository or package archive. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR, \fBpkg.depotd\fR, and package publication tools.
+.sp
+.LP
+Packages that have not changed are not republished. Therefore, the time to update an existing repository depends on the number of new and changed packages.
+.sp
+.LP
+Use the \fB-m\fR option to specify whether to retrieve all versions of each matching package, or only the newest version of each matching package.
+.sp
+.LP
+If you do not specify \fB\&'*'\fR to be retrieved, you might want to specify the \fB-r\fR option to be sure to retrieve all the dependencies of the specified packages.
.LP
Note -
.sp
@@ -75,7 +85,7 @@
.ad
.sp .6
.RS 4n
-Specify the file system path or URI of the target to republish packages to. If \fB-a\fR is specified, the target is a new package archive that cannot already exist. Otherwise, the target must be a package repository that already exists. New repositories can be created using the \fBpkgrepo\fR command. If \fB-d\fR is not specified, the value of \fBPKG_DEST\fR is used. See "Environment Variables" below.
+Specify the file system path or URI where the retrieved packages should be republished. If \fB-a\fR is specified, this destination is a new package archive that cannot already exist. If \fB-a\fR is not specified, this destination must be a package repository that already exists. Use the \fBpkgrepo\fR command to create a new package repository. If \fB-d\fR is not specified, the value of \fBPKG_DEST\fR is used. See "Environment Variables" below.
.RE
.sp
@@ -97,16 +107,26 @@
.ad
.sp .6
.RS 4n
-Control matching behavior using the following values:
+Control which versions of packages are retrieved if \fIpattern\fR is specified or if \fIfmri\fR is not fully specified. For this description, the following four example packages exist in the source specified by the \fB-s\fR option. In these FMRI, the characters between the \fB@\fR and the \fB:\fR denote the numbered package version, and the characters from the \fB:\fR to the end denote the timestamp portion of the version string.
+.sp
+.in +2
+.nf
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.24.0:20120904T180335Z
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.24.0:20120903T170234Z
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.23.0:20120820T165108Z
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.23.0:20120819T155007Z
+.fi
+.in -2
+
.sp
.ne 2
.mk
.na
-\fB\fBall-timestamps (default)\fR\fR
+\fB\fBall-timestamps\fR\fR
.ad
.sp .6
.RS 4n
-Includes all matching timestamps (implies \fBall-versions\fR).
+Retrieve all versions of each matching \fIfmri\fR or \fIpattern\fR (implies \fBall-versions\fR). This is the default behavior if the \fB-m\fR option is not specified. In the example above, all four packages are retrieved.
.RE
.sp
@@ -117,7 +137,15 @@
.ad
.sp .6
.RS 4n
-Includes all matching versions.
+Retrieve the latest timestamp for each version of each matching \fIfmri\fR or \fIpattern\fR. In the example above, the following two packages are retrieved:
+.sp
+.in +2
+.nf
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.24.0:20120904T180335Z
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.23.0:20120820T165108Z
+.fi
+.in -2
+
.RE
.sp
@@ -128,7 +156,14 @@
.ad
.sp .6
.RS 4n
-Includes only the latest version of each package.
+Retrieve only the newest version of each matching \fIfmri\fR or \fIpattern\fR. In the example above, only the following package is retrieved:
+.sp
+.in +2
+.nf
+pkg://solaris/package/[email protected],5.11-0.175.1.0.0.24.0:20120904T180335Z
+.fi
+.in -2
+
.RE
.RE
@@ -152,7 +187,7 @@
.ad
.sp .6
.RS 4n
-Recursively retrieve all dependencies for the provided list of packages.
+Recursively retrieve all dependencies for each matching \fIfmri\fR or \fIpattern\fR.
.RE
.sp
@@ -163,7 +198,18 @@
.ad
.sp .6
.RS 4n
-Specify a URI representing the location of a \fBpkg\fR(5) repository or package archive from which to receive package data. If \fB-s\fR is not specified, the value of \fBPKG_SRC\fR is used. See "Environment Variables" below.
+Specify a URI that represents the location of a \fBpkg\fR(5) repository or package archive from which to receive package data. If \fB-s\fR is not specified, the value of \fBPKG_SRC\fR is used. See "Environment Variables" below.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--key\fR \fIsrc_key\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify a client SSL key file to use for package retrieval from the source HTTPS repository.
.RE
.sp
@@ -174,18 +220,18 @@
.ad
.sp .6
.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
+Specify a client SSL certificate file to use for package retrieval from the source HTTPS repository.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB--key\fR \fIsrc_key\fR\fR
+\fB\fB--dkey\fR \fIdest_key\fR\fR
.ad
.sp .6
.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
+Specify a client SSL key file to use for package publication to the destination HTTPS repository.
.RE
.sp
@@ -196,18 +242,7 @@
.ad
.sp .6
.RS 4n
-Specify a client SSL certificate file to use for package publication to an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--dkey\fR \fIdest_key\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL key file to use for package publication to an HTTPS repository.
+Specify a client SSL certificate file to use for package publication to the destination HTTPS repository.
.RE
.sp
@@ -218,7 +253,7 @@
.ad
.sp .6
.RS 4n
-List the most recent versions of the packages available from the specified repository and exit. All other options except \fB-s\fR are ignored.
+List the most recent versions of the packages available from the repository specified by the \fB-s\fR option. All other options are ignored.
.RE
.sp
@@ -229,23 +264,7 @@
.ad
.sp .6
.RS 4n
-Retrieve and store the raw package data in a set of directory structures by stem and version at the location specified by \fB-d\fR. This option can be used only with file system based destinations. This package data can be used to conveniently modify and republish packages, perhaps by correcting file contents or providing additional package metadata. This option cannot be combined with \fB-a\fR.
-.RE
-
-.SH OPERANDS
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fIfmri\fR|\fIpattern\fR\fR\fR
-.ad
-.sp .6
-.RS 4n
-If \fB\&'*'\fR is specified for \fIpattern\fR, and if the \fB-d\fR argument does not contain any packages published by \fIsrc_uri\fR publishers, the newest versions of all packages in the \fIsrc_uri\fR, and any other dependencies of those packages, are retrieved.
-.sp
-If \fB\&'*'\fR is specified for \fIpattern\fR, and if the \fB-d\fR argument already contains packages published by one or more \fIsrc_uri\fR publishers, only new and changed packages from those publishers in the \fIsrc_uri\fR are retrieved.
-.sp
-If \fB\fIfmri\fR|\fIpattern\fR\fR is not \fB\&'*'\fR, then the specified packages are retrieved. You might want to specify the \fB-r\fR option to be sure to retrieve all the dependencies of the specified packages.
+Retrieve and store the raw package data in a set of directory structures by stem and version at the location specified by \fB-d\fR. The \fB--raw\fR option can be used only with file system based destinations. This package data can be used to conveniently modify and republish packages, perhaps by correcting file contents or providing additional package metadata. The \fB--raw\fR option cannot be combined with \fB-a\fR.
.RE
.SH EXAMPLES
@@ -303,15 +322,15 @@
.sp
.LP
-\fBExample 4 \fRRetrieve All Versions
+\fBExample 4 \fRRetrieve Only the Latest Version
.sp
.LP
-Receive all versions of the package \fBeditor/vim\fR from the system named \fBtest\fR.
+Receive only the latest version of the package \fBeditor/vim\fR from the system named \fBtest\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -d /local/repo -m all-versions \e\fR
+$ \fBpkgrecv -s http://test -d /local/repo -m latest \e\fR
\fBeditor/vim\fR
Processing packages for publisher solaris ...
Retrieving and evaluating 2 package(s)...
--- a/src/man/pkgrepo.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgrepo.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgrepo 1 "22 Jun 2012" "SunOS 5.12" "User Commands"
+.TH pkgrepo 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgrepo \- Image Packaging System repository management utility
.SH SYNOPSIS
@@ -11,63 +11,76 @@
.LP
.nf
-/usr/bin/pkgrepo add-publisher -s \fIrepo_uri_or_path\fR \fIpublisher\fR ...
+/usr/bin/pkgrepo add-publisher -s \fIrepo_uri_or_path\fR
+ \fIpublisher\fR ...
.fi
.LP
.nf
-/usr/bin/pkgrepo get [-F \fIformat\fR] [-H] [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgrepo get [-F \fIformat\fR] [-H] [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
[\fIsection/property\fR ...]
.fi
.LP
.nf
-/usr/bin/pkgrepo info [-F \fIformat\fR] [-H] [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgrepo info [-F \fIformat\fR] [-H] [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
.fi
.LP
.nf
-/usr/bin/pkgrepo list [-F \fIformat\fR] [-H] [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgrepo list [-F \fIformat\fR] [-H] [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
[\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
-/usr/bin/pkgrepo rebuild [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgrepo rebuild [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
[--no-catalog] [--no-index]
.fi
.LP
.nf
-/usr/bin/pkgrepo refresh [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgrepo refresh [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
[--no-catalog] [--no-index]
.fi
.LP
.nf
-/usr/bin/pkgrepo remove [-n] [-p \fIpublisher\fR ...]
+/usr/bin/pkgrepo remove [-n] [-p \fIpublisher\fR]...
-s \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...
.fi
.LP
.nf
-/usr/bin/pkgrepo set [-p \fIpublisher\fR] -s \fIrepo_uri_or_path\fR
- \fIsection/property\fR=[\fIvalue\fR]
+/usr/bin/pkgrepo set [-p \fIpublisher\fR]... -s \fIrepo_uri_or_path\fR
+ \fIsection/property\fR=[\fIvalue\fR] ...
.fi
.LP
.nf
-/usr/bin/pkgrepo set [-p \fIpublisher\fR] -s \fIrepo_uri_or_path\fR
+/usr/bin/pkgrepo set [-p \fIpublisher\fR]... -s \fIrepo_uri_or_path\fR
\fIsection/property\fR=([\fIvalue\fR]) ...
.fi
.LP
.nf
+/usr/bin/pkgrepo verify [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR
+.fi
+
+.LP
+.nf
+/usr/bin/pkgrepo fix [-v] [-p \fIpublisher\fR]...
+ -s \fIrepo_uri_or_path\fR
+.fi
+
+.LP
+.nf
/usr/bin/pkgrepo help
.fi
@@ -160,13 +173,24 @@
Add the specified publishers to the repository. The new publishers have no packages or content.
.sp
This subcommand can be used only with version 4 file system based repositories.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Operate on the repository located at the given URI or file system path.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fB\fBpkgrepo get\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...] [\fIsection/property\fR ...]\fR
+\fB\fBpkgrepo get\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fIsection/property\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -231,22 +255,11 @@
.ne 2
.mk
.na
-\fB\fB--key\fR \fIssl_key\fR\fR
+\fB\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR\fR
.ad
.sp .6
.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
+Use the \fB--key\fR option to specify a client SSL key file to use for package retrieval from an HTTPS repository. Use the \fB--cert\fR option to specify a client SSL certificate file to use for package retrieval from an HTTPS repository. This option pair can be specified multiple times.
.RE
.sp
@@ -266,7 +279,7 @@
.ne 2
.mk
.na
-\fB\fBpkgrepo info\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...]\fR
+\fB\fBpkgrepo info\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]...\fR
.ad
.sp .6
.RS 4n
@@ -275,28 +288,6 @@
.ne 2
.mk
.na
-\fB\fB-F\fR \fIformat\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify an alternative output format. The value of \fIformat\fR can be \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), or \fBjson-formatted\fR (JavaScript Object Notation, formatted for readability).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-H\fR\fR
-.ad
-.sp .6
-.RS 4n
-Omit the headers from the listing.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
\fB\fB-p\fR \fIpublisher\fR\fR
.ad
.sp .6
@@ -304,46 +295,14 @@
Only display the data for the given publisher. If not provided, the data for all publishers is displayed. This option can be specified multiple times.
.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
-.ad
-.sp .6
-.RS 4n
-Operate on the repository located at the given URI or file system path.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--key\fR \fIssl_key\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
+For descriptions of all other options, see the \fBpkgrepo get\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBpkgrepo list\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkgrepo list\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -354,28 +313,6 @@
.ne 2
.mk
.na
-\fB\fB-F\fR \fIformat\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify an alternative output format. The value of \fIformat\fR can be \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), or \fBjson-formatted\fR (JavaScript Object Notation, formatted for readability).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-H\fR\fR
-.ad
-.sp .6
-.RS 4n
-Omit the headers from the listing.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
\fB\fB-p\fR \fIpublisher\fR\fR
.ad
.sp .6
@@ -383,50 +320,18 @@
Only display the packages for the given publisher. If not provided, the packages for all publishers are displayed. This option can be specified multiple times.
.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
-.ad
-.sp .6
-.RS 4n
-Operate on the repository located at the given URI or file system path.
+For descriptions of all other options, see the \fBpkgrepo get\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB--key\fR \fIssl_key\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
+\fB\fBpkgrepo rebuild\fR [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
.ad
.sp .6
.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBpkgrepo rebuild\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...] [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Discard all catalog, search, and other cached information found in the repository, and then recreates it based on the current contents of the repository.
+Discard all catalog, search, and other cached information found in the repository, and then recreate it based on the current contents of the repository.
.sp
.ne 2
.mk
@@ -442,39 +347,6 @@
.ne 2
.mk
.na
-\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
-.ad
-.sp .6
-.RS 4n
-Operate on the repository located at the given URI or file system path.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--key\fR \fIssl_key\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
\fB\fB--no-catalog\fR\fR
.ad
.sp .6
@@ -493,17 +365,18 @@
Do not rebuild search indexes.
.RE
+For descriptions of all other options, see the \fBpkgrepo get\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fB\fBpkgrepo refresh\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...] [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
+\fB\fBpkgrepo refresh\fR [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
.ad
.sp .6
.RS 4n
-Catalog any new packages found in the repository and updates all search indexes. This is intended for use with deferred publication (\fB--no-catalog\fR or \fB--no-index\fR options of \fBpkgsend\fR).
+Catalog any new packages found in the repository and update all search indexes. This is intended for use with deferred publication (\fB--no-catalog\fR or \fB--no-index\fR options of \fBpkgsend\fR).
.sp
.ne 2
.mk
@@ -519,39 +392,6 @@
.ne 2
.mk
.na
-\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
-.ad
-.sp .6
-.RS 4n
-Operate on the repository located at the given URI or file system path.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--key\fR \fIssl_key\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
\fB\fB--no-catalog\fR\fR
.ad
.sp .6
@@ -570,13 +410,14 @@
Do not update search indexes.
.RE
+For descriptions of all other options, see the \fBpkgrepo get\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fB\fBpkgrepo remove\fR [\fB-n\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...\fR
+\fB\fBpkgrepo remove\fR [\fB-n\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...\fR
.ad
.sp .6
.RS 4n
@@ -637,7 +478,7 @@
.ad
.br
.na
-\fB\fBset\fR [\fB-p\fR \fIpublisher\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIsection/property\fR=([\fIvalue\fR]) ...\fR
+\fB\fBpkgrepo set\fR [\fB-p\fR \fIpublisher\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIsection/property\fR=([\fIvalue\fR]) ...\fR
.ad
.sp .6
.RS 4n
@@ -707,8 +548,8 @@
.na
\fB\fBpublisher/prefix\fR\fR
.ad
-.RS 20n
-.rt
+.sp .6
+.RS 4n
A string that represents the name of the default publisher. The first character must be a-z, A-Z, or 0-9. The remainder of the string can only contain the characters 0-9, -, ., a-z, and A-Z. This value indicates the publisher that should be used when more than one publisher's packages are present, or when packages are published to the repository and a publisher is not specified.
.RE
@@ -728,6 +569,17 @@
.ne 2
.mk
.na
+\fB\fBrepository/check-certificate-revocation\fR\fR
+.ad
+.sp .6
+.RS 4n
+A boolean to check whether a certificate has been revoked. When this property is set to \fBTrue\fR, the \fBpkgrepo verify\fR and \fBpkgrepo fix\fR commands attempt to contact any CRL distribution points in the certificates used for signature verification to determine whether the certificate has been revoked since being issued. The default value is \fBFalse\fR. This property is only used by the \fBverify\fR and \fBfix\fR subcommands to validate the contents of the repository. This property does not affect client settings. This value should be the same as the corresponding \fBpkg\fR(1) property value.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fBrepository/collection_type\fR\fR
.ad
.sp .6
@@ -838,6 +690,28 @@
A list of locations (URIs) of repositories that contain packages that users might be interested in.
.RE
+.sp
+.ne 2
+.mk
+.na
+\fB\fBrepository/signature-required-names\fR\fR
+.ad
+.sp .6
+.RS 4n
+A list of names that must be seen as common names of certificates while validating the signatures of a package. This property is only used by the \fBverify\fR and \fBfix\fR subcommands to validate the contents of the repository. This property does not affect client settings. These values should be the same as the corresponding \fBpkg\fR(1) property values.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBrepository/trust-anchor-directory\fR\fR
+.ad
+.sp .6
+.RS 4n
+The absolute path name of the directory that contains the trust anchors for packages in this repository. If not specified, \fB/etc/certs/CA/\fR is used. This property is only used by the \fBverify\fR and \fBfix\fR subcommands to validate the contents of the repository. This property does not affect client settings. This value should be the same as the corresponding \fBpkg\fR(1) property value.
+.RE
+
Properties not documented here, but listed in the output of the \fBget\fR subcommand, are reserved for internal use and should not be set.
.RE
@@ -845,6 +719,124 @@
.ne 2
.mk
.na
+\fB\fBpkgrepo verify\fR [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Verify that the following attributes of the package repository contents are correct:
+.RS +4
+.TP
+.ie t \(bu
+.el o
+File checksums
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+File permissions
+.sp
+The path leading to the repository is also checked to ensure that the \fBpkg5srv\fR user can read the repository contents. This check can be necessary for repositories that are made available using the \fBsvc:/application/pkg/server\fR service, or using the \fBsvc:/application/pkg/system-repository\fR service when the system has non-global zones.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Package manifest permissions
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Package manifest content
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Package signatures
+.sp
+Package manifest signatures are calculated based on the values of the \fBrepository/signature-required-names\fR, \fBrepository/trust-anchor-directory\fR, and \fBrepository/check-certificate-revocation\fR properties.
+.RE
+Errors are emitted to \fBstdout\fR. The \fBpkgrepo\fR command exits with a non-zero return code if any errors are emitted.
+.sp
+This subcommand can be used only with version 4 file system based repositories.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform the operation only for the specified publisher. If no publisher is specified, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Operate on the repository located at the given URI or file system path.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo fix\fR [\fB-v\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Fix the contents of a repository by first verifying the repository, and then moving any invalid repository contents into a quarantine directory within the repository.
+.sp
+If repository errors are found, a repository rebuild is automatically performed. If any errors are found, a message is emitted to \fBstdout\fR showing which packages must be re-imported using \fBpkgsend\fR(1) or \fBpkgrecv\fR(1) in order to restore the repository contents.
+.sp
+This subcommand can be used only with version 4 file system based repositories.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Include output detailing the errors found during repository verification.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform the operation only for the specified publisher. If no publisher is specified, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Operate on the repository located at the given URI or file system path.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fBpkgrepo help\fR\fR
.ad
.sp .6
--- a/src/man/pkgsend.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pkgsend.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgsend 1 "12 Oct 2012" "SunOS 5.12" "User Commands"
+.TH pkgsend 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgsend \- Image Packaging System publication client
.SH SYNOPSIS
@@ -17,8 +17,8 @@
.LP
.nf
-/usr/bin/pkgsend publish [-b \fIbundle\fR ...] [-d \fIsource\fR ...]
- [-s \fIrepo_uri_or_path\fR] [--key \fIssl_key\fR ... --cert \fIssl_cert\fR ...]
+/usr/bin/pkgsend publish [-b \fIbundle\fR]... [-d \fIsource\fR]...
+ [-s \fIrepo_uri_or_path\fR] [--key \fIssl_key\fR --cert \fIssl_cert\fR]...
[-T \fIpattern\fR] [--no-catalog] [\fImanifest\fR ...]
.fi
@@ -146,7 +146,7 @@
.ne 2
.mk
.na
-\fB\fBpkgsend publish\fR [\fB-b\fR \fIbundle\fR ...] [\fB-d\fR \fIsource\fR ...] [\fB-s\fR \fIrepo_uri_or_path\fR] [\fB--key\fR \fIssl_key\fR ... \fB--cert\fR \fIssl_cert\fR ...] [\fB-T\fR \fIpattern\fR] [\fB--no-catalog\fR] [\fImanifest\fR ...]\fR
+\fB\fBpkgsend publish\fR [\fB-b\fR \fIbundle\fR]... [\fB-d\fR \fIsource\fR]... [\fB-s\fR \fIrepo_uri_or_path\fR] [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fB-T\fR \fIpattern\fR] [\fB--no-catalog\fR] [\fImanifest\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -190,22 +190,11 @@
.ne 2
.mk
.na
-\fB\fB--key\fR \fIssl_key\fR\fR
+\fB\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR\fR
.ad
.sp .6
.RS 4n
-Specify a client SSL key file to use for package retrieval from an HTTPS repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--cert\fR \fIssl_cert\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
+Use the \fB--key\fR option to specify a client SSL key file to use for package retrieval from an HTTPS repository. Use the \fB--cert\fR option to specify a client SSL certificate file to use for package retrieval from an HTTPS repository. This option pair can be specified multiple times.
.RE
.sp
--- a/src/man/pm-updatemanager.1 Wed Mar 06 10:22:53 2013 +1300
+++ b/src/man/pm-updatemanager.1 Wed Mar 06 14:19:07 2013 -0800
@@ -1,7 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH pm-updatemanager 1 "27 May 2012" "SunOS 5.11" "User Commands"
+.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+.TH pm-updatemanager 1 "27 May 2012" "SunOS 5.12" "User Commands"
.SH NAME
pm-updatemanager \- application to update packages
.SH SYNOPSIS