Re: Add missing manpage for smtpd

[Larry Hynes]

Hi

Crystal Kolipe  wrote:
> I sent this to bugs@ a while back, but it seems to have been missed.
> 
> smtpd-filters.7 is not installed by default.
> 
> --- usr.sbin/smtpd/smtpd/Makefile.distWed Apr 21 04:54:10 2021
> +++ usr.sbin/smtpd/smtpd/Makefile Mon Oct 25 11:54:39 2021
> @@ -76,7 +76,7 @@
>  
>  SRCS+=   stat_ramstat.c
>  
> -MAN= sendmail.8 smtpd.8 smtpd.conf.5 table.5
> +MAN= sendmail.8 smtpd-filters.7 smtpd.8 smtpd.conf.5 table.5
>  BINDIR=  /usr/sbin
>  
>  LDADD+=  -levent -lutil -ltls -lssl -lcrypto -lz

Following discussions with jmc@ and gilles@ I'm doing some work on the
English language on smtpd-filters.7 with a view to getting it installed.

Re: OpenSMTPD docs: forward.5

[Larry Hynes]

Jason McIntyre  wrote:
> On Fri, Feb 12, 2021 at 03:15:47PM +0000, Larry Hynes wrote:
> > 
> > Index: forward.5
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/forward.5,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 forward.5
> > --- forward.5   13 Mar 2015 22:41:54 -  1.9
> > +++ forward.5   12 Feb 2021 15:14:44 -
> > @@ -49,10 +49,10 @@ group or world-writable;
> >  if the home directory is group writeable;
> >  or if the file is not owned by the user.
> >  .Pp
> > -Users should avoid editing directly the
> > +Users should avoid editing the
> >  .Nm .forward
> > -file to prevent delivery failures from occurring if a message
> > -arrives while the file is not fully written.
> > +file directly, to prevent delivery failures from occurring if
> > +a message arrives while the file is not fully written.
> >  The best option is to use a temporary file and use the
> >  .Xr mv 1
> >  command to atomically overwrite the former
> > 
> 
> fixed, thanks.
> jmc

I meant to note that 'mandoc -Tlint' gives the following gripe about
forward.5:

forward.5:40:13: STYLE: no blank before trailing delimiter:
Pq :include:

It can be "fixed" by escaping the closing ':' at EOL with '\&' but I
don't know if that's correct (or worth it).

OpenSMTPD docs: smtpd.conf.5

[Larry Hynes]

Index: smtpd.conf.5
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
retrieving revision 1.256
diff -u -p -r1.256 smtpd.conf.5
--- smtpd.conf.527 Jan 2021 14:59:10 -  1.256
+++ smtpd.conf.512 Feb 2021 15:28:04 -
@@ -184,7 +184,7 @@ Specify how long a message may remain in
 .It Cm user Ar username
 Specify the
 .Ar username
-for performing the delivery, to be looked up with
+to perform the delivery, looked up with
 .Xr getpwnam 3 .
 .Pp
 This is used for virtual hosting where a single username
@@ -202,7 +202,7 @@ function.
 .Pp
 The
 .Cm userbase
-does not apply for the
+does not apply to the
 .Cm user
 option.
 .It Cm virtual Pf < Ar table Ns >
@@ -322,13 +322,13 @@ If the list contains more than one addre
 in such a way that traffic is routed as efficiently as possible.
 .El
 .It Ic admd Ar authservid
-The Administrative Management Domain this mailserver belongs to.
+The Administrative Management Domain this mail server belongs to.
 The authservid will be forwarded to filters using it to identify or mark
 authentication-results headers.
 If omitted it defaults to the server name.
 .It Ic bounce Cm warn-interval Ar delay Op , Ar delay ...
 Send warning messages to the envelope sender when temporary delivery
-failures cause a message to remain on the queue for longer than
+failures cause a message to remain in the queue for longer than
 .Ar delay .
 Each
 .Ar delay
@@ -359,11 +359,11 @@ directive.
 .It Ic filter Ar chain-name Ic chain Brq Ar filter-name Op , Ar ...
 Register a chain of filters
 .Ar chain-name ,
-consisting of the filters listed from
+consisting of the filters listed in
 .Ar filter-name .
-Filters part of a filter chain are executed in order of declaration for
-each phase that they are registered for.
-A filter chain may be used in place of a filter for any directive but
+Filters in a filter chain are executed in order of declaration
+for each phase that they are registered for.
+A filter chain may be used in place of a filter for any directive except
 filter chains themselves.
 .It Ic filter Ar filter-name Ic phase Ar phase-name Ic match Ar conditions 
decision
 Register a filter
@@ -372,8 +372,9 @@ A
 .Ar decision
 about what to do with the mail is taken at phase
 .Ar phase-name
-when matching
-.Ar conditions .
+when
+.Ar conditions
+are matched.
 Phases, matching conditions, and decisions are described in
 .Sx MAIL FILTERING ,
 below.
@@ -387,15 +388,15 @@ backed by the
 process.
 .It Ic filter Ar filter-name Ic proc-exec Ar command
 Register and execute
-.Qq proc
+.Ar command
+as
+.Qq proc-exec
 filter
-.Ar filter-name
-from
-.Ar command .
+.Ar filter-name .
 If
 .Ar command
 starts with a slash it is executed with an absolute path,
-else it will be run from
+otherwise it will be run from
 .Dq /usr/local/libexec/smtpd/ .
 .It Ic include Qq Ar pathname
 Replace this directive with the content of the additional configuration
@@ -404,7 +405,7 @@ file at the absolute
 .It Ic listen on Ar interface Oo Ar family Oc Op Ar options
 Listen on the
 .Ar interface
-for incoming connections, using the same syntax as for
+for incoming connections, using the same syntax as
 .Xr ifconfig 8 .
 The
 .Ar interface
@@ -461,7 +462,7 @@ Override the server name for specific ad
 The
 .Ar names
 table contains a mapping of IP addresses to hostnames.
-If the address on which the connection arrives appears in the mapping,
+If the address on which the connection is made appears in the mapping,
 the associated hostname is used.
 .It Cm mask-src
 Omit the
@@ -485,7 +486,7 @@ Listen on the given
 instead of the default port 25.
 .It Cm proxy-v2
 Support the PROXYv2 protocol,
-rewriting appropriately source address received from proxy.
+appropriately rewriting the source address passed from the proxy.
 .It Cm received-auth
 In
 .Dq Received
@@ -555,7 +556,8 @@ matching envelope, and atomically save t
 spool for later processing by the respective dispatcher
 .Ar name .
 .Pp
-The following matching options are supported and can all be negated:
+The following session matching options are supported and can all
+be negated:
 .Bl -tag -width Ds
 .It Xo
 .Op Ic \&!
