diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-04-04 11:10:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-04-04 11:10:31 +0000 |
| commit | 6c616601bf7954d849bd0b1ae08fd418aac6e5b1 (patch) | |
| tree | 25607cdf0c3a8f22c6ead87367138133cb61dc6c | |
| parent | 63314e809a4ae4f2db49dab4dcb75b73c42aa18c (diff) | |
| parent | cd277642e0bdc71a7f57c550df1279b0c091d6e2 (diff) | |
| download | illumos-joyent-6c616601bf7954d849bd0b1ae08fd418aac6e5b1.tar.gz | |
[illumos-gate merge]
commit cd277642e0bdc71a7f57c550df1279b0c091d6e2
5157 remove ELFSIGN leftovers from nightly
commit b70272d37d9c1cb9110d939bb3a13e3c12081de5
8016 cron(1M): Strange sentence in the man page
commit cc08f3e31de29ec88623d4c286b27de1dd708b72
7978 Some unreferenced man pages are in the gate
commit 4f9d8ec0de8c8724941a1c13a5adf4c710d6442c
4412 character handling functions should return 0 for argument range 128-255 in UTF-8 locales
Conflicts:
usr/src/tools/scripts/nightly.sh
usr/src/tools/Makefile
39 files changed, 76 insertions, 1686 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging index 54c545ecd4..069ea5f367 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -927,8 +927,6 @@ usr/lib/sparcv9/llib-lvrrpadm.ln sparc # # This is only used during the -t tools build # -opt/onbld/bin/i386/elfsign i386 -opt/onbld/bin/sparc/elfsign sparc opt/onbld/bin/i386/mandoc i386 opt/onbld/bin/sparc/mandoc sparc @@ -18604,6 +18604,7 @@ f usr/share/man/man5/lx.5 0444 root bin f usr/share/man/man5/man.5 0444 root bin f usr/share/man/man5/mandoc_char.5 0444 root bin f usr/share/man/man5/mandoc_roff.5 0444 root bin +f usr/share/man/man5/mansun.5 0444 root bin f usr/share/man/man5/mdoc.5 0444 root bin f usr/share/man/man5/me.5 0444 root bin f usr/share/man/man5/mech_spnego.5 0444 root bin diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 3539119ff7..b85145a0c3 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -187,7 +187,6 @@ TOUCH= /usr/bin/touch WC= /usr/bin/wc XARGS= /usr/bin/xargs ELFEDIT= /usr/bin/elfedit -ELFSIGN= /usr/bin/elfsign DTRACE= /usr/sbin/dtrace -xnolibs UNIQ= /usr/bin/uniq TAR= /usr/bin/tar @@ -934,10 +933,6 @@ $(__GNUC)CTFMERGE= $(ONBLD_TOOLS)/bin/$(MACH)/ctfmerge-altexec CTFCONVERT_O = $(CTFCONVERT) $(CTFCVTFLAGS) $@ -ELFSIGN_O= $(TRUE) -ELFSIGN_CRYPTO= $(ELFSIGN_O) -ELFSIGN_OBJECT= $(ELFSIGN_O) - # Rules (normally from make.rules) and macros which are used for post # processing files. Normally, these do stripping of the comment section # automatically. diff --git a/usr/src/lib/libc/port/locale/isdigit.c b/usr/src/lib/libc/port/locale/isdigit.c index c2cae89d93..2ffb5fe96a 100644 --- a/usr/src/lib/libc/port/locale/isdigit.c +++ b/usr/src/lib/libc/port/locale/isdigit.c @@ -11,7 +11,7 @@ /* * Copyright 2013 Garrett D'Amore <garrett@damore.org> - * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright 2017 Nexenta Systems, Inc. */ /* @@ -28,26 +28,16 @@ #include "lctype.h" /* - * We are supplying functional forms, so make sure to suppress any macros - * we might have imported. - */ - -/* - * Performance note: ASCII test is *much* faster, as we can avoid expensive - * function call overhead. This is the hot case, so we try to do that - * whenever possible. As far as we know, *every* encoding we support - * is a strict superset of ASCII. So we can make things faster by trying - * ASCII first, and only then falling to locale specific checks. + * As far as we know, *every* encoding we support is a strict superset of ASCII, + * so we can make things faster by trying ASCII first. Next check if argument + * can be represented as unsigned char, and that locale is not multibyte - every + * multibyte encoding we support has non-ASCII code points undefined. Finally, + * lookup the result in locale specific table. */ - -static int -isctype_l(int c, int mask, locale_t loc) -{ - return ((unsigned)c > 255 ? 0 : (loc->ctype->lc_ctype_mask[c] & mask)); -} - #define ISTYPE_L(c, mask, loc) \ - (isascii(c) ? (__ctype_mask[c] & (mask)) : isctype_l(c, mask, loc)) + (isascii(c) ? (__ctype_mask[c] & (mask)) : \ + ((unsigned)c > 255 || loc->ctype->lc_max_mblen > 1) ? 0 : \ + (loc->ctype->lc_ctype_mask[c] & mask)) #define ISTYPE(c, mask) ISTYPE_L(c, mask, uselocale(NULL)) @@ -64,6 +54,10 @@ is##type(int c) \ return (ISTYPE(c, mask)); \ } +/* + * We are supplying functional forms, so make sure to suppress any macros + * we might have imported. + */ #undef isblank #undef isupper #undef islower diff --git a/usr/src/man/man1m/cron.1m b/usr/src/man/man1m/cron.1m index 840d48af8e..3abeda24ba 100644 --- a/usr/src/man/man1m/cron.1m +++ b/usr/src/man/man1m/cron.1m @@ -3,7 +3,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH CRON 1M "Feb 4, 2009" +.TH CRON 1M "Mar 30, 2017" .SH NAME cron \- clock daemon .SH SYNOPSIS @@ -13,7 +13,6 @@ cron \- clock daemon .fi .SH DESCRIPTION -.sp .LP \fBcron\fR starts a process that executes commands at specified dates and times. @@ -45,11 +44,10 @@ an \fBat\fR(1) job and the \fB-m\fR option was specified when the job was submitted. .sp .LP -\fBcron\fR and \fBat\fR jobs are not executed if your account is locked. Jobs -and processses execute. The \fBshadow\fR(4) file defines which accounts are not -locked and will have their jobs and processes executed. +\fBcron\fR and \fBat\fR jobs are not executed if your account is locked. +The \fBshadow\fR(4) file defines which accounts are not +locked and will have their jobs executed. .SS "Setting cron Jobs Across Timezones" -.sp .LP The timezone of the \fBcron\fR daemon sets the system-wide timezone for \fBcron\fR entries. This, in turn, is by set by default system-wide using @@ -61,7 +59,6 @@ If some form of \fBdaylight savings\fR or \fBsummer/winter time\fR is in effect, then jobs scheduled during the switchover period could be executed once, twice, or not at all. .SS "Setting cron Defaults" -.sp .LP To keep a log of all actions taken by \fBcron\fR, you must specify \fBCRONLOG=YES\fR in the \fB/etc/default/cron\fR file. If you specify @@ -95,7 +92,6 @@ jobs to \fB/usr/bin:/usr/ucb:\fR. Root jobs continue to use .LP The \fBcron\fR log file is periodically rotated by \fBlogadm\fR(1M). .SH FILES -.sp .ne 2 .na \fB\fB/etc/cron.d\fR\fR @@ -159,13 +155,11 @@ Configuration file for \fBlogadm\fR .RE .SH SEE ALSO -.sp .LP \fBsvcs\fR(1), \fBat\fR(1), \fBcrontab\fR(1), \fBsh\fR(1), \fBlogadm\fR(1M), \fBsvcadm\fR(1M), \fBqueuedefs\fR(4), \fBshadow\fR(4), \fBattributes\fR(5), \fBrbac\fR(5), \fBsmf\fR(5), \fBsmf_security\fR(5) .SH NOTES -.sp .LP The \fBcron\fR service is managed by the service management facility, \fBsmf\fR(5), under the service identifier: @@ -185,7 +179,6 @@ status can be queried using the \fBsvcs\fR(1) command. Most administrative actions may be delegated to users with the \fBsolaris.smf.manage.cron\fR authorization (see \fBrbac\fR(5) and \fBsmf_security\fR(5)). .SH DIAGNOSTICS -.sp .LP A history of all actions taken by \fBcron\fR is stored in \fB/var/cron/log\fR and possibly in \fB/var/cron/olog\fR. diff --git a/usr/src/man/man1m/fbconf_xorg.1m b/usr/src/man/man1m/fbconf_xorg.1m deleted file mode 100644 index ad87c5611a..0000000000 --- a/usr/src/man/man1m/fbconf_xorg.1m +++ /dev/null @@ -1,773 +0,0 @@ -'\" te -.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved -.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. -.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. -.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH FBCONF_XORG 1M "Jan 26, 2009" -.SH NAME -fbconf_xorg \- configure frame buffer devices for Xorg -.SH SYNOPSIS -.LP -.nf -\fB/usr/lib/fbconfig/fbconf_xorg\fR [\fB-dev\fR \fIdevice-file\fR] - [\fB-file\fR machine | system | \fIconfig-path\fR] - [\fB-res\fR \fIvideo-mode\fR [nocheck | noconfirm]] - [\fIdevice-specific-options\fR] - [\fB-defaults\fR] [\fB-prconf\fR] [\fB-predid\fR [raw] [parsed]] [\fB-propt\fR] -.fi - -.LP -.nf -\fB/usr/lib/fbconfig/fbconf_xorg\fR [\fB-dev\fR \fIdevice-file\fR] [\fB-prconf\fR] [\fB-propt\fR] -.fi - -.LP -.nf -\fB/usr/lib/fbconfig/fbconf_xorg\fR [\fB-dev\fR \fIdevice-file\fR] [\fB-help\fR] [\fB-res\fR ?] -.fi - -.LP -.nf -For \fBkfb\fR devices: -.fi - -.LP -.nf -\fB/usr/lib/fbconfig/fbconf_xorg\fR [\fB-dev\fR \fIdevice-file\fR] - [\fB-file\fR machine | system | \fIconfig-path\fR] - [\fB-res\fR \fIvideo-mode\fR [nocheck | noconfirm]] - [\fB-deflinear\fR true | false] [\fB-defoverlay\fR true | false] - [\fB-deftransparent\fR true | false] - [\fB-doublehigh\fR enable | disable] - [\fB-g\fR \fIgamma-correction-value\fR] - [\fB-multisample\fR available | disable | forceon] - [-\fBoffset\fR \fIx-val\fR \fIy-val\fR] [\fB-samples\fR 1 | 2 | 4 | 8 | 16 ] - [\fB-slave\fR disable | multiview] [\fB-stereo\fR true | false] - [\fB-defaults\fR] [\fB-prconf\fR] [\fB-predid\fR [raw] [parsed]] [\fB-propt\fR] -.fi - -.SH DESCRIPTION -.LP -The \fBfbconf_xorg\fR utility configures Frame Buffer devices and some of the -X11 window system defaults for Xorg by updating the \fBxorg.conf\fR -configuration file. -.sp -.LP -The first \fBfbconf_xorg\fR command form shown in the \fBSYNOPSIS\fR section -stores the specified option values in the \fBxorg.conf\fR configuration file. -These settings are used to initialize the frame buffer device the next time the -window system is run on that device. The persistence of these settings across -window system sessions and system reboots is determined by the \fBxorg.conf\fR -file. -.sp -.LP -The second and third command forms display information, and do not alter the -\fBxorg.conf\fR file. The presence of the \fB-help\fR and/or \fB-res\fR \fB?\fR -options will cause any other option (not shown in the third form) to be -ignored. -.sp -.LP -You can configure only one frame buffer device at a time. To configure multiple -devices, invoke the \fBfbconf_xorg\fR utility separately for each device. -.sp -.LP -Only frame buffer device options can be specified with \fBfbconf_xorg\fR. Use -the normal window system options to specify default depth (see -\fBsvccfg\fR(1M)), default visual class, and so forth. Specify these as device -modifiers on the command line. See\fI Xserver(1)\fR, part of the OpenWindows, -not the SunOS, man page collection. -.sp -.LP -You can specify which \fBxorg.conf\fR file to open. By default, -\fBfbconf_xorg\fR opens the machine-specific file, \fB/etc/X11/xorg.conf\fR. -Use the \fB-file\fR option to specify an alternate file. For example, the -system-global file, \fB/usr/X11/xorg.conf\fR, can be opened instead. -.sp -.LP -These standard \fBxorg.conf\fR files can be written only by the superuser or -someone with the Primary Administrator role. Consequently, the -\fBfbconf_xorg\fR program is run with setuid root permission. -.SH OPTIONS -.LP -The following options are supported for all frame buffer devices: -.sp -.ne 2 -.na -\fB\fB-defaults\fR\fR -.ad -.sp .6 -.RS 4n -Sets configuration options for the specified device to their default values. -This does not affect the \fB-res\fR video mode setting. See the device-specific -portions of the \fBDEFAULTS\fR section below. -.RE - -.sp -.ne 2 -.na -\fB\fB-dev\fR \fIdevice-file\fR\fR -.ad -.sp .6 -.RS 4n -Specifies the frame buffer device by either its full pathname or simple -filename (for example, \fB/dev/fbs/kfb0\fR or \fBkfb0\fR). Pathnames of -installed devices can be displayed using the \fB-list\fR option to -\fBfbconfig\fR(1M). If the \fB-dev\fR option is omitted, the default device, -\fB/dev/fb\fR, is used. -.RE - -.sp -.ne 2 -.na -\fB\fB-file\fR \fBmachine\fR | \fBsystem\fR | \fIconfig-path\fR\fR -.ad -.sp .6 -.RS 4n -Specifies which \fBxorg.conf\fR file to open. If \fBmachine\fR is specified, -the machine-specific \fB/etc/X11/xorg.conf\fR file is opened. If system is -specified, the global \fB/usr/X11/xorg.conf\fR file is opened. The absolute -pathname of a configuration file can be used instead. If the specified file -does not exist and is to be updated, it will be created. The file system that -will contain the \fBxorg.conf\fR file must be writable by someone with -superuser-like privileges. This option has no effect unless other options are -specified. The default is \fBmachine\fR. -.RE - -.sp -.ne 2 -.na -\fB\fB-help\fR\fR -.ad -.sp .6 -.RS 4n -Display the \fBfbconf_xorg\fR command line options that are supported in -conjunction with the frame buffer device, along with a brief explanation of -each option. The frame buffer device can be specified using the \fB-dev\fR -option. -.RE - -.sp -.ne 2 -.na -\fB\fB-prconf\fR\fR -.ad -.sp .6 -.RS 4n -Display the current configuration for the frame buffer device and attached -display device(s). The frame buffer device can be specified using the -\fB-dev\fR option. -.sp -The \fB-prconf\fR output might resemble: -.sp -.in +2 -.nf -Monitor/Resolution Information: - Monitor manufacturer: SUN - Product Code: 4 - Serial Number: 12212555 - Manufacture date: 2000, week 9 - EDID Version: 1.1 - Monitor dimensions: 36x29 cm - Default Gamma: 2.62 - Monitor preferred resolution: SUNW_STD_1280x1024x60 - Monitor supported resolutions from EDID: SUNW_STD_1280x1024x60, - SUNW_STD_1280x1024x76, 1152x900x66, VESA_STD_1280x1024x75, - VESA_STD_1280x1024x60, SUNW_STD_1152x900x66, - VESA_STD_720x400x70, VESA_STD_640x480x60, - VESA_STD_640x480x67, VESA_STD_640x480x72, - VESA_STD_640x480x75, VESA_STD_800x600x56, - VESA_STD_800x600x60, VESA_STD_800x600x72, - VESA_STD_800x600x75, VESA_STD_832x624x75, - VESA_STD_1024x768x60, VESA_STD_1024x768x70, 1024x768x75 - Current resolution setting: FALLBACK_1152x900x66 - -Framelock Configuration: - Slave Mode: Disabled -.fi -.in -2 -.sp - -.RE - -.sp -.ne 2 -.na -\fB\fB-predid\fR [\fBraw\fR] [\fBparsed\fR]\fR -.ad -.sp .6 -.RS 4n -Display the E-EDID (Enhanced Extended Display Identification Data) information -obtained from the display device(s), which must be online, connected to the -frame buffer. The frame buffer device can be specified using the \fB-dev\fR -option. The output will be raw hexadecimal and/or human-readable (parsed) text. -The default is parsed. -.sp -The \fB-predid\fR raw output might resemble: -.sp -.in +2 -.nf ---- EDID Data for /dev/fbs/kfb0 --- - -Block 0: EDID Base Block - 0x00: 00 FF FF FF FF FF FF 00 04 43 06 F2 01 00 00 00 - 0x10: 01 11 01 04 0F 2B 20 78 2B 9C 68 A0 57 4A 9B 26 - 0x20: 12 48 4C FF FF 80 A9 59 A9 4F A9 4A A9 45 81 99 - 0x30: 81 80 61 59 45 59 48 3F 40 30 62 B0 32 40 40 C0 - 0x40: 13 00 AB 40 11 00 00 1E 00 00 00 FD 00 32 5A 1E - 0x50: 6E 17 04 11 00 C8 90 00 50 3C 00 00 00 F7 00 0A - 0x60: F7 0F 03 87 C0 00 00 00 00 00 00 00 00 00 00 FC - 0x70: 00 41 42 43 20 4C 43 44 32 31 0A 20 20 20 00 0B -.fi -.in -2 -.sp - -.RE - -.sp -.ne 2 -.na -\fB\fB-propt\fR\fR -.ad -.sp .6 -.RS 4n -Display all option settings for the frame buffer device, either as they -currently are or as they will be represented in the \fBxorg.conf\fR -configuration file when \fBfbconf_xorg\fR completes. The device can be -specified using the \fB-dev\fR option, and the file using the \fB-file\fR -option. -.sp -The \fB-propt\fR output might resemble: -.sp -.in +2 -.nf - --- Graphics Configuration for /dev/fbs/kfb0 --- - - xorg.conf: machine -- /etc/X11/xorg.conf - Screen section: "kfb0" - Device section: "kfb0" - Monitor section: "kfb0" - - Video Mode: SUNW_STD_1280x1024x76 - StereoEnable: False - - Multisample Information: - Multisample Mode: Disable - Samples Per Pixel: 4 - - Screen Information: - DoubleWide: Disabled - DoubleHigh: Disabled - Offset/Overlap: [0, 0] - - Visual Information: - Default Visual: Non-Linear Normal Visual - Gamma Correction Value: Using gamma value 2.22 -.fi -.in -2 -.sp - -.RE - -.sp -.ne 2 -.na -\fB\fB-res\fR \fB?\fR\fR -.ad -.sp .6 -.RS 4n -Display a list of video modes that can be used with the \fB-res\fR -\fIvideo-mode\fR option. -.sp -The \fB?\fR argument may need to be escaped or placed in quotes (\e?, "?", -or '?'), to protect it from misinterpretation by the shell. -.sp -The \fB-res\fR \fB?\fR output might resemble: -.sp -.in +2 -.nf - Video modes accepted by the -res option: - AUTO [1][2] - NONE [1][2] - SUNW_STD_1920x1200x75 - SUNW_STD_1920x1200x70 - SUNW_DIG_1920x1200x60 - SUNW_STD_1920x1080x72 - SUNW_DIG_1920x1080x60 - ... - ... - VESA_STD_640x480x75 [1] - VESA_STD_640x480x72 [1] - VESA_STD_640x480x60 [1] - - [1] Resolution is supported by monitor - [2] Preferred resolution for monitor -.fi -.in -2 -.sp - -Abbreviations such as "\fB1280x1024x75\fR" might also be used. -.RE - -.sp -.ne 2 -.na -\fB\fB-res\fR \fIvideo-mode\fR [\fBnocheck\fR | \fBnoconfirm\fR]\fR -.ad -.sp .6 -.RS 4n -Set the video mode for the display device that is connected to the frame buffer -device. -.sp -A list of video modes can be displayed using the \fB-res\fR \fB?\fR option. -.sp -The basic format of a video-mode is \fIwidth\fRx\fIheight\fRx\fIrate\fR, where: -.RS +4 -.TP -.ie t \(bu -.el o -\fIwidth\fR is the screen width in pixels. -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fIheight\fR is the screen height in pixels. -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fIrate\fR is the vertical frequency of the screen refresh. -.RE -A video-mode argument may have an \fB@\fR (at sign) instead of \fBx\fR -preceding the refresh rate. For instance, \fB1280x1024x76\fR and -\fB1280x1024@76\fR are equivalent. -.sp -A video-mode name may carry additional information, as with -\fBSUNW_STD_1280x1024x76\fR. -.sp -The \fB-res\fR argument, \fBauto\fR, represents the video mode that is -currently programmed into the device. The argument, \fBnone\fR, is a synonym -for \fBauto\fR. -.sp -Note that some video modes might be inappropriate for certain frame buffer -devices and/or display devices. -.sp -The \fB-res\fR option accepts suboption keywords following the video-mode -specification. -.sp -.ne 2 -.na -\fB\fBnocheck\fR\fR -.ad -.sp .6 -.RS 4n -The \fBnocheck\fR suboption causes the video-mode argument to be accepted, -regardless of whether it is supported by the currently attached monitor, -whether it is known within the current configuration, and so forth. Note that -using an unchecked, inappropriate video mode can leave the system without -usable video output. This suboption is useful if a different monitor is to be -connected to the frame buffer device. This suboption also implies -\fBnoconfirm\fR. -.RE - -.sp -.ne 2 -.na -\fB\fBnoconfirm\fR\fR -.ad -.sp .6 -.RS 4n -If the video-mode argument is unable to be validated, the default action is to -display a warning message and ask the user whether to continue. The -\fBnoconfirm\fR suboption suppresses this confirmation request. This suboption -is useful when \fBfbconf_xorg\fR is being run from a shell script. -.RE - -.RE - -.sp -.LP -The following device-specific options are supported for certain frame buffer -devices. Unless specified otherwise, these options do not take effect until the -user logs out and back in. -.sp -.ne 2 -.na -\fB\fB-deflinear\fR \fBtrue\fR | \fBfalse\fR\fR -.ad -.sp .6 -.RS 4n -This option selects the default X visual. Two types of visuals are supported, -linear and nonlinear. Linear visuals are gamma corrected. Nonlinear visuals are -not. -.sp -If the value of this option is \fBtrue\fR, the default visual is set to default -depth 24 and the default class is \fBTrueColor\fR with gamma correction -enabled. If \fBfalse\fR, a nonlinear visual that satisfies the other default -visual selection options, such as the default depth and default class, is -chosen as the default visual. -.sp -The \fB-deflinear\fR, \fB-defoverlay\fR, and \fB-deftransparent\fR options each -select the default X visual. Only one of these may be enabled at a time. -Enabling one causes the others to be disabled. -.RE - -.sp -.ne 2 -.na -\fB\fB-defoverlay\fR \fBtrue\fR | \fBfalse\fR\fR -.ad -.sp .6 -.RS 4n -This option selects the default X visual. The \fBkfb\fR device provides an -8-bit PseudoColor visual whose pixels are disjoint from the rest of the -visuals. This is called the overlay visual. Windows created in this visual will -not damage windows created in other visuals. The converse, however, is not -true: Windows created in other visuals will damage overlay windows. -.sp -If the value of this option is \fBtrue\fR, the overlay visual is the default -visual. The default depth is 8-bit and the default class is PseudoColor. If -\fBfalse\fR, the non-overlay visual that satisfies the other default visual -selection options, such as the default depth and the default class, is chosen -as the default visual. -.sp -The \fB-deflinear\fR, \fB-defoverlay\fR, and \fB-deftransparent\fR options each -select the default X visual. Only one of these may be enabled at a time. -Enabling one causes the others to be disabled. -.RE - -.sp -.ne 2 -.na -\fB\fB-deftransparent\fR \fBtrue\fR | \fBfalse\fR\fR -.ad -.sp .6 -.RS 4n -This option selects the default X visual. The \fBkfb\fR device provides an -8-bit PseudoColor visual whose pixels are disjoint from the rest of the -visuals. This is called the overlay visual. Windows created in this visual will -not damage windows created in other visuals. -.sp -If the value of this option is \fBtrue\fR, the overlay visual used as the -default is a transparent overlay visual. A visual with transparency supports a -colormap with 255 colors and one transparent pixel. The default depth is 8-bit -and the default class is PseudoColor. If \fBfalse\fR, the nonoverlay visual -that satisfies the other default visual selection options, such as the default -depth and the default class, is chosen as the default visual. -.sp -The \fB-deflinear\fR, \fB-defoverlay\fR, and \fB-deftransparent\fR options each -select the default X visual. Only one of these may be enabled at a time. -Enabling one causes the others to be disabled. -.RE - -.sp -.ne 2 -.na -\fB\fB-doublehigh\fR \fBenable\fR | \fBdisable\fR\fR -.ad -.sp .6 -.RS 4n -Configures the two outputs of the frame buffer device into one vertical virtual -display. The default is \fBdisable\fR. The \fB-doublewide\fR and -\fB-doublehigh\fR options are mutually exclusive. Enabling one causes the other -to be disabled. -.RE - -.sp -.ne 2 -.na -\fB\fB-doublewide\fR \fBenable\fR | \fBdisable\fR\fR -.ad -.sp .6 -.RS 4n -Configures the two outputs of the frame buffer device into one horizontal -virtual display. The default is \fBdisable\fR. The \fB-doublewide\fR and -\fB-doublehigh\fR options are mutually exclusive. Enabling one causes the other -to be disabled. -.RE - -.sp -.ne 2 -.na -\fB\fB-g\fR \fIgamma-correction-value\fR\fR -.ad -.sp .6 -.RS 4n -Sets the gamma correction value. All linear visuals provide gamma correction. -The gamma correction value should be in the range, \fB0.1\fR to \fB10.0\fR. The -default is \fB2.22\fR. This option can be used while the window system is -running. Changing the gamma correction value affects all of the windows -displayed by linear visuals. -.RE - -.sp -.ne 2 -.na -\fB\fB-gfile\fR \fIgamma-correction-file\fR\fR -.ad -.sp .6 -.RS 4n -Loads the gamma correction table from the file specified by -\fIgamma-correction-file\fR. This text file specifies the gamma correction -values for the R, G, and B channels. Three consecutive values form an RGB -triplet. For a \fBkfb\fR device, there must be exactly 256 RGB triplets. A -value may be represented in hexadecimal, decimal, or octal format (for example, -\fB0x3FF\fR, \fB1023\fR, or \fB01777\fR, respectively). Values are separated by -one or more whitespace or new line characters. Comments begin with a hash sign -character (\fB#\fR) and end at the end of the line. -.sp -You can load the gamma correction table with this option while the window -system is running. The new gamma correction affects all the windows being -displayed using the linear visuals. When gamma correction is done using a -user-specified table, the gamma correction value (\fB-g\fR) is undefined. By -default, the window system assumes a gamma correction value of \fB2.22\fR and -loads the gamma table it creates corresponding to this value. -.sp -The following is an example of a \fIgamma-correction-file\fR file: -.sp -.in +2 -.nf - # Gamma Correction Table - 0x00 0x00 0x00 - 0x01 0x01 0x01 - 0x02 0x02 0x02 - ... ... ... - ... ... ... - 0xFF 0xFF 0xFF -.fi -.in -2 -.sp - -.RE - -.sp -.ne 2 -.na -\fB\fB-multisample\fR \fBavailable\fR | \fBdisable\fR | \fBforceon\fR\fR -.ad -.sp .6 -.RS 4n -If set to disable, no multisample is possible. If set to available, multisample -is possible but is selected on a per-window basis using a library interface. If -set to \fBforceon\fR, all Sun OpenGL windows are rendered using multisampling. -To query the number of samples used, specify the \fB-propt\fR option or run the -\fBxglinfo\fR utility. The \fBxglinfo\fR utility can return the number of -multisamples if \fB-multisample\fR is set to available. The default is -\fBdisable\fR. \fBxglinfo\fR is described in the \fBxglinfo(1)\fR man page, in -the Sun OpenGL man page collection. -.RE - -.sp -.ne 2 -.na -\fB\fB-offset\fR \fIx-val\fR \fIy-val\fR\fR -.ad -.sp .6 -.RS 4n -Adjusts the position of the specified stream by the value specified. This -option is only implemented in \fB-doublewide\fR and \fB-doublehigh\fR modes. -For \fB-doublewide\fR, use the \fIx-val\fR to position the rightmost stream. -Negative is left (overlaps with the left stream). For \fB-doublehigh\fR, use -the \fIy-val\fR to position the bottom stream. Negative is up (overlaps with -top stream). The default is \fB[0,0]\fR. -.RE - -.sp -.ne 2 -.na -\fB\fB-samples\fR \fB1\fR | \fB2\fR | \fB4\fR | \fB8\fR | \fB16\fR\fR -.ad -.sp .6 -.RS 4n -Requests the number of samples to compute per display pixel. The requested -number of samples per pixel is used if \fB-multisample\fR is not disabled and -resources exist for the request. To query the number of samples used, specify -the \fB-propt\fR option or run the \fBxglinfo\fR utility. The \fBxglinfo\fR -utility can return the number of multisamples after you specify the option -\fB-multisample\fR available. The default is \fB4\fR. -.RE - -.sp -.ne 2 -.na -\fB\fB-slave\fR \fBdisable\fR | \fBmultiview\fR\fR -.ad -.sp .6 -.RS 4n -If you set the \fBmultiview\fR argument for the \fB-slave\fR option, the device -synchronizes video with a master through the multiview genlock ribbon cable. -The system should be powered off whenever connecting or disconnecting this -cable. Both devices should be running the same resolution and the option should -be issued when the window system is running. The default is \fBdisable\fR. -.RE - -.SH DEFAULTS -.LP -Certain options have implied default arguments. The default argument is used -when the option is not present on the \fBfbconf_xorg\fR command line. For -instance, a default argument for \fB-dev\fR is \fB/dev/fb\fR. -.sp -.LP -Options that set configuration state do not have implied defaults. The -\fB-res\fR option is one example. If a configuration option is omitted from the -\fBfbconf_xorg\fR command line, the corresponding \fBxorg.conf\fR configuration -setting will remain unchanged. The exception is that if configuration options -are mutually exclusive, setting one will automatically unset each of the -others. An example is \fB-deflinear\fR, \fB-defoverlay\fR, and -\fB-deftransparent\fR. -.sp -.LP -If a configuration setting is not present in the configura tion file when the -window system is run, a default value will be used. For instance, the default -state associated with \fB-res\fR is \fBauto\fR. A setting might not be present -in the file, or the file itself might not exist, until \fBfbconf_xorg\fR has -been invoked with the corresponding command line option. -.sp -.LP -The \fB-defaults\fR option sets the default values for most configuration -settings. -.sp -.LP -Options and their defaults are shown below. -.sp -.LP -Device-independent defaults: -.sp -.in +2 -.nf - Option Default Argument - -dev /dev/fb - -file machine - - Option Default State - -res auto -.fi -.in -2 -.sp - -.sp -.LP -\fBkfb\fR-specific defaults: -.sp -.in +2 -.nf - Option Default State or -defaults Value - -deflinear false - -defoverlay false - -deftransparent false - -doublehigh disable - -doublewide disable - -g 2.22 - -multisample disable - -offset 0 0 - -samples 4 - -slave disable - -stereo false -.fi -.in -2 -.sp - -.SH EXAMPLES -.LP -\fBExample 1 \fRSwitching the Resolution of the Monitor Type -.sp -.LP -The following example sets the video mode for the monitor on the -\fB/dev/fbs/kfb0\fR device to 1280 x 1024 at 76 Hz: - -.sp -.in +2 -.nf -example% \fBfbconf_xorg -dev kfb0 -res 1280x1024x76\fR -.fi -.in -2 -.sp - -.SH EXIT STATUS -.LP -The following exit values are returned: -.sp -.ne 2 -.na -\fB\fB0\fR\fR -.ad -.sp .6 -.RS 4n -Execution completed successfully. -.RE - -.sp -.ne 2 -.na -\fB\fB1\fR\fR -.ad -.sp .6 -.RS 4n -Invalid command line usage. -.RE - -.sp -.ne 2 -.na -\fB\fB2\fR\fR -.ad -.sp .6 -.RS 4n -An error occurred. -.RE - -.SH FILES -.ne 2 -.na -\fB\fB/dev/fb\fR\fR -.ad -.sp .6 -.RS 4n -Symbolic link to the default frame buffer device. -.RE - -.sp -.ne 2 -.na -\fB\fB/dev/fbs/kfb\fIn\fR\fR\fR -.ad -.sp .6 -.RS 4n -Device special file for a \fBkfb\fR frame buffer -.RE - -.sp -.ne 2 -.na -\fB\fB/usr/lib/fbconfig/SunModes_xorg.conf\fR\fR -.ad -.sp .6 -.RS 4n -Video mode definitions included in new configuration files. -.RE - -.SH ATTRIBUTES -.LP -See \fBattributes\fR(5) for descriptions of the following attributes: -.sp - -.sp -.TS -box; -c | c -l | l . -ATTRIBUTE TYPE ATTRIBUTE VALUE -_ -Interface Stability Uncommitted -.TE - -.SH SEE ALSO -.LP -\fBfbconfig\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBkfb\fR(7D), -\fBfbio\fR(7I) -.sp -.LP -See the \fIXorg(1)\fR and \fIXserver(1)\fR man pages in the X Server man page -collection and the \fIxglinfo(1)\fR man page in the Sun OpenGL man page -collection. diff --git a/usr/src/man/man1m/sconadm.1m b/usr/src/man/man1m/sconadm.1m deleted file mode 100644 index 98cf1b064f..0000000000 --- a/usr/src/man/man1m/sconadm.1m +++ /dev/null @@ -1,470 +0,0 @@ -'\" te -.\" Copyright (c) 2005, Sun Microsystems, Inc. All Rights Reserved -.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. -.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. -.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH SCONADM 1M "Feb 27, 2006" -.SH NAME -sconadm \- register system information -.SH SYNOPSIS -.LP -.nf -\fB/usr/sbin/sconadm\fR register \fB-a\fR - [\fB-e\fR softwareUpdate | \fB-E\fR softwareUpdate] - [\fB-h\fR \fIhostname\fR] [\fB-l\fR \fIlogfile\fR] [\fB-N\fR] - [\fB-p\fR \fIproxy_host\fR[:\fIproxy_port\fR]] - [\fB-r\fR \fIregistration_profile\fR] [\fB-u\fR \fIusername\fR] - [\fB-x\fR \fIproxy_username\fR] -.fi - -.LP -.nf -\fB/usr/sbin/sconadm\fR proxy [\fB-l\fR \fIlogfile\fR] - [\fB-p\fR \fIproxy_host\fR[:\fIproxy_port\fR]] - [\fB-r\fR \fIregistration_profile\fR] [\fB-x\fR \fIproxy_username\fR] -.fi - -.SH DESCRIPTION -.sp -.LP -The \fBsconadm\fR utility is a command-line version of the Basic Registration -GUI. In the first form of the command in the SYNOPSIS, \fBsconadm\fR uses the -\fBregister\fR subcommand to register a host with a registration server. In the -second form, \fBsconadm\fR uses the \fBproxy\fR subcommand to configure all of -the components for software update to use an HTTP web proxy. -.sp -.LP -The parameters specified with \fB-u\fR, \fB-e\fR (or \fB-E\fR), \fB-h\fR, -\fB-p\fR, and \fB-x\fR override values specified in your registration profile. -A template for this profile, owned by root, with read-only permissions, is -stored in \fB/usr/lib/breg/data/RegistrationProfile.properties\fR. See -\fBregistration_profile\fR(4). -.sp -.LP -For the \fBproxy\fR subcommand, the proxy password is stored in the -\fBRegistrationProfile.properties\fR file, available if proxy authentication is -needed. Storage in the profile prevents proxy passwords from being exposed as -part of a listing of processes on a system. -.SH OPTIONS -.sp -.LP -The following options are supported: -.sp -.ne 2 -.na -\fB\fB-a\fR\fR -.ad -.RS 30n -Accept "Terms of Use and Binary Code License". Absence of this option means -that you do not accept the license. -.RE - -.sp -.ne 2 -.na -\fB\fB-e\fR softwareUpdate\fR -.ad -.RS 30n -Enable client to be managed at the Sun-hosted Update Connection Service. -.RE - -.sp -.ne 2 -.na -\fB\fB-E\fR softwareUpdate\fR -.ad -.RS 30n -Disable client's ability to be managed at the Sun-hosted Update Connection -Service. -.RE - -.sp -.ne 2 -.na -\fB\fB-h\fR \fIhostname\fR\fR -.ad -.RS 30n -Hostname of the machine you want to register. -.RE - -.sp -.ne 2 -.na -\fB\fB-l\fR \fIlogfile\fR\fR -.ad -.RS 30n -Pathname of log file. -.RE - -.sp -.ne 2 -.na -\fB\fB-N\fR\fR -.ad -.RS 30n -Never register. -.RE - -.sp -.ne 2 -.na -\fB\fB-p\fR \fIproxy_host\fR[:\fIproxy_port\fR]\fR -.ad -.RS 30n -Proxy host name and optional proxy port number. -.RE - -.sp -.ne 2 -.na -\fB\fB-r\fR \fIregistration_profile\fR\fR -.ad -.RS 30n -Pathname to a registration profile. -.RE - -.sp -.ne 2 -.na -\fB\fB-u\fR \fIusername\fR\fR -.ad -.RS 30n -User name (a Sun Online Account). -.RE - -.sp -.ne 2 -.na -\fB\fB-x\fR \fIproxy_username\fR\fR -.ad -.RS 30n -User name on the proxy host. -.RE - -.SH EXAMPLES -.sp -.LP -Unless specified otherwise, the commands below require root privileges or -privileges equivalent to root. See \fBprivileges\fR(5). -.LP -\fBExample 1 \fRRegistering a New System -.sp -.LP -Assume a file \fBregistrationprofile.properties\fR in \fB/tmp\fR that contains -the following: - -.sp -.in +2 -.nf -userName=\fIuser123\fR -password=\fIabc123\fR -hostName= -subscriptionKey= -portalEnabled=false -proxyHostName= -proxyPort= -proxyUserName= -proxyPassword= -.fi -.in -2 - -.sp -.LP -To register a new system using the profile above, you enter: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm register -a -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.LP -\fBExample 2 \fRReregistering a System with a Different User -.sp -.LP -Assume a file \fBregistrationprofile.properties\fR in \fB/tmp\fR with the -contents shown below. Note the changed specification for \fBuserName\fR and -\fBpassword\fR. - -.sp -.in +2 -.nf -userName=\fInewuser\fR -password=\fInewpassword\fR -hostName= -subscriptionKey= -portalEnabled=false -proxyHostName= -proxyPort= -proxyUserName= -proxyPassword= -.fi -.in -2 - -.sp -.LP -To reregister a new system using the profile above, you enter the same command -you entered to register the system: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm register -a -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.LP -\fBExample 3 \fRReregistering a System, Adding a Sun Subscription Key -.sp -.LP -Modify \fBregistrationprofile.properties\fR as follows: - -.sp -.in +2 -.nf -userName=\fInewuser\fR -password=\fInewpassword\fR -hostName= -subscriptionKey=\fIabc12345678\fR -portalEnabled=false -proxyHostName= -proxyPort= -proxyUserName= -proxyPassword= -.fi -.in -2 - -.sp -.LP -Run the command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm register -a -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.LP -\fBExample 4 \fRReregistering and Enabling Access to all Update Connection -Services -.sp -.LP -Modify \fBregistrationprofile.properties\fR as follows: - -.sp -.in +2 -.nf -userName=\fInewuser\fR -password=\fInewpassword\fR -hostName= -subscriptionKey=\fIabc12345678\fR -portalEnabled=false -proxyHostName= -proxyPort= -proxyUserName= -proxyPassword= -.fi -.in -2 - -.sp -.LP -Note that \fBportalEnabled\fR is set to \fBfalse\fR. Run the command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm register -a -r /tmp/registrationprofile.properties \e --e softwareUpdate\fR -.fi -.in -2 -.sp - -.LP -\fBExample 5 \fRNever Registering -.sp -.LP -To never register a system, enter: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm register -N\fR -.fi -.in -2 -.sp - -.LP -\fBExample 6 \fRUsing a Proxy Server With Proxy Authentication -.sp -.LP -Edit \fBregistrationprofile.properties\fR as follows: - -.sp -.in +2 -.nf -userName= -password= -hostName= -subscriptionKey= -portalEnabled= -proxyHostName=webcache.mycompany.com -proxyPort=8080 -proxyUserName=\fImyCompanyProxyUserName\fR -proxyPassword=\fImyCompanyProxyPassword\fR -.fi -.in -2 - -.sp -.LP -Run the command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm proxy -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.LP -\fBExample 7 \fRChanging Proxy Host Settings -.sp -.LP -Edit \fBregistrationprofile.properties\fR as follows: - -.sp -.in +2 -.nf -userName= -password= -hostName= -subscriptionKey= -portalEnabled= -proxyHostName=webcache.mycompany.com -proxyPort=8080 -proxyUserName=\fImyCompanyProxyUserName\fR -proxyPassword=\fImyCompanyProxyPassword\fR -.fi -.in -2 - -.sp -.LP -Run the command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm proxy -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.sp -.LP -Then, change the \fBproxyHostName\fR value by running the following command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm proxy -r /tmp/registrationprofile.properties \e --p newproxy.mycompany.com\fR -.fi -.in -2 -.sp - -.sp -.LP -After the preceding command all proxies use \fBnewproxy.mycompany.com\fR. - -.LP -\fBExample 8 \fRResetting a System Not to Use a Proxy -.sp -.LP -Edit \fBregistrationprofile.properties\fR as follows: - -.sp -.in +2 -.nf -userName= -password= -hostName= -subscriptionKey= -portalEnabled= -proxyHostName= -proxyPort= -proxyUserName= -proxyPassword= -.fi -.in -2 - -.sp -.LP -Note that values for all proxy fields are null. - -.sp -.LP -Run the command: - -.sp -.in +2 -.nf -\fB/usr/sbin/sconadm proxy -r /tmp/registrationprofile.properties\fR -.fi -.in -2 -.sp - -.SH EXIT STATUS -.sp -.ne 2 -.na -\fB\fB0\fR\fR -.ad -.RS 6n -Success. -.RE - -.sp -.ne 2 -.na -\fB\fB>0\fR\fR -.ad -.RS 6n -An error occurred. -.RE - -.SH FILES -.sp -.ne 2 -.na -\fB\fB/usr/lib/breg/data/RegistrationProfile.properties\fR\fR -.ad -.sp .6 -.RS 4n -Registration profile template. -.RE - -.SH ATTRIBUTES -.sp -.LP -See \fBattributes\fR(5) for descriptions of the following attributes: -.sp - -.sp -.TS -box; -c | c -l | l . -ATTRIBUTE TYPE ATTRIBUTE VALUE -_ -Interface Stability Stable -.TE - -.SH SEE ALSO -.sp -.LP -\fBregistration_profile\fR(4), \fBattributes\fR(5), \fBprivileges\fR(5) diff --git a/usr/src/man/man5/Makefile b/usr/src/man/man5/Makefile index 3faa1135cd..62a46e52fd 100644 --- a/usr/src/man/man5/Makefile +++ b/usr/src/man/man5/Makefile @@ -74,6 +74,7 @@ MANFILES= Intro.5 \ man.5 \ mandoc_char.5 \ mandoc_roff.5 \ + mansun.5 \ mdoc.5 \ me.5 \ mech_spnego.5 \ diff --git a/usr/src/man/man5/mansun.5 b/usr/src/man/man5/mansun.5 index d0c0edde18..317e38c321 100644 --- a/usr/src/man/man5/mansun.5 +++ b/usr/src/man/man5/mansun.5 @@ -1,24 +1,24 @@ '\" te +.\" Copyright (c) 2017 Peter Tribble. .\" Copyright (c) 1992, Sun Microsystems, Inc. .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH MANSUN 5 "Jun 11, 1992" +.TH MANSUN 5 "Apr 2, 2017" .SH NAME mansun \- macros to format Reference Manual pages .SH SYNOPSIS .LP .nf -\fBnroff\fR \fB-mansun\fR \fIfilename\fR... +\fBnroff\fR \fB-mansun\fR \fIfilename\fR... .fi .LP .nf -\fBtroff\fR \fB-mansun\fR \fIfilename\fR... +\fBtroff\fR \fB-mansun\fR \fIfilename\fR... .fi .SH DESCRIPTION -.sp .LP These macros are used to lay out the reference pages in this manual. Note: if \fIfilename\fR contains format input for a preprocessor, the commands shown @@ -27,7 +27,7 @@ automatically by \fBman\fR(1). See the ``Conventions'' section. .sp .LP Any text argument \fIt\fR may be zero to six words. Quotes may be used to -include SPACE characters in a "word". If \fItext\fR is empty, the special +include SPACE characters in a "word". If \fItext\fR is empty, the special treatment is applied to the next input line with text to be printed. In this way \fB\&.I\fR may be used to italicize a whole line, or \fB\&.SB\fR may be used to make small bold letters. @@ -35,7 +35,7 @@ used to make small bold letters. .LP A prevailing indent distance is remembered between successive indented paragraphs, and is reset to default value upon reaching a non-indented -paragraph. Default units for indents \fIi\fR are ens. +paragraph. Default units for indents \fIi\fR are ens. .sp .LP Type font and size are reset to default values before each paragraph, and after @@ -62,7 +62,6 @@ Change to default type size. .RE .SS "Requests" -.sp .LP * n.t.l. = next text line; p.i. = prevailing indent .sp @@ -113,7 +112,7 @@ T} \fB\&.SS \fR\fIt\fR yes \fIt\fR=n.t.l. Section Subheading. \fB\&.TH \FR\FIN S "f d, m\fR" \fB\&.TH \fR\fIn s d f m\fR yes - T{ -Begin reference page \fIn\fR, of of section \fIs\fR; \fId\fR is the date of the most recent change. If present, \fIf\fR is the left page footer; \fIm\fR is the main page (center) header. Sets prevailing indent and tabs to .5i. +Begin reference page \fIn\fR, of of section \fIs\fR; \fId\fR is the date of the most recent change. If present, \fIf\fR is the left page footer; \fIm\fR is the main page (center) header. Sets prevailing indent and tabs to .5i. T} \fB\&.TP \fR\fIi\fR yes \fIi\fR=p.i. T{ Begin indented paragraph, with the tag given on the next text line. Set prevailing indent to \fIi\fR. @@ -124,7 +123,6 @@ T} .TE .SS "Conventions" -.sp .LP When formatting a manual page, \fBmansun\fR examines the first line to determine whether it requires special processing. For example a first line @@ -158,8 +156,8 @@ page. This is followed by the number of the section in which it appears. The name, or list of names, by which the command is called, followed by a dash and then a one-line summary of the action performed. All in Roman font, this section contains no \fBtroff\fR(1) commands or escapes, and no macro requests. -It is used to generate the \fBwindex\fR database, which is used by the -\fBwhatis\fR(1) command. +It is used to generate the \fBwhatis\fR database, which is used by the +\fBwhatis\fR(1) and \fBapropos\fR(1) commands. .RE .sp @@ -175,7 +173,7 @@ It is used to generate the \fBwindex\fR database, which is used by the .ad .RS 13n The syntax of the command and its arguments, as typed on the command line. -When in boldface, a word must be typed exactly as printed. When in italics, a +When in boldface, a word must be typed exactly as printed. When in italics, a word can be replaced with an argument that you supply. References to bold or italicized items are not capitalized in other sections, even when they begin a sentence. @@ -219,7 +217,7 @@ bracketed set, the expression within the brackets can be repeated. .ad .RS 14n If required, the data declaration, or \fB#include\fR directive, is shown first, -followed by the function declaration. Otherwise, the function declaration is +followed by the function declaration. Otherwise, the function declaration is shown. .RE @@ -238,12 +236,12 @@ are normally omitted. This section attempts to provide a succinct overview in answer to the question, "what does it do?" .sp Literal text from the synopsis appears in constant width, as do literal -filenames and references to items that appear elsewhere in the reference +filenames and references to items that appear elsewhere in the reference manuals. Arguments are italicized. .sp If a command interprets either subcommands or an input grammar, its command interface or input grammar is normally described in a \fBUSAGE\fR section, -which follows the \fBOPTIONS\fR section. The \fBDESCRIPTION\fR section only +which follows the \fBOPTIONS\fR section. The \fBDESCRIPTION\fR section only describes the behavior of the command itself, not that of subcommands. .RE @@ -296,7 +294,6 @@ with the command or function. .RE .SH FILES -.sp .ne 2 .na \fB\fB/usr/share/lib/tmac/ansun\fR\fR @@ -305,19 +302,13 @@ with the command or function. .RE -.sp -.ne 2 -.na -\fB\fB/usr/share/man/windex\fR\fR -.ad -.RS 29n - -.RE - .SH SEE ALSO -.sp .LP -\fBman\fR(1), \fBnroff\fR(1), \fBtroff\fR(1), \fBwhatis\fR(1) +\fBman\fR(1), \fBnroff\fR(1), \fBtroff\fR(1) .sp .LP Dale Dougherty and Tim O'Reilly, \fIUnix\fR \fIText\fR \fIProcessing\fR + +.SH NOTES +.LP +New manual pages should be coded in the \fBmdoc\fR(5) format. diff --git a/usr/src/man/man7d/kfb.7d b/usr/src/man/man7d/kfb.7d deleted file mode 100644 index c591403d36..0000000000 --- a/usr/src/man/man7d/kfb.7d +++ /dev/null @@ -1,41 +0,0 @@ -'\" te -.\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved -.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. -.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. -.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH KFB 7D "Jul 14, 2006" -.SH NAME -kfb \- Sun XVR-2500 Graphics Accelerator device driver -.SH DESCRIPTION -.sp -.LP -The \fBkfb\fR driver is the Sun XVR-2500 graphics accelerator device driver. -The Sun XVR-2500 graphics accelerator is a high resolution, high performance -PCI graphics framebuffer providing hardware 2D and 3D acceleration. -.sp -.LP -The \fBkfbdaemon\fR process provides memory management for the XVR-2500 product -family. -.SH FILES -.sp -.ne 2 -.na -\fBdev/fbs/kfb\fIn\fR\fR -.ad -.RS 23n -Device special file for XVR-2500 high performance single screen. -.RE - -.sp -.ne 2 -.na -\fB/usr/sbin/kfbdaemon\fR -.ad -.RS 23n -Memory manager. -.RE - -.SH SEE ALSO -.sp -.LP -\fBSUNWkfb_config\fR(1M) diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 5bc5cf97e6..b8710ccb27 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -98,7 +98,6 @@ file path=opt/onbld/bin/checkproto mode=0555 file path=opt/onbld/bin/copyrightchk mode=0555 file path=opt/onbld/bin/cstyle mode=0555 file path=opt/onbld/bin/elfcmp mode=0555 -file path=opt/onbld/bin/elfsigncmp mode=0555 file path=opt/onbld/bin/find_elf mode=0555 file path=opt/onbld/bin/findcrypto mode=0555 file path=opt/onbld/bin/flg.flp mode=0555 diff --git a/usr/src/pkg/manifests/text-doctools.mf b/usr/src/pkg/manifests/text-doctools.mf index e0c3d815ab..4ebb6df485 100644 --- a/usr/src/pkg/manifests/text-doctools.mf +++ b/usr/src/pkg/manifests/text-doctools.mf @@ -309,6 +309,7 @@ file path=usr/share/man/man1/troff.1 file path=usr/share/man/man1/ul.1 file path=usr/share/man/man1/vgrind.1 file path=usr/share/man/man5/eqnchar.5 +file path=usr/share/man/man5/mansun.5 file path=usr/share/man/man5/me.5 file path=usr/share/man/man5/mm.5 file path=usr/share/man/man5/ms.5 diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index d144ff231d..54ac3aba69 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -56,8 +56,6 @@ COMMON_SUBDIRS= \ # special versions of commands for use only in build # UNSHIPPED_SUBDIRS = \ - elfsign \ - man \ mandoc sparc_SUBDIRS= \ diff --git a/usr/src/tools/README.tools b/usr/src/tools/README.tools index 323d6c679c..5e75119463 100644 --- a/usr/src/tools/README.tools +++ b/usr/src/tools/README.tools @@ -157,18 +157,6 @@ elfcmp is used to test whether two binaries are the same except for the elfsign signature. -elfsign - Built from the same sources as the shipped elfsign(1), this - version is used in nightly -t builds to assure that the signing - process and format is the same as will be used on the target - system. - -elfsigncmp - This script can be used in lieu of elfsign during a build. - It uses elfsign to sign a copy of the object and elfcmp -S to - verify that the signing caused no damage before updating - the object to be signed. - find_elf Search a directory tree for ELF objects, and produce one line of output per object. Used by check_rtime and interface_check to locate diff --git a/usr/src/tools/elfsign/Makefile b/usr/src/tools/elfsign/Makefile deleted file mode 100644 index ece759e450..0000000000 --- a/usr/src/tools/elfsign/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PROG= elfsign -SHFILES= elfsigncmp - -LIBOBJS= elfcertlib.o elfsignlib.o -OBJS= $(PROG).o $(LIBOBJS) - -.PARALLEL: $(OBJS) - -CMDDIR= $(SRC)/cmd/cmd-crypto/elfsign -LIBDIR= $(SRC)/lib/libelfsign/common -SRCS= $(CMDDIR)/$(PROG).c $(LIBOBJS:%.o=$(LIBDIR)/%.c) -CLEANFILES= $(PROG) $(OBJS) $(SHFILES) - -include ../../../src/tools/Makefile.tools - -CFLAGS += $(CCVERBOSE) -CFLAGS += -_gcc=-fasm - -CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -CPPFLAGS += -I$(SRC)/lib/libelfsign/common -CPPFLAGS += -I$(SRC)/uts/common -CPPFLAGS += -I$(SRC)/lib/libkmf/include -CPPFLAGS += -I$(SRC)/lib/libcryptoutil/common -LDFLAGS += -lmd -lelf -lkmf -lcryptoutil -lc - -CERRWARN += -_gcc=-Wno-unused - -.KEEP_STATE: - -all: $(PROG) $(SHFILES) - -install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDSHFILES) - -$(PROG): $(OBJS) - $(LINK.c) -o $@ $(OBJS) $(LDLIBS) - $(POST_PROCESS) - -%.o: $(CMDDIR)/%.c - $(COMPILE.c) -o $@ $< - -%.o: $(LIBDIR)/%.c - $(COMPILE.c) -o $@ $< - -lint: lint_SRCS - -clean: - $(RM) $(CLEANFILES) - -include ../../../src/tools/Makefile.targ diff --git a/usr/src/tools/elfsign/elfsigncmp.sh b/usr/src/tools/elfsign/elfsigncmp.sh deleted file mode 100644 index 97f046a166..0000000000 --- a/usr/src/tools/elfsign/elfsigncmp.sh +++ /dev/null @@ -1,114 +0,0 @@ -#! /usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -prog=$0 -pd=`dirname $prog` -MACH=`uname -p` -elfcmp=$pd/elfcmp -elfsign=$pd/$MACH/elfsign - -aopt= -copt= -eopt= -Fopt= -kopt= -vopt= - -Usage() { - echo "Usage: $prog {sign|verify} [-v] [-a]" \ - "[-c <cert>] [-k <key>] [-F <format>] -e <elf>" 1>&2 - exit 1 -} - -if [ $# -lt 1 ]; then - Usage - fi -cmd=$1 -shift - -while getopts "ac:e:F:k:v" opt ; do - case $opt in - a) aopt=-a;; - c) copt="$OPTARG";; - e) eopt="$OPTARG";; - F) Fopt="$OPTARG";; - k) kopt="$OPTARG";; - v) vopt=-v;; - \?) Usage;; - esac -done - -case X$eopt in X) Usage;; esac - -tmpe=$eopt.e$$ -tmpo=$eopt.o$$ - -cpq() { - cp -p $1 $2 > /dev/null 2>&1 -} - -restore() { - cpq $tmpe $eopt -} - -cleanup() { - restore - rm -f $tmpe $tmpo -} - -trap cleanup 1 2 3 13 15 - -cpq $eopt $tmpe - -eval $elfsign $cmd $aopt $vopt ${copt:+-c} ${copt} ${kopt:+-k} ${kopt} \ - ${Fopt:+-F} ${Fopt} -e ${eopt} -rv=$? - -case $cmd:$rv in -sign:0) - if $elfcmp -v -S $tmpe $eopt > $tmpo 2>&1 - then - : # all's fine - else - rv=$? - echo "Warning: elfcmp failed: $eopt" 1>&2 - cat ${tmpo} 1>&2 - echo "current directory: `pwd`" 1>&2 - restore - cpq ${eopt} ${eopt}.elfcmp.failed.$$ - fi - ;; -sign:*) - restore - cpq ${eopt} ${eopt}.elfsign.failed.$$ - ;; -esac - -rm -f $tmpe $tmpo -exit $rv diff --git a/usr/src/tools/elfsign/inc.flg b/usr/src/tools/elfsign/inc.flg deleted file mode 100644 index 315fa0558d..0000000000 --- a/usr/src/tools/elfsign/inc.flg +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" - -echo_file usr/src/uts/common/sys/crypto/elfsign.h -find_files "s.*.h" \ - usr/src/lib/libcryptoutil/ -find_files "s.*" \ - usr/src/cmd/cmd-crypto/elfsign \ - usr/src/lib/libelfsign/ diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 842c63a295..05f1f726ec 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -518,12 +518,10 @@ function use_tools { GENOFFSETS=${TOOLSROOT}/opt/onbld/bin/genoffsets export GENOFFSETS - if [ "$VERIFY_ELFSIGN" = "y" ]; then - ELFSIGN=${TOOLSROOT}/opt/onbld/bin/elfsigncmp - else - ELFSIGN=${TOOLSROOT}/opt/onbld/bin/${MACH}/elfsign - fi - export ELFSIGN + CTFCONVERT=${TOOLSROOT}/opt/onbld/bin/${MACH}/ctfconvert + export CTFCONVERT + CTFMERGE=${TOOLSROOT}/opt/onbld/bin/${MACH}/ctfmerge + export CTFMERGE PATH="${TOOLSROOT}/opt/onbld/bin/${MACH}:${PATH}" PATH="${TOOLSROOT}/opt/onbld/bin:${PATH}" @@ -537,7 +535,8 @@ function use_tools { echo "\n==== New environment settings. ====\n" >> $LOGFILE echo "STABS=${STABS}" >> $LOGFILE echo "CTFSTABS=${CTFSTABS}" >> $LOGFILE - echo "ELFSIGN=${ELFSIGN}" >> $LOGFILE + echo "CTFCONVERT=${CTFCONVERT}" >> $LOGFILE + echo "CTFMERGE=${CTFMERGE}" >> $LOGFILE echo "PATH=${PATH}" >> $LOGFILE echo "ONBLD_TOOLS=${ONBLD_TOOLS}" >> $LOGFILE } @@ -560,7 +559,7 @@ function staffer { # Verify that the closed bins are present # function check_closed_bins { - if [[ ! -d "$ON_CLOSED_BINS" ]]; then + if [[ -n "$ON_CLOSED_BINS" && ! -d "$ON_CLOSED_BINS" ]]; then echo "ON_CLOSED_BINS must point to the closed binaries tree." build_ok=n exit 1 @@ -1010,14 +1009,6 @@ mkdir -p $TMPDIR || exit 1 chmod 777 $TMPDIR # -# Keep elfsign's use of pkcs11_softtoken from looking in the user home -# directory, which doesn't always work. Needed until all build machines -# have the fix for 6271754 -# -SOFTTOKEN_DIR=$TMPDIR -export SOFTTOKEN_DIR - -# # Tools should only be built non-DEBUG. Keep track of the tools proto # area path relative to $TOOLS, because the latter changes in an # export build. @@ -1359,27 +1350,6 @@ if [ "$w_FLAG" = "y" -a ! -d $ROOT ]; then w_FLAG=n fi -if [ "$t_FLAG" = "n" ]; then - # - # We're not doing a tools build, so make sure elfsign(1) is - # new enough to safely sign non-crypto binaries. We test - # debugging output from elfsign to detect the old version. - # - newelfsigntest=`SUNW_CRYPTO_DEBUG=stderr /usr/bin/elfsign verify \ - -e /usr/lib/security/pkcs11_softtoken.so.1 2>&1 \ - | egrep algorithmOID` - if [ -z "$newelfsigntest" ]; then - echo "WARNING: /usr/bin/elfsign out of date;" \ - "will only sign crypto modules\n" | \ - tee -a $mail_msg_file >> $LOGFILE - export ELFSIGN_OBJECT=true - elif [ "$VERIFY_ELFSIGN" = "y" ]; then - echo "WARNING: VERIFY_ELFSIGN=y requires" \ - "the -t flag; ignoring VERIFY_ELFSIGN\n" | \ - tee -a $mail_msg_file >> $LOGFILE - fi -fi - case $MULTI_PROTO in yes|no) ;; *) diff --git a/usr/src/uts/Makefile.targ b/usr/src/uts/Makefile.targ index 92955e139f..0fb7bb8a90 100644 --- a/usr/src/uts/Makefile.targ +++ b/usr/src/uts/Makefile.targ @@ -21,6 +21,7 @@ # # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2015, Joyent, Inc. +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> # # This Makefiles contains the common targets and definitions for @@ -49,14 +50,11 @@ $(OBJECTS): $(INLINES) # # Partially link .o files to generate the kmod. The fake dependency # on modstubs simplifies things... -# ELFSIGN_MOD is defined in the individual KCF plug-in modules Makefiles, -# and will sign the ELF objects using elfsign(1). # $(BINARY): $(OBJECTS) $(DTRACE_MAPFILE) $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS) $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX) $(POST_PROCESS) - $(ELFSIGN_MOD) # # This target checks each kmod for undefined entry points. It does not diff --git a/usr/src/uts/intel/aes/Makefile b/usr/src/uts/intel/aes/Makefile index b2b6ee68f3..d48f310aaa 100644 --- a/usr/src/uts/intel/aes/Makefile +++ b/usr/src/uts/intel/aes/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -49,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/arcfour/Makefile b/usr/src/uts/intel/arcfour/Makefile index 8411182355..ba66fafbe1 100644 --- a/usr/src/uts/intel/arcfour/Makefile +++ b/usr/src/uts/intel/arcfour/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -49,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/blowfish/Makefile b/usr/src/uts/intel/blowfish/Makefile index bc4746e129..97ddabc38e 100644 --- a/usr/src/uts/intel/blowfish/Makefile +++ b/usr/src/uts/intel/blowfish/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/dca/Makefile b/usr/src/uts/intel/dca/Makefile index 1ccc3e9bbc..a1ff33c62a 100644 --- a/usr/src/uts/intel/dca/Makefile +++ b/usr/src/uts/intel/dca/Makefile @@ -20,6 +20,8 @@ # # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -49,9 +51,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/des/Makefile b/usr/src/uts/intel/des/Makefile index e9512fabe6..2c8045b380 100644 --- a/usr/src/uts/intel/des/Makefile +++ b/usr/src/uts/intel/des/Makefile @@ -21,6 +21,8 @@ # # uts/intel/des/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/dprov/Makefile b/usr/src/uts/intel/dprov/Makefile index 4ecb5915ef..b0e2a55091 100644 --- a/usr/src/uts/intel/dprov/Makefile +++ b/usr/src/uts/intel/dprov/Makefile @@ -19,6 +19,8 @@ # CDDL HEADER END # # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -53,9 +55,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/ecc/Makefile b/usr/src/uts/intel/ecc/Makefile index 9d3c1bce9e..3302d43e23 100644 --- a/usr/src/uts/intel/ecc/Makefile +++ b/usr/src/uts/intel/ecc/Makefile @@ -19,6 +19,8 @@ # CDDL HEADER END # # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/intel/rsa/Makefile b/usr/src/uts/intel/rsa/Makefile index e05d3e307d..cf9ba78959 100644 --- a/usr/src/uts/intel/rsa/Makefile +++ b/usr/src/uts/intel/rsa/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/intel/Makefile.intel -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/aes/Makefile b/usr/src/uts/sparc/aes/Makefile index c452dfeb6d..eae7c2dce7 100644 --- a/usr/src/uts/sparc/aes/Makefile +++ b/usr/src/uts/sparc/aes/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -46,9 +47,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/arcfour/Makefile b/usr/src/uts/sparc/arcfour/Makefile index f131035d48..7bfbdfc7ce 100644 --- a/usr/src/uts/sparc/arcfour/Makefile +++ b/usr/src/uts/sparc/arcfour/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -46,9 +47,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/blowfish/Makefile b/usr/src/uts/sparc/blowfish/Makefile index b7dfdc8fe6..88d56bb251 100644 --- a/usr/src/uts/sparc/blowfish/Makefile +++ b/usr/src/uts/sparc/blowfish/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -47,9 +48,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/dca/Makefile b/usr/src/uts/sparc/dca/Makefile index bea36330f6..f4420ccd16 100644 --- a/usr/src/uts/sparc/dca/Makefile +++ b/usr/src/uts/sparc/dca/Makefile @@ -20,6 +20,8 @@ # # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -49,9 +51,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/des/Makefile b/usr/src/uts/sparc/des/Makefile index 90bc58b943..abf71ab827 100644 --- a/usr/src/uts/sparc/des/Makefile +++ b/usr/src/uts/sparc/des/Makefile @@ -21,6 +21,8 @@ # # uts/sparc/des/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/dprov/Makefile b/usr/src/uts/sparc/dprov/Makefile index 330fd4da81..0aa53e059a 100644 --- a/usr/src/uts/sparc/dprov/Makefile +++ b/usr/src/uts/sparc/dprov/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -53,9 +54,6 @@ CONF_SRCDIR = $(UTSBASE)/common/crypto/io # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/ecc/Makefile b/usr/src/uts/sparc/ecc/Makefile index 86170b2387..8876c0ab9e 100644 --- a/usr/src/uts/sparc/ecc/Makefile +++ b/usr/src/uts/sparc/ecc/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sparc/rsa/Makefile b/usr/src/uts/sparc/rsa/Makefile index 88a8cb52bd..ea61e30cea 100644 --- a/usr/src/uts/sparc/rsa/Makefile +++ b/usr/src/uts/sparc/rsa/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -48,9 +49,6 @@ ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/aes/Makefile b/usr/src/uts/sun4u/aes/Makefile index b74906bbc7..8042737faa 100644 --- a/usr/src/uts/sun4u/aes/Makefile +++ b/usr/src/uts/sun4u/aes/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/aes/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -50,9 +52,6 @@ ROOTMODULE = $(ROOT_US3_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/arcfour/Makefile b/usr/src/uts/sun4u/arcfour/Makefile index 4eca278804..239cc9631e 100644 --- a/usr/src/uts/sun4u/arcfour/Makefile +++ b/usr/src/uts/sun4u/arcfour/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/arcfour/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_PSM_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4u/des/Makefile b/usr/src/uts/sun4u/des/Makefile index 50ce1ffb01..e4b2fa80d0 100644 --- a/usr/src/uts/sun4u/des/Makefile +++ b/usr/src/uts/sun4u/des/Makefile @@ -21,6 +21,8 @@ # # uts/sun4u/des/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -54,9 +56,6 @@ LINK_TARGET = $(TARGET_$(CLASS)) # include $(UTSBASE)/sun4u/Makefile.sun4u -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # diff --git a/usr/src/uts/sun4v/arcfour/Makefile b/usr/src/uts/sun4v/arcfour/Makefile index d8d34256e1..d97ef72d2d 100644 --- a/usr/src/uts/sun4v/arcfour/Makefile +++ b/usr/src/uts/sun4v/arcfour/Makefile @@ -21,6 +21,8 @@ # # uts/sun4v/arcfour/Makefile # +# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,9 +50,6 @@ ROOTMODULE = $(ROOT_PSM_CRYPTO_DIR)/$(MODULE) # include $(UTSBASE)/sun4v/Makefile.sun4v -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - # # Define targets # |