diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-03-03 12:55:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-03-03 12:55:38 +0000 |
| commit | 5b8f01f7f38e87da6e444f0ad5153fbbde37b2bf (patch) | |
| tree | b2c2f525279fe89a2726a4ce73cfd209a6a85b6a /usr/src | |
| parent | 06d1e7661005d12cf7399b888c48eac172822eb2 (diff) | |
| parent | de81e3c02f90476edcef2354e33aa3ee65bb331c (diff) | |
| download | illumos-joyent-5b8f01f7f38e87da6e444f0ad5153fbbde37b2bf.tar.gz | |
[illumos-gate merge]
commit de81e3c02f90476edcef2354e33aa3ee65bb331c
3842 remove the machid commands (fix packaging)
commit 5f4bac2809e6bb7e9c779a047a0d4438669d85d6
5609 port mod_ipp to Apache 2.2 (fix apr include)
commit ba5fdd2d4d97ae03a892c1bd5557eafb030984d1
5558 pargs is missing -l option in usage
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/ptools/pargs/pargs.c | 6 | ||||
| -rw-r--r-- | usr/src/lib/print/mod_ipp/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/SUNWcs.mf | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/ptools/pargs/pargs.c b/usr/src/cmd/ptools/pargs/pargs.c index 2e00c92f67..c65dff56f1 100644 --- a/usr/src/cmd/ptools/pargs/pargs.c +++ b/usr/src/cmd/ptools/pargs/pargs.c @@ -1334,15 +1334,15 @@ main(int argc, char *argv[]) if (errflg || argc <= 0) { (void) fprintf(stderr, - "usage: %s [-acexF] { pid | core } ...\n" + "usage: %s [-aceFlx] { pid | core } ...\n" " (show process arguments and environment)\n" " -a: show process arguments (default)\n" " -c: interpret characters as 7-bit ascii regardless of " "locale\n" " -e: show environment variables\n" + " -F: force grabbing of the target process\n" " -l: display arguments as command line\n" - " -x: show aux vector entries\n" - " -F: force grabbing of the target process\n", command); + " -x: show aux vector entries\n", command); return (2); } diff --git a/usr/src/lib/print/mod_ipp/Makefile b/usr/src/lib/print/mod_ipp/Makefile index 395c75e0e3..f428980abe 100644 --- a/usr/src/lib/print/mod_ipp/Makefile +++ b/usr/src/lib/print/mod_ipp/Makefile @@ -34,10 +34,10 @@ include ../../Makefile.rootfs # These *BASE paths are used ONLY at build time to locate headers. # This builds against Apache 2.2 but the module should work with -# any Apache 2.x version +# any Apache 2.x version, and APR 1.3 or later. APACHEBASE = /usr/apache2/2.2 -APR_BASE = /usr/apr -APRUBASE = /usr/apr-util +APR_BASE = /usr/apr/1.3 +APRUBASE = /usr/apr-util/1.3 IPPCONFDIR = $(ROOT)/etc/lp/ipp IPPLIBDIR = $(ROOT)/usr/lib/lp/ipp diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index 5e9d75c374..f0790ea889 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -399,7 +399,7 @@ file path=etc/nsswitch.files group=sys file path=etc/nsswitch.ldap group=sys file path=etc/pam.conf group=sys preserve=true file path=etc/passwd group=sys preserve=true -file path=etc/profile group=sys preserve=true +file path=etc/profile group=sys preserve=renamenew file path=etc/project group=sys preserve=true file path=etc/rc2.d/README group=sys file path=etc/rc3.d/README group=sys |