@@ -691,7 +693,7 @@ Specify that session may only originate 
 which can be a specific address or a subnet expressed in CIDR-notation.
 .El
 .Pp
-In addition, the following transaction options:
+In addition, the following transaction options may be matched:
 .Bl -tag -width Ds
 .It Xo
 .Op Ic \&!
@@ -731,14 +733,14 @@ Specify that session's HELO / EHLO shoul
 .Cm mail-from
 .Ar sender | Pf < Ar sender Ns >
 .Xc
-Specify that transactions's MAIL FROM should match the string or list table
+Specify that transaction's MAIL FROM should match the string or list table
 .Ar sender .
 .It Xo
 .Op Ic \&!
 .Cm mail-from regex
 .Ar sender | Pf < Ar sender Ns >
 .Xc
-Specify that transactions's MAIL FROM should match the regex or regex table
+Specify that transaction's MAIL FROM 

OpenSMTPD docs: table.5

[Larry Hynes]

Index: table.5
===
RCS file: /cvs/src/usr.sbin/smtpd/table.5,v
retrieving revision 1.11
diff -u -p -r1.11 table.5
--- table.5 11 Aug 2019 13:00:57 -  1.11
+++ table.5 12 Feb 2021 15:29:25 -
@@ -52,7 +52,7 @@ value3
 .Ed
 .Pp
 A mapping will be written with each key and value on a line,
-whitespaces separating both columns:
+whitespace separating both columns:
 .Bd -literal -offset indent
 key1   value1
 key2   value2
@@ -90,7 +90,7 @@ user3 otheru...@example.com
 .Ed
 .Pp
 In a virtual domain context, the key is either a user part, a full email
-address or a catch all, following selection rules described in
+address or a catch-all, following selection rules described in
 .Xr smtpd.conf 5 ,
 and the value is one or many recipients as described in
 .Xr aliases 5 :
@@ -164,7 +164,7 @@ They can only be used in the following c
 When used as a "from source", the address of a client is compared to the list
 of addresses in the table until a match is found.
 .Pp
-A netaddr table can contain exact addresses or netmasks, and looks as follow:
+A netaddr table can contain exact addresses or netmasks, as follows:
 .Bd -literal -offset indent
 192.168.1.1
 ::1
@@ -172,7 +172,7 @@ ipv6:::1
 192.168.1.0/24
 .Ed
 .Ss Userinfo tables
-User info tables are used in rule context to specify an alternate user base,
+Userinfo tables are used in a rule context to specify an alternate userbase,
 mapping virtual users to local system users by UID, GID and home directory.
 .Pp
 .D1 Ic action Ar name method Cm userbase Pf < Ar table Ns >
@@ -234,15 +234,15 @@ user@*.domain
 .Ed
 .Ss Addrname tables
 Addrname tables are used to map IP addresses to hostnames.
-They can be used in both listen context and relay context:
+They can be used in both listen and relay contexts:
 .Bd -unfilled -offset indent
 .Ic listen on Ar interface Cm hostnames Pf < Ar table Ns >
 .Ic action Ar name Cm relay helo\-src Pf < Ar table Ns >
 .Ed
 .Pp
-In listen context, the table is used to look up the server name to advertise
+In a listen context, the table is used to look up the server name to advertise
 depending on the local address of the socket on which a connection is accepted.
-In relay context, the table is used to determine the hostname for the HELO
+In a relay context, the table is used to determine the hostname for the HELO
 sequence of the SMTP protocol, depending on the local address used for the
 outgoing connection.
 .Pp

OpenSMTPD docs: smtp.1

[Larry Hynes]

Note: the command 'smtp -h' only returns usage. Usage exits with '1'
(I assume this is to satisfy the default case in switch (ch) in
main()), even when called from the correct use of the '-h' flag,
which I don't think is correct.

Index: smtp.1
===
RCS file: /cvs/src/usr.sbin/smtpd/smtp.1,v
retrieving revision 1.8
diff -u -p -r1.8 smtp.1
--- smtp.1  21 Dec 2020 11:48:38 -  1.8
+++ smtp.1  12 Feb 2021 17:30:55 -
@@ -58,7 +58,7 @@ Default to the current username.
 .It Fl H Ar helo
 Define the hostname to advertise (HELO) when establishing the SMTP session.
 .It Fl h
-Display version and usage.
+Display usage.
 .It Fl n
 Do not actually execute a transaction,
 just try to establish an SMTP session and quit.

OpenSMTPD docs: smtpctl.8

[Larry Hynes]

Index: smtpctl.8
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpctl.8,v
retrieving revision 1.65
diff -u -p -r1.65 smtpctl.8
--- smtpctl.8   14 Sep 2020 09:48:08 -  1.65
+++ smtpctl.8   12 Feb 2021 15:22:58 -
@@ -172,8 +172,8 @@ Status of last delivery.
 .It Cm show message Ar envelope-id
 Display message content for the given ID.
 .It Cm show queue
-Display information concerning envelopes that are currently in the queue.
-Each line of output describes a single envelope.
+Display information about envelopes that are currently in the queue.
+Each line of output relates to a single envelope.
 It consists of the following fields, separated by a "|":
 .Pp
 .Bl -bullet -compact
@@ -239,7 +239,7 @@ The route has a timeout registered to lo
 reactivate or discard it.
 .El
 .It Cm show stats
-Displays runtime statistics concerning
+Displays runtime statistics for
 .Xr smtpd 8 .
 .It Cm show status
 Shows if MTA, MDA and SMTP systems are currently running or paused.

OpenSMTPD docs: makemap.8

[Larry Hynes]

Note: DNS is mentioned in this file as a way of accessing maps. Aside
from this mention it appears to be undocumented.

Index: makemap.8
===
RCS file: /cvs/src/usr.sbin/smtpd/makemap.8,v
retrieving revision 1.30
diff -u -p -r1.30 makemap.8
--- makemap.8   25 Nov 2018 14:41:16 -  1.30
+++ makemap.8   12 Feb 2021 15:17:42 -
@@ -29,17 +29,18 @@
 .Op Fl t Ar type
 .Ar file
 .Sh DESCRIPTION
-Maps provide a generic interface for associating textual key to a value.
-Such associations may be accessed through a plaintext file, database, or DNS.
+Maps provide a generic interface for associating keys with values.
+The resultant values may be accessed through a plain text file,
+database, or DNS.
 The format of these file types is described below.
 .Nm
-itself creates the database maps used by keyed map lookups specified in
+creates the database maps used for lookups specified in
 .Xr smtpd.conf 5 .
 .Pp
 .Nm
 reads input from
 .Ar file
-and writes data to a file whose name is made by adding a
+and, by default, writes data to a file which is named by adding a
 .Dq .db
 suffix to
 .Ar file .
@@ -76,7 +77,7 @@ Specify the format of the resulting map 
 The default map format is suitable for storing simple, unstructured,
 key-to-value string associations.
 However, if the mapped value has special meaning,
-as in the case of the virtual domains file,
+as in the case of a virtual domains file,
 a suitable
 .Ar type
 must be provided.
@@ -94,15 +95,14 @@ This format can be used for building pri
 .It Fl U
 Instead of generating a database map from text input,
 dump the contents of a database map as text
-with the key and value separated with a tab.
+with the key and value separated by a tab.
 .El
 .Sh PRIMARY DOMAINS
-Primary domains can be kept in tables.
 To create a primary domain table, add each primary domain on a
 single line by itself.
 .Pp
 In addition to adding an entry to the primary domain map,
-one must add a filter rule that accepts mail for the domain
+one must add a match directive that accepts mail for the domain
 map, for example:
 .Bd -literal -offset indent
 table domains db:/etc/mail/domains.db
@@ -112,11 +112,10 @@ action "local" mbox
 match for domain  action "local"
 .Ed
 .Sh VIRTUAL DOMAINS
-Virtual domains may also be kept in tables.
 To create a virtual domain table, add each virtual domain on a
 single line by itself.
 .Pp
-Virtual domains expect a mapping of virtual users to real users
+Virtual domains expect a mapping of virtual to real users
 in order to determine if a recipient is accepted or not.
 The mapping format is an extension to
 .Xr aliases 5 ,
@@ -130,17 +129,17 @@ to provide a catch-all for the specified
 .Dq @
 to provide a global catch-all for all domains.
 .Xr smtpd 8
-will perform the lookups in that specific order.
+will perform lookups in that order.
 .Pp
-To create single virtual address, add
+To create a single virtual address, add
 .Dq u...@example.com user
-to the users map.
-To handle all mail destined to any user at example.com, add
+to the user map.
+To handle all mail addressed to any user at example.com, add
 .Dq @example.com user
 to the virtual map.
 .Pp
 In addition to adding an entry to the virtual map,
-one must add a filter rule that accepts mail for virtual domains,
+one must add a match directive that accepts mail for virtual domains,
 for example:
 .Bd -literal -offset indent
 table vdomains db:/etc/mail/vdomains.db

OpenSMTPD docs: newaliases.8

[Larry Hynes]

Index: newaliases.8
===
RCS file: /cvs/src/usr.sbin/smtpd/newaliases.8,v
retrieving revision 1.12
diff -u -p -r1.12 newaliases.8
--- newaliases.820 Jul 2018 15:35:33 -  1.12
+++ newaliases.812 Feb 2021 15:21:00 -
@@ -27,7 +27,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility makes changes to the mail aliases file visible to
+utility updates a mail aliases file in use by
 .Xr smtpd 8 .
 It should be run every time the
 .Xr aliases 5

OpenSMTPD docs: mail.maildir.8

[Larry Hynes]

Index: mail.maildir.8
===
RCS file: /cvs/src/usr.sbin/smtpd/mail.maildir.8,v
retrieving revision 1.5
diff -u -p -r1.5 mail.maildir.8
--- mail.maildir.8  30 May 2018 12:37:57 -  1.5
+++ mail.maildir.8  12 Feb 2021 15:16:19 -
@@ -36,7 +36,8 @@ located in the user's home directory.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl j
-Scan message for X-Spam and move to Junk folder if result is positive.
+Scan message for an X-Spam header and move to Junk folder if the
+result is positive.
 .El
 .Sh EXIT STATUS
 .Ex -std mail.maildir

OpenSMTPD docs: forward.5

[Larry Hynes]

Index: forward.5
===
RCS file: /cvs/src/usr.sbin/smtpd/forward.5,v
retrieving revision 1.9
diff -u -p -r1.9 forward.5
--- forward.5   13 Mar 2015 22:41:54 -  1.9
+++ forward.5   12 Feb 2021 15:14:44 -
@@ -49,10 +49,10 @@ group or world-writable;
 if the home directory is group writeable;
 or if the file is not owned by the user.
 .Pp
-Users should avoid editing directly the
+Users should avoid editing the
 .Nm .forward
-file to prevent delivery failures from occurring if a message
-arrives while the file is not fully written.
+file directly, to prevent delivery failures from occurring if
+a message arrives while the file is not fully written.
 The best option is to use a temporary file and use the
 .Xr mv 1
 command to atomically overwrite the former

OpenSMTPD docs: aliases.5

[Larry Hynes]

Index: aliases.5
===
RCS file: /cvs/src/usr.sbin/smtpd/aliases.5,v
retrieving revision 1.16
diff -u -p -r1.16 aliases.5
--- aliases.5   23 Apr 2020 21:28:10 -  1.16
+++ aliases.5   12 Feb 2021 15:12:41 -
@@ -25,19 +25,18 @@ This manual page describes the format of
 .Nm
 file, as used by
 .Xr smtpd 8 .
-An alias in its simplest form is used to assign an arbitrary name
-to an email address, or a group of email addresses.
-This provides a convenient way to send mail.
-For example an alias could refer to all users of a group:
+An alias, in its simplest form, is used to assign an arbitrary name
+to an email address or a group of email addresses.
+For example, an alias can refer to all users in a group:
 email to that alias would be sent to all members of the group.
-Much more complex aliases can be defined however:
+More complex aliases can be defined, however:
 an alias can refer to other aliases,
-be used to send mail to a file instead of another person,
+be used to write mail to a file,
 or to execute various commands.
 .Pp
 Within the file,
 .Ql #
-is a comment delimiter; anything placed after it is discarded.
+is a comment delimiter; anything placed after it is ignored.
 The file consists of key/value mappings of the form:
 .Bd -filled -offset indent
 key: value1, value2, value3, ...

dhclient.conf - correct typo

[Larry Hynes]

seonds -> seconds

Index: sbin/dhclient/dhclient.conf.5
===
RCS file: /cvs/src/sbin/dhclient/dhclient.conf.5,v
retrieving revision 1.50
diff -u -p -r1.50 dhclient.conf.5
--- sbin/dhclient/dhclient.conf.5   10 Feb 2020 13:18:20 -  1.50
+++ sbin/dhclient/dhclient.conf.5   17 Jul 2020 21:40:44 -
@@ -89,7 +89,7 @@ Sets the number of seconds to wait for a
 If no lease is received the first valid lease in
 .Xr dhclient.leases 5
 will be used.
-The default is 30 seonds.
+The default is 30 seconds.
 .El
 .Sh DHCP OPTION DECLARATIONS
 .Bl -tag -width Ds

typo in www/faq/current.html - libxkbui...

[Larry Hynes]

Hi

# rm /usr/X11R6/include/extenstions/XKBui.h

does not look right to me.

1. The spelling of extensions is incorrect
2. I think /usr/X11R6/include/X11/extensions/XKBui.h
   is the correct path

Index: faq/current.html
===
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1047
diff -u -p -r1.1047 current.html
--- faq/current.html10 Jul 2020 06:04:41 -  1.1047
+++ faq/current.html11 Jul 2020 14:17:46 -
@@ -106,7 +106,7 @@ It should be manually removed.
 
 # rm /usr/X11R6/lib/libxkbui.*
 # rm /usr/X11R6/lib/pkgconfig/xkbui.pc
-# rm /usr/X11R6/include/extenstions/XKBui.h
+# rm /usr/X11R6/include/X11/extensions/XKBui.h
 
 

[drm] *ERROR* fifo underrun in recent snapshots

[Larry Hynes]

Hi

Running -current on a Lenovo G500 (dmesg below) recent snaps give the
following error messages on boot:

Jun 18 22:11:37 alegreya /bsd: drm:pid80480:ivb_set_fifo_underrun_reporting *ERR
OR* [drm] *ERROR* uncleared fifo underrun on pipe A
Jun 18 22:11:37 alegreya /bsd: drm:pid80480:intel_cpu_fifo_underrun_irq_handler 
*ERROR* [drm] *ERROR* CPU pipe A FIFO underrun
Jun 18 22:11:37 alegreya /bsd: drm:pid80480:cpt_set_fifo_underrun_reporting 
*ERROR* [drm] *ERROR* uncleared pch fifo underrun on pch transcoder A
Jun 18 22:11:37 alegreya /bsd: drm:pid80480:intel_pch_fifo_underrun_irq_handler 
*ERROR* [drm] *ERROR* PCH transcoder A FIFO underrun

Doesn't seem to be affecting performance and, to date, there are no
further errors reported after boot. I'm guessing this is related to
recent inteldrm changes.

OpenBSD 6.7-current (GENERIC.MP) #279: Thu Jun 18 11:27:20 MDT 2020
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8432627712 (8041MB)
avail mem = 8162107392 (7783MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xcaebc000 (59 entries)
bios0: vendor LENOVO version "78CN19WW(V1.07)" date 07/04/2013
bios0: LENOVO 20236
acpi0 at bios0: ACPI 5.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SLIC UEFI ASF! HPET APIC MCFG SSDT BOOT ASPT DBGP FPDT 
MSDM SSDT SSDT BGRT
acpi0: wakeup devices P0P1(S0) EHC1(S3) EHC2(S3) XHC_(S3) HDEF(S0) PXSX(S3) 
PXSX(S3) PXSX(S3) PXSX(S3) RP05(S0) PXSX(S3) RP06(S0) PXSX(S3) RP07(S0) 
PXSX(S3) RP08(S0) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i3-3110M CPU @ 2.40GHz, 2394.89 MHz, 06-3a-09
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,XSAVE,AVX,F16C,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.1.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM) i3-3110M CPU @ 2.40GHz, 2394.57 MHz, 06-3a-09
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,XSAVE,AVX,F16C,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: Intel(R) Core(TM) i3-3110M CPU @ 2.40GHz, 2394.57 MHz, 06-3a-09
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,XSAVE,AVX,F16C,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i3-3110M CPU @ 2.40GHz, 2394.57 MHz, 06-3a-09
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,XSAVE,AVX,F16C,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 0 pa 0xfec0, version 20, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xf000, bus 0-63
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (P0P1)
acpiprt2 at acpi0: bus 1 (RP01)
acpiprt3 at acpi0: bus 2 (RP02)
acpiprt4 at acpi0: bus -1 (RP03)
acpiprt5 at acpi0: bus -1 (RP04)
acpiprt6 at acpi0: bus -1 (RP05)
acpiprt7 at acpi0: bus -1 (RP06)
acpiprt8 at acpi0: bus -1 (RP07)
acpiprt9 at acpi0: bus -1 (RP08)
acpiprt10 at acpi0: bus -1 (PEG0)
acpiprt11 at acpi0: bus -1 (PEG1)
acpiprt12 at acpi0: bus -1 (PEG2)
acpiprt13 at acpi0: bus -1 (PEG3)
acpiec0 at acpi0
acpicpu0 at acpi0: C2(350@80 mwait.1@0x20), C1(1000@1 mwait.1), PSS
acpicpu1 at acpi0: C2(350@80 mwait.1@0x20), C1(1000@1 mwait.1), PSS
acpicpu2 at acpi0: C2(350@80 mwait.1@0x20), C1(1000@1 mwait.1), PSS
acpicpu3 at acpi0: C2(350@80 mwait.1@0x20), C1(1000@1 mwait.1), PSS
acpitz0 at acpi0: critical temperature is 127 degC
acpipci0 at acpi0 

Re: login.conf - corrections to English language

[Larry Hynes]

Jason McIntyre  wrote:
> On Fri, May 31, 2019 at 10:20:16PM +0100, Larry Hynes wrote:
> > - Use "user's password" (instead of "users password") consistently
> 
> agreed
> 
> > - Change "to be read something like" to "to something like"
> 
> i think it was probably intended to be "to read something like", which i
> think reads better than your proposal.
> 
> > - Change "Be sure reset" to "Be sure to reset" (I'm not sure if line
> >   length is an issue here, so I deleted the arguably superfluous "back"
> >   from "reset these vales back", in case it is)
> 
> agreed
> 
> > Following is a patch for etc.amd64/login.conf against -current. If/when
> > there is agreement on the proposed changes, I will send patches for
> > other archs.
> 
> if you can update per second comment and do for all archs, it's ok me.
> if no one else picks it up, i'll commit myself.

Thanks Jason

Following are diffs for all archs, as per above.

Index: login.conf
===
RCS file: /cvs/src/etc/etc.alpha/login.conf,v
retrieving revision 1.6
diff -u -p -r1.6 login.conf
--- login.conf  6 Feb 2017 18:11:33 -   1.6
+++ login.conf  31 May 2019 23:32:54 -
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd   Use only the local password file
-# chpass   Do not authenticate, but change users password (change
+# chpass   Do not authenticate, but change user's password (change
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #  :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #  :auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
:ignorenologin:\

Index: login.conf
===
RCS file: /cvs/src/etc/etc.amd64/login.conf,v
retrieving revision 1.10
diff -u -p -r1.10 login.conf
--- login.conf  2 May 2019 08:35:10 -   1.10
+++ login.conf  31 May 2019 23:33:51 -
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd   Use only the local password file
-# chpass   Do not authenticate, but change users password (change
+# chpass   Do not authenticate, but change user's password (change
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #  :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #  :auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
:ignorenologin:\

Index: login.conf
===
RCS file: /cvs/src/etc/etc.arm64/login.conf,v
retrieving revision 1.3
diff -u -p -r1.3 login.conf
--- login.conf  24 Jan 2019 13:14:10 -  1.3
+++ login.conf  31 May 2019 23:34:44 -
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd   Use only the local password file
-# chpass   Do not authenticate, but change users password (change
+# chpass   Do not authenticate, but change user's password (change
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #  :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (e

login.conf – corrections to English language

[Larry Hynes]

Hi

- Use "user's password" (instead of "users password") consistently
- Change "to be read something like" to "to something like"
- Change "Be sure reset" to "Be sure to reset" (I'm not sure if line
  length is an issue here, so I deleted the arguably superfluous "back"
  from "reset these vales back", in case it is)

Following is a patch for etc.amd64/login.conf against -current. If/when
there is agreement on the proposed changes, I will send patches for
other archs.

Index: login.conf
===
RCS file: /cvs/src/etc/etc.amd64/login.conf,v
retrieving revision 1.10
diff -u -p -r1.10 login.conf
--- login.conf  2 May 2019 08:35:10 -   1.10
+++ login.conf  31 May 2019 21:18:56 -
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd   Use only the local password file
-# chpass   Do not authenticate, but change users password (change
+# chpass   Do not authenticate, but change user's password (change
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #  :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to something like: (enables passwd, "myauth", and activ)
 #  :auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
:ignorenologin:\

www/faq/upgrade63.html - add links for macppc

[Larry Hynes]

Index: upgrade63.html
===
RCS file: /cvs/www/faq/upgrade63.html,v
retrieving revision 1.4
diff -u -p -r1.4 upgrade63.html
--- upgrade63.html  3 Apr 2018 12:31:59 -   1.4
+++ upgrade63.html  16 Apr 2018 10:56:48 -
@@ -78,6 +78,7 @@ to the stable b
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/landisk/bsd.rd;>landisk]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/loongson/bsd.rd;>loongson]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/luna88k/bsd.rd;>luna88k]
+[https://cdn.openbsd.org/pub/OpenBSD/6.3/macppc/bsd.rd;>macppc]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/octeon/bsd.rd;>octeon]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/sparc64/bsd.rd;>sparc64]
   SHA256.sig 
@@ -89,6 +90,7 @@ to the stable b
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/landisk/SHA256.sig;>landisk]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/loongson/SHA256.sig;>loongson]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/luna88k/SHA256.sig;>luna88k]
+[https://cdn.openbsd.org/pub/OpenBSD/6.3/macppc/SHA256.sig;>macppc]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/octeon/SHA256.sig;>octeon]
 [https://cdn.openbsd.org/pub/OpenBSD/6.3/sparc64/SHA256.sig;>sparc64]
   

Re: less(1) - segmentation fault with '-g'

[Larry Hynes]

Theo Buehler <t...@math.ethz.ch> wrote:
> On Thu, Jul 27, 2017 at 10:31:51AM +0100, Larry Hynes wrote:
> > Hi
> > 
> > $ env | grep LESS
> > LESSHISTFILE=-
> > LESS="-i -M -R -g -c"
> > LESSCHARSET=utf-8
> > 
> > $ unset LESS
> > $ unset LESSCHARSET
> > $ unset LESSHISTFILE
> > 
> > $ LESS="-g"
> > $ echo 'foo\nbar\nfoo\nbar\nfoo\nbar' | less
> > 
> > While in less, '/' to search, then '^N', or '!', to search for lines
> > which do NOT match the pattern, entering foo results in a seg
> > fault.
> > 
> > This is on amd64. 
> 
> Thanks for the report. Of course you want 'export LESS="-g"' here,
> otherwise less(1) won't use the -g flag which is crucial for this crash.

Ah. I've set 'allexport', so missed that; sorry.

> I don't have a fix, but maybe this helps a bit:

Anton's patches to pattern.c and search.c are working here so far.

less(1) - segmentation fault with '-g'

[Larry Hynes]

Hi

$ env | grep LESS
LESSHISTFILE=-
LESS="-i -M -R -g -c"
LESSCHARSET=utf-8

$ unset LESS
$ unset LESSCHARSET
$ unset LESSHISTFILE

$ LESS="-g"
$ echo 'foo\nbar\nfoo\nbar\nfoo\nbar' | less

While in less, '/' to search, then '^N', or '!', to search for lines
which do NOT match the pattern, entering foo results in a seg
fault.

This is on amd64. I can put the core file somewhere if anyone wants it.

$ uname -a
OpenBSD foo.larryhynes.com 6.1 GENERIC.MP#8 amd64

$ less -V
less (OpenBSD) (POSIX regular expressions)

$ echo $TERM
rxvt-unicode

$ echo $SHELL
/bin/ksh

$ dmesg
OpenBSD 6.1 (GENERIC.MP) #8: Tue Jun 27 08:50:26 CEST 2017

rob...@syspatch-61-amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4278042624 (4079MB)
avail mem = 4143710208 (3951MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xf68d0 (10 entries)
bios0: vendor SeaBIOS version "rel-1.10.1-0-g8891697-prebuilt.qemu-project.org" 
date 04/01/2014
bios0: QEMU Standard PC (i440FX + PIIX, 1996)
acpi0 at bios0: rev 0
acpi0: sleep states S3 S4 S5
acpi0: tables DSDT FACP APIC HPET
acpi0: wakeup devices
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Virtual CPU a7769a6388d5, 2400.34 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,ABM,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,ARAT
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu0: ITLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: DTLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 1000MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Virtual CPU a7769a6388d5, 2400.07 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,ABM,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,ARAT
cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu1: ITLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu1: DTLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu1: smt 0, core 1, package 0
ioapic0 at mainbus0: apid 0 pa 0xfec0, version 11, 24 pins
acpihpet0 at acpi0: 1 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpicpu0 at acpi0: C1(@1 halt!)
acpicpu1 at acpi0: C1(@1 halt!)
"ACPI0006" at acpi0 not configured
"PNP0303" at acpi0 not configured
"PNP0F13" at acpi0 not configured
"PNP0700" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"QEMU0002" at acpi0 not configured
"ACPI0010" at acpi0 not configured
pvbus0 at mainbus0: KVM
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel 82441FX" rev 0x02
pcib0 at pci0 dev 1 function 0 "Intel 82371SB ISA" rev 0x00
pciide0 at pci0 dev 1 function 1 "Intel 82371SB IDE" rev 0x00: DMA, channel 0 
wired to compatibility, channel 1 wired to compatibility
pciide0: channel 0 disabled (no drives)
atapiscsi0 at pciide0 channel 1 drive 0
scsibus1 at atapiscsi0: 2 targets
cd0 at scsibus1 targ 0 lun 0:  ATAPI 5/cdrom removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
uhci0 at pci0 dev 1 function 2 "Intel 82371SB USB" rev 0x01: apic 0 int 11
piixpm0 at pci0 dev 1 function 3 "Intel 82371AB Power" rev 0x03: apic 0 int 9
iic0 at piixpm0
vga1 at pci0 dev 2 function 0 "Cirrus Logic CL-GD5446" rev 0x00
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
virtio0 at pci0 dev 3 function 0 "Qumranet Virtio Network" rev 0x00
vio0 at virtio0: address 56:00:00:64:13:9a
virtio0: msix shared
virtio1 at pci0 dev 4 function 0 "Qumranet Virtio Storage" rev 0x00
vioblk0 at virtio1
scsibus2 at vioblk0: 2 targets
sd0 at scsibus2 targ 0 lun 0:  SCSI3 0/direct fixed
sd0: 61440MB, 512 bytes/sector, 125829120 sectors
virtio1: msix shared
virtio2 at pci0 dev 5 function 0 "Qumranet Virtio Memory" rev 0x00
viomb0 at virtio2
virtio2: apic 0 int 10
virtio3 at pci0 dev 6 function 0 "Qumranet Virtio RNG" rev 0x00
viornd0 at virtio3
virtio3: apic 0 int 10
isa0 at pcib0
isadma0 at isa0
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
fd0 at fdc0 drive 1: density unknown
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
usb0 at uhci0: USB revision 1.0
uhub0 at usb0 

Fix formatting of spamd.conf.5

[Larry Hynes]

Add missing 'e's at EOL for the heise.de message.

Index: spamd.conf.5
===
RCS file: /cvs/src/share/man/man5/spamd.conf.5,v
retrieving revision 1.16
diff -u -p -r1.16 spamd.conf.5
--- spamd.conf.51 Jun 2016 21:57:03 -   1.16
+++ spamd.conf.512 Dec 2016 16:41:06 -
@@ -57,8 +57,8 @@ all:\e
 
 nixspam:\e
:black:\e
-   :msg="Your address %A is in the nixspam list\n\
-   See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\
+   :msg="Your address %A is in the nixspam list\n\e
+   See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\e
:method=http:\e
:file=www.openbsd.org/spamd/nixspam.gz
 

Re: small indentation and spelling diff

[Larry Hynes]

On 2016-11-22, Alexander Bluhm  wrote:
> On Mon, Nov 21, 2016 at 05:36:21PM -0700, Kyle Milz wrote:
>> - * everywhere. It wouldn't surprise me if several stacks accidently
>> + * everywhere. It wouldn't surprise me if several stacks accidentally

> /usr/share/dict/words has both variants.

If /usr/share/dict/words could talk, it might tell you that accidently
is listed as obsolete by the OED, that it is used approximately
1:15 vis-a-vis accidentally in US English and 1:28 in UK (and it
might suggest that a lot of those usages may well have been in
error).

If accidently had a man page it would state that accidently has
been obsoleted by accidentally, which is suggested for normal use.

Small correction to www/faq/faq4.html

[Larry Hynes]

installer verify -> installer to verify

Index: www/faq/faq4.html
===
RCS file: /cvs/www/faq/faq4.html,v
retrieving revision 1.473
diff -u -p -r1.473 faq4.html
--- www/faq/faq4.html   18 Jun 2016 22:22:29 -  1.473
+++ www/faq/faq4.html   15 Jul 2016 18:55:59 -
@@ -602,7 +602,7 @@ their signatures.
 The installXX.iso and installXX.fs images do not contain
 an SHA256.sig file, and the installer will complain that it can't
 check the signatures.
-It is not possible for the installer verify the sets with these images.
+It is not possible for the installer to verify the sets with these images.
 After all, if someone were to make a rogue installXX.iso file,
 they could certainly change the installer to say the files were legitimate.
 Thus, you must verify installer downloads separately.

Corrections to www/faq/faq14.html

[Larry Hynes]

provide -> providing
fail over -> failover
deactivates encrypted volume -> deactivates the encrypted volume

Index: www/faq/faq14.html
===
RCS file: /cvs/www/faq/faq14.html,v
retrieving revision 1.327
diff -u -p -r1.327 faq14.html
--- www/faq/faq14.html  18 Jun 2016 03:40:49 -  1.327
+++ www/faq/faq14.html  15 Jul 2016 12:28:00 -
@@ -615,8 +615,8 @@ This virtual disk is treated as any othe
 Many applications need more redundancy than just the disks, and for some
 applications, RAID can be just added complication, rather than a real
 benefit.
-An example of this is a CARP'd set of firewalls provide complete
-fail over redundancy.
+An example of this is a CARP'd set of firewalls providing complete
+failover redundancy.
 In this case, adding RAID (either via hardware or softraid) is just
 added complication.
 
@@ -934,8 +934,8 @@ and then repeat the last four commands a
 
 The man page for this looks a little scary, as the -d command is
 described as "deleting" the volume.
-In the case of crypto, however, it just deactivates encrypted volume so it
-can't be accessed until it is activated again with the passphrase.
+In the case of crypto, however, it just deactivates the encrypted volume so
+it can't be accessed until it is activated again with the passphrase.
 
 
 

Corrections to www/faq/faq4.html

[Larry Hynes]

Notably Siguature -> Signature and suite -> suit.

CDROM -> CD-ROM.

Delete some extraneous whitespace and remove or insert an occasional period.

Add an occasional 'a'.

I was unsure how to handle 'Here are several options to multibooting',
so I added '...to  multibooting'. This may not match the original
writer's intention.

Faced with a choice between 'On some rare occasions' and 'In some rare
situations', to replace 'In some rare occasions', I opted for the former.

(I generally resisted the urge to express myself.)

Does the following need to be amended to reflect a new default setting
of 'no'?

   You will later be given a chance to create an administrative account
   and disable remote (SSH) access to the root account, but you still
   want a good password on your root account.

I've left it alone.


Index: faq4.html
===
RCS file: /cvs/www/faq/faq4.html,v
retrieving revision 1.361
diff -u -p -r1.361 faq4.html
--- faq4.html   23 Nov 2015 03:16:31 -  1.361
+++ faq4.html   23 Nov 2015 17:59:21 -
@@ -166,7 +166,7 @@ using another computer.

octeon: Network.

-sgi: Network, CDROM.
+sgi: Network, CD-ROM.

socppc: Network.

@@ -288,13 +288,13 @@ installation disk images to choose from:
  create a bootable CD with most popular CD-ROM creation software
  on most platforms.
  This image has the widest selection of drivers, and is usually
-  the recommended choice if your hardware can boot from a CDROM.
+  the recommended choice if your hardware can boot from a CD-ROM.
installXX.iso is an ISO9660 image, containing
  all the standard install files.
  This file can be used to create a CD that can do a stand-alone
  OpenBSD install.
floppyXX.fs (Desktop PC) supports many
-  older machines that lack bootable CDROMs.
+  older machines that lack bootable CD-ROMs.
  Not recommended for modern hardware.
minirootXX.fs is a disk image, can be written to a
  bootable device, such as a USB flash drive, and booted for the install.
@@ -356,14 +356,14 @@ Other Unix-like systems use applications

4.3.2 - Creating floppies

-Creating floppies in OpenBSD can be done with the
+Creating floppies in OpenBSD can be done with
http://www.openbsd.org/cgi-bin/man.cgi?query=fdformatsektion=1;>fdformat(1)
to prep the disk and
-http://www.openbsd.org/cgi-bin/man.cgi?query=ddsektion=0;>dd(1).
+http://www.openbsd.org/cgi-bin/man.cgi?query=ddsektion=0;>dd(1)
to write the image, then
http://www.openbsd.org/cgi-bin/man.cgi?query=cmpsektion=1;>cmp(1)
to verify the write was good.
-Similar process and tools can be used on other Unix platforms.
+A similar process and tools can be used on other Unix platforms.


Creating floppies on Windows can be done with the native low-level
@@ -374,7 +374,7 @@ from the "tools" directory on any of the
4.3.3 - Creating a bootable install flash drive from Unix
A bootable USB flash drive (or a CF/SD/other card, external hard disk,
etc) can be created by installing the target device on a Unix machine
-via any recognized adapters, then copying over the image with dd
+via any recognized adapters, then copying over the image with dd.


Here is an OpenBSD example, assuming the device was recognized as "sd6":
@@ -437,7 +437,7 @@ Use the following command to boot from t



-Usually, you can boot from the CDROM drive of a Sun system from
+Usually, you can boot from the CD-ROM drive of a Sun system from
the boot prompt by typing 'boot cdrom':


@@ -844,7 +844,7 @@ For now, we'll take the defaults on our 



Note that this disk has a pre-existing partition on it -- using "whole"
-disk will remove it!.
+disk will remove it!


Setting up the "whole" disk for OpenBSD does a number of important things:
@@ -904,7 +904,7 @@ OpenBSD partitions on our disk, which we


If the proposed layout is not appropriate for your needs, you can,
-of course, edit the default or customize it completely, more details
+of course, edit the default or customize it completely. More details
on the disklabel partitioning below.


@@ -1015,7 +1015,7 @@ Note that on slow hardware, the "Get/Ver


  Get/Verify SHA256.sig   100% |**|  1534   00:01
-  Siguature Verified
+  Signature Verified
  Verifying  bsd  100% |**| 10292 KB00:05
  Verifying  bsd.rd   100% |**|  6867 KB00:03
  Verifying  base58.tgz   100% |**| 51721 KB00:26
@@ -1225,7 +1225,7 @@ OpenBSD's installer will help you find a
you if you are not sure.
Simply hit "?" at each prompt, and the installer will show you
options.
-If the first level of answers doesn't suite you, pick a continent or
+If the first level of answers doesn't suit you, pick a continent or
country, and look at your options there:


@@ -1333,7 +1333,7 @@ data on it already.

  You will now create a single MBR partition to contain your OpenBSD data. This
  partition must have an id of 'A6'; must *NOT* overlap other partitions; and

Corrections to www/faq/faq5.html

[Larry Hynes]

Notably binares -> binaries, binariies -> binaries.

-Stable -> -stable

'...though can produce...' -> '...though  can produce...'

Index: faq5.html
===
RCS file: /cvs/www/faq/faq5.html,v
retrieving revision 1.217
diff -u -p -r1.217 faq5.html
--- faq5.html   23 Nov 2015 03:16:31 -  1.217
+++ faq5.html   23 Nov 2015 20:06:42 -
@@ -31,7 +31,7 @@

  5.3.1 - Overview
  5.3.2 - Install or upgrade to closest
-available binares
+available binaries
  5.3.3 - Fetching the appropriate source
code
  5.3.4 - Building the kernel
@@ -324,7 +324,7 @@ This is not an issue when properly build

Building OpenBSD from source involves a number of steps:

-Upgrading to the closest available binariies.
+Upgrading to the closest available binaries.
Fetching the appropriate source code.
Building the new kernel and booting from it.
Building "userland" ("make build").
@@ -441,7 +441,7 @@ Once you have a tree, you can update it 




-Following -Stable
+Following -stable

If you wish to check out an alternative "branch" of the tree, such as
the -stable branch, you will use the "-r" modifier to
@@ -972,7 +972,7 @@ Removing device drivers may speed the bo
can complicate recovery should you have a hardware problem, and is
very often done wrong.  
Removing device drivers will not make your system run faster by

-any noticeable amount, though can produce a smaller kernel.
+any noticeable amount, though it can produce a smaller kernel.
Removing debugging and error checking can result in a measurable
performance gain, but will make it impossible to troubleshoot a system
if something goes wrong.

Typo, and consistency, in www/build/mirrors/ftp.html.head

[Larry Hynes]

I *think* www/build/mirrors/ftp.html.head is the correct source to make
corrections for /ftp.html - apologies if I'm mistaken.

This corrects 'sytem' to 'system', and applies consistency to the use of
'CD-ROM'.


Index: ftp.html.head
===
RCS file: /cvs/www/build/mirrors/ftp.html.head,v
retrieving revision 1.23
diff -u -p -r1.23 ftp.html.head
--- ftp.html.head   18 Oct 2015 19:25:30 -  1.23
+++ ftp.html.head   22 Nov 2015 23:50:14 -
@@ -28,14 +28,14 @@ More information is available on our 


If you choose not to buy an OpenBSD CD-ROM, you can also install
-OpenBSD with a CDROM or flash disk you create yourself.
+OpenBSD with a CD-ROM or flash disk you create yourself.
To achieve this, you have to download one of the following ISO or file
-sytem image files from our mirrors:
+system image files from our mirrors:


-  cd58.iso to burn a minimal 5.8 CDROM
+  cd58.iso to burn a minimal 5.8 CD-ROM
   (roughly 8MB in size, boot only)
-  install58.iso to burn a full 5.8 CDROM
+  install58.iso to burn a full 5.8 CD-ROM
   (roughly 230MB in size, boot + sets)
  miniroot58.fs to create a minimal 5.8 boot media
   (for flash or HD image installs -- roughly 5M in size, boot only)

Change PC's to PCs in www/i386.html

[Larry Hynes]

PC's is a possessive form, PCs a plural one: The plural of peecee is
peecees, not peecee's.


Index: i386.html
===
RCS file: /cvs/www/i386.html,v
retrieving revision 1.735
diff -r1.735 i386.html
19c19
< OpenBSD/i386 runs on the standard PC's and clones, with a wide variety
---

OpenBSD/i386 runs on the standard PCs and clones, with a wide variety

48c48
< Machines using custom BIOS (such as older proprietary PC's, laptops, and some
---

Machines using custom BIOS (such as older proprietary PCs, laptops, and some

Re: Cache-Control for httpd

[Larry Hynes]

Tuesday Sep 15 2015, 13:49:27 (+0100), Manuel Giraud :


Questions:
   - Is there any interest?


I'm interested! :D

Apologies if you were looking for interest from httpd devs, I am merely
a humble user. I'm currently using relayd to add an expires header to my
httpd traffic. It's okay, but I would rather handle it from httpd if
possible.

smtpctl(8) - 'sh s' does not appear to be an unambiguous prefix

[Larry Hynes]

From the man page:

   The smtpctl program controls smtpd(8). Commands may be abbreviated
   to the minimum unambiguous prefix; for example, sh s for show stats.

What I would expect:
   # smtpctl sh s
   stats output

What actually happens:
   # smtpctl sh s
   possibilities are:
   show mta
   show envelope
   show hoststats
   show message
   show queue
   show hosts
   show relays
   show routes
   show stats
   show status

I'm guessing that 'sh s' became ambiguous with the addition of 'smtpctl
show status' in Revision 1.47 in Feb 2014. Or I don't understand what the
man page is trying to convey.

The following patch replaces 'sh s' with 'sh ro' for 'show routes'
which, as far as I can tell, is unambiguous.


Index: smtpctl.8
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpctl.8,v
retrieving revision 1.50
diff -u -p -r1.50 smtpctl.8
--- smtpctl.8   27 Jul 2015 18:48:05 -  1.50
+++ smtpctl.8   16 Aug 2015 21:57:48 -
@@ -33,9 +33,9 @@ The
program controls
.Xr smtpd 8 .
Commands may be abbreviated to the minimum unambiguous prefix; for example,
-.Cm sh s
+.Cm sh ro 
for

-.Cm show stats .
+.Cm show routes .
.Pp
The
.Nm mailq
Index: smtpd.conf.5
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
retrieving revision 1.127
diff -u -p -r1.127 smtpd.conf.5
--- smtpd.conf.511 Aug 2015 21:57:24 -  1.127
+++ smtpd.conf.516 Aug 2015 21:57:48 -
@@ -635,7 +635,7 @@ able to establish an SMTP session.
.Ic secure
may be specified to provide both STARTTLS and SMTPS services.
Host certificates may be used for these connections,
-and must be priorly declared using the pki directive.
+and must be declared beforehand using the pki directive.
If
.Ic pki
is specified,

Re: [Patch] smtpd.conf - change 'priorly' to 'beforehand'

[Larry Hynes]

On 2015-08-14, Gilles Chehade gil...@poolp.org wrote:
 On Thu, Aug 13, 2015 at 09:06:00AM +0100, Jason McIntyre wrote:
 On Thu, Aug 13, 2015 at 03:21:56AM +0100, Larry Hynes wrote:
  This is a minor quibble, and possibly a purely personal one, but
  'priorly' is not really in common usage.
  
  Index: smtpd.conf.5
  ===
  RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
  retrieving revision 1.127
  diff -u -p -r1.127 smtpd.conf.5
  --- smtpd.conf.5   11 Aug 2015 21:57:24 -  1.127
  +++ smtpd.conf.5   13 Aug 2015 02:13:00 -
  @@ -635,7 +635,7 @@ able to establish an SMTP session.
  .Ic secure
  may be specified to provide both STARTTLS and SMTPS services.
  Host certificates may be used for these connections,
  -and must be priorly declared using the pki directive.
  +and must be declared beforehand using the pki directive.
  If
  .Ic pki
  is specified,
  
 
 hmm.
 
 it's hard to gauge whether something is or is not in common usage in
 general. not in common usage for yourself, i'd suggest.
 
 i don;t know, but i'd guess that you're probably right that this form is
 less in use nowadays. it's not in my learner's dictionary (compiled
 according to word frequency). it is in oed marked as late 18th century
 origin.
 
 but whether to change it?
 
 - it's clear, as far as i'm concerned.
 - even if you've never heard the term, you'll understand it if you know
   prior.
 - why demote words just because they're less in use?
 
 i say let author's prerogative stand (by which i mean i don;t plan to
 change this).
 

 I'm not really emotional about priorly, I like previously better.

 I think the only reason for this choice was that I was tired, could not
 recall previously and when priorly popped in my mind, look(1) told me
 that it was a real word ;-)


Being, as I am, comfortably ensconced in the 'anything but
priorly' camp I would be very happy with 'previously'. :D

[Patch] smtpd.conf - change 'priorly' to 'beforehand'

[Larry Hynes]

This is a minor quibble, and possibly a purely personal one, but
'priorly' is not really in common usage.

Index: smtpd.conf.5
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
retrieving revision 1.127
diff -u -p -r1.127 smtpd.conf.5
--- smtpd.conf.511 Aug 2015 21:57:24 -  1.127
+++ smtpd.conf.513 Aug 2015 02:13:00 -
@@ -635,7 +635,7 @@ able to establish an SMTP session.
.Ic secure
may be specified to provide both STARTTLS and SMTPS services.
Host certificates may be used for these connections,
-and must be priorly declared using the pki directive.
+and must be declared beforehand using the pki directive.
If
.Ic pki
is specified,

[Patch] Fix a typo in src/usr.sbin/relayd/relayd.conf.5

[Larry Hynes]

decleration - declaration


Index: relayd.conf.5
===
RCS file: /cvs/src/usr.sbin/relayd/relayd.conf.5,v
retrieving revision 1.164
diff -u -p -r1.164 relayd.conf.5
--- relayd.conf.5   24 Jul 2015 15:25:08 -  1.164
+++ relayd.conf.5   10 Aug 2015 14:07:28 -
@@ -1110,7 +1110,7 @@ Forward the request to a server in the s
With this option, requests can be passed to specific backend servers.
A corresponding
.Ic forward to
-decleration in the
+declaration in the
.Sx RELAYS
section is required.
.El