Re: Reminder of bug in vi and nvi including tested diff

[Raf Czlonka]

On Thu, Sep 07, 2023 at 01:10:17PM BST, Walter Alejandro Iglesias wrote:
> 
> I didn't know that, thanks.  I'd like to send the patch to the
> maintainer of this version too, but after downloading a snapshot a
> README.1st in the tarball says:
> 
> Please do not contact the original authors about bugs you
> find in this version. Contact skimo...@kotnet.org instead.
> [...] 
> New versions will be made available on 
> http://www.kotnet.org/~skimo/nvi
> [...]
> 
> Sven Verdoolaege
> 
> 
> It's not clear who I should contact to, the http link is broken so
> probably the email address is also broken.
> 
> And the info the tarball about how to build it is also incomplete.
> 
> Perhaps this project is a bit abandoned?

Hi Walter,

No worries!

The way I read the above is Sven Verdoolaege (skimo) saying:

Do not contact Keith Bostic et al., contact me instead.

Either way, the last time I contacted Sven, which was some years
ago mind you, I had first used the nvi's Git repository owner's
email address. You might also try the email address from the last
two commits (Signed-Off field) where the replies came from.

Regards,

Raf

Re: Reminder of bug in vi and nvi including tested diff

[Raf Czlonka]

On Thu, Sep 07, 2023 at 08:04:43AM BST, Walter Alejandro Iglesias wrote:
> Dear OpenBSD developers,
> 
> On Aug 2 I reported this bug:
> 
>   https://marc.info/?l=openbsd-bugs=169100763926909=2
> 
> After fiddling around I found a solution that works for both vi base and
> nvi from ports:
> 
>   https://marc.info/?l=openbsd-bugs=16926218514=2
> 
> Since nobody answered me in bugs@ I sent a message to ports@ and Cc:
> Anthony J. Bentley who told me to contact Zhihao Yuan, nvi developer
> upstream.  I don't use github, I don't have a github account, luckily
> after searching the web I found an email address of Zhihao.  He
> understood the issue and answered me with what seems to be a more
> consistent patch:
> 
>   https://marc.info/?l=openbsd-bugs=169277277928008=2
> 
> Which, needless to say, also works for both. vi on base and nvi on
> ports.  Below I paste a cvs version of Zhihao's patch to use it with vi
> on base.
> 
> So it only rests some OpenBSD developer here to take look.  It's not
> going to take up much of your time, everything has already been chewed
> up :-).

Hi Walter,

This isn't related to the bug per se but it might be useful bit of
information regardless.

The nvi port is actually nvi2[0], which is based on the original
(read Keith Bostic's) nvi, where, in turn, the base vi(1) comes
from.

The original nvi is still maintained[1] by Sven Verdoolaege[2] so
you might want to give him a shout, too.

[0] https://github.com/lichray/nvi2
[1] https://repo.or.cz/nvi.git
[2] 
https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page

Regards,

Raf

Re: rc.d.8: fix daemon_* markup

[Raf Czlonka]

On Mon, Mar 06, 2023 at 01:28:59PM GMT, Klemens Nanni wrote:
> I pointed out how rc.d(8) uses login.conf(5) via `daemon_class', so I linked
> to https://man.openbsd.org/rc.d.8#daemon_class expecting it to be marked up.
> 
> Add .Tg to make above link and ":t daemon_class" in `man rc.d' work.
> 
> Mark up all `daemon_*' variables as single .Va so they get an automatic tag.
> This also reads better and does not remove information, imho, as the text
> right after the list explains everything.
> (daemon_flags in rc.d/foo script vs. foo_flags in rc.conf.local)
> 
> Feedback? OK?

Hi Klemens,

To quote sthen@[0]:

But that isn't, it is talking about _execdir,
_flags, etc where you need to replace the 

[0] https://marc.info/?l=openbsd-tech=165364961710717=2

Regards,

Raf

> Index: rc.d.8
> ===
> RCS file: /cvs/src/share/man/man8/rc.d.8,v
> retrieving revision 1.40
> diff -u -p -r1.40 rc.d.8
> --- rc.d.82 Sep 2022 22:11:57 -   1.40
> +++ rc.d.86 Mar 2023 13:21:41 -
> @@ -104,27 +104,27 @@ variables when starting a daemon.
>  The following can be overridden by site-specific values provided in
>  .Xr rc.conf.local 8 :
>  .Bl -tag -width daemon_timeout -offset indent
> -.It Ar daemon Ns _execdir
> +.It Va daemon_execdir
>  Run daemon from the specified directory.
> -.It Ar daemon Ns _flags
> +.It Va daemon_flags
>  Additional arguments to call the daemon with.
>  These will be appended to any mandatory arguments already contained in the
>  .Va daemon
>  variable defined in the control script.
>  If
> -.Ar daemon Ns _flags
> +.Va daemon_flags
>  is set to
>  .Dq NO ,
>  it will prevent the daemon from starting even when listed in
>  .Va pkg_scripts .
> -.It Ar daemon Ns _logger
> +.It Va daemon_logger
>  Redirect standard output and error to
>  .Xr logger 1
>  using the configured priority (e.g. "daemon.info").
> -.It Ar daemon Ns _rtable
> +.It Va daemon_rtable
>  Routing table to run the daemon under, using
>  .Xr route 8 .
> -.It Ar daemon Ns _timeout
> +.It Va daemon_timeout
>  Maximum time in seconds to wait for the
>  .Cm start ,
>  .Cm stop
> @@ -137,7 +137,7 @@ This is only guaranteed with the default
>  and
>  .Ic rc_reload
>  functions.
> -.It Ar daemon Ns _user
> +.It Va daemon_user
>  User to run the daemon as, using
>  .Xr su 1 .
>  .El
> @@ -159,6 +159,7 @@ flags), define the following in
>  Each script may define its own defaults, as explained in
>  .Xr rc.subr 8 .
>  .Pp
> +.Tg daemon_class
>  .Va daemon_class
>  is a special read-only variable.
>  It is set to
> 

Re: [PATCH] [src] share/man/man8/rc.subr.8 - normalise markup

[Raf Czlonka]

On Fri, May 27, 2022 at 01:28:07PM BST, Antoine Jacoutot wrote:
> 
> rc.subr.8 committed, thanks.

Hi Antoine,

I only just noticed that the diff hasn't been applied/committed in
its entirety - only the "daemon Ns _logger" -> "daemon_logger" part
has been but the "Ar" -> "Va" hasn't, but was also part of markup
normalisation.

Regards,

Raf

Index: share/man/man8/rc.subr.8
===
RCS file: /cvs/src/share/man/man8/rc.subr.8,v
retrieving revision 1.48
diff -u -p -r1.48 rc.subr.8
--- share/man/man8/rc.subr.82 Sep 2022 22:11:57 -   1.48
+++ share/man/man8/rc.subr.819 Oct 2022 21:33:32 -
@@ -283,7 +283,7 @@ Change to this directory before running
 .Ic rc_exec .
 .It Va daemon_flags
 Arguments to call the daemon with.
-.It Ar daemon_logger
+.It Va daemon_logger
 Redirect standard output and error to
 .Xr logger 1
 using the configured priority (e.g. "daemon.info").

Re: [PATCH] [src] share/man/man8/rc.{d,subr}.8 - normalise markup

[Raf Czlonka]

On Fri, May 27, 2022 at 12:06:53PM BST, Stuart Henderson wrote:
> On 2022/05/27 11:43, Raf Czlonka wrote:
> > Hello,
> > 
> > daemon_logger was the odd one out in rc.subr(8).
> 
> I think that is correct.
> 
> > While there, I did the same in rc.d(8).
> 
> But that isn't, it is talking about _execdir,
> _flags, etc where you need to replace the 

D'oh! Of course it is! Got carried away there :^P

Retracting rc.d(8) part.

Ta,

Raf

[PATCH] [src] share/man/man8/rc.{d,subr}.8 - normalise markup

[Raf Czlonka]

Hello,

daemon_logger was the odd one out in rc.subr(8).

While there, I did the same in rc.d(8).

Regards,

Raf

Index: share/man/man8/rc.d.8
===
RCS file: /cvs/src/share/man/man8/rc.d.8,v
retrieving revision 1.38
diff -u -p -r1.38 rc.d.8
--- share/man/man8/rc.d.8   26 May 2022 11:27:03 -  1.38
+++ share/man/man8/rc.d.8   27 May 2022 10:35:12 -
@@ -102,27 +102,27 @@ variables when starting a daemon.
 The following can be overridden by site-specific values provided in
 .Xr rc.conf.local 8 :
 .Bl -tag -width daemon_timeout -offset indent
-.It Ar daemon Ns _execdir
+.It Va daemon_execdir
 Run daemon from the specified directory.
-.It Ar daemon Ns _flags
+.It Va daemon_flags
 Additional arguments to call the daemon with.
 These will be appended to any mandatory arguments already contained in the
 .Va daemon
 variable defined in the control script.
 If
-.Ar daemon Ns _flags
+.Va daemon_flags
 is set to
 .Dq NO ,
 it will prevent the daemon from starting even when listed in
 .Va pkg_scripts .
-.It Ar daemon Ns _logger
+.It Va daemon_logger
 Redirect standard output and error to
 .Xr logger 1
 using the configured priority (e.g. "daemon.info").
-.It Ar daemon Ns _rtable
+.It Va daemon_rtable
 Routing table to run the daemon under, using
 .Xr route 8 .
-.It Ar daemon Ns _timeout
+.It Va daemon_timeout
 Maximum time in seconds to wait for the
 .Cm start ,
 .Cm stop
@@ -135,7 +135,7 @@ This is only guaranteed with the default
 and
 .Ic rc_reload
 functions.
-.It Ar daemon Ns _user
+.It Va daemon_user
 User to run the daemon as, using
 .Xr su 1 .
 .El
Index: share/man/man8/rc.subr.8
===
RCS file: /cvs/src/share/man/man8/rc.subr.8,v
retrieving revision 1.44
diff -u -p -r1.44 rc.subr.8
--- share/man/man8/rc.subr.826 May 2022 11:27:03 -  1.44
+++ share/man/man8/rc.subr.827 May 2022 10:35:12 -
@@ -262,7 +262,7 @@ Change to this directory before running
 .Ic rc_exec .
 .It Va daemon_flags
 Arguments to call the daemon with.
-.It Ar daemon Ns _logger
+.It Va daemon_logger
 Redirect standard output and error to
 .Xr logger 1
 using the configured priority (e.g. "daemon.info").

Re: changelist: add /etc/login.conf.d/*

[Raf Czlonka]

Hello,

I take this is an ok by deraadt@

Regards,

Raf

On Thu, May 12, 2022 at 01:40:40PM BST, Theo de Raadt wrote:
> Yep
> 
> Raf Czlonka  wrote:
> 
> > On Thu, May 12, 2022 at 11:58:22AM BST, Stuart Henderson wrote:
> > > changelist already has /etc/login.conf, but I think files in the .d
> > > directory should be checked too, both so we have notification of changes
> > > (as it can set environment variables this is a very powerful file), and
> > > also so we keep old versions in /var/backup.
> > 
> > The directory itself should probably also go into /etc/mtree/special.
> > 
> > Regards,
> > 
> > Raf
> > 
> > Index: etc/mtree/special
> > ===
> > RCS file: /cvs/src/etc/mtree/special,v
> > retrieving revision 1.127
> > diff -u -p -r1.127 special
> > --- etc/mtree/special   13 Sep 2020 10:03:46 -  1.127
> > +++ etc/mtree/special   12 May 2022 11:30:54 -
> > @@ -46,6 +46,8 @@ isakmpd.policytype=file mode=0600 uname
> >  ldapd.conf type=file mode=0600 uname=root gname=wheel optional
> >  ldpd.conf  type=file mode=0600 uname=root gname=wheel optional
> >  login.conf type=file mode=0644 uname=root gname=wheel
> > +login.conf.d   type=dir mode=0755 uname=root gname=wheel
> > +.. #login.conf.d
> >  login_ldap.conftype=file mode=0640 uname=root gname=auth optional
> >  mail.rctype=file mode=0644 uname=root gname=wheel
> >  mailer.conftype=file mode=0644 uname=root gname=wheel
> > 

Re: changelist: add /etc/login.conf.d/*

[Raf Czlonka]

On Thu, May 12, 2022 at 11:58:22AM BST, Stuart Henderson wrote:
> changelist already has /etc/login.conf, but I think files in the .d
> directory should be checked too, both so we have notification of changes
> (as it can set environment variables this is a very powerful file), and
> also so we keep old versions in /var/backup.

The directory itself should probably also go into /etc/mtree/special.

Regards,

Raf

Index: etc/mtree/special
===
RCS file: /cvs/src/etc/mtree/special,v
retrieving revision 1.127
diff -u -p -r1.127 special
--- etc/mtree/special   13 Sep 2020 10:03:46 -  1.127
+++ etc/mtree/special   12 May 2022 11:30:54 -
@@ -46,6 +46,8 @@ isakmpd.policytype=file mode=0600 uname
 ldapd.conf type=file mode=0600 uname=root gname=wheel optional
 ldpd.conf  type=file mode=0600 uname=root gname=wheel optional
 login.conf type=file mode=0644 uname=root gname=wheel
+login.conf.d   type=dir mode=0755 uname=root gname=wheel
+.. #login.conf.d
 login_ldap.conftype=file mode=0640 uname=root gname=auth optional
 mail.rctype=file mode=0644 uname=root gname=wheel
 mailer.conftype=file mode=0644 uname=root gname=wheel

Re: [PATCH] [src] usr.bin/sendbug/sendbug.c - update categories

[Raf Czlonka]

On Tue, Mar 29, 2022 at 08:05:25PM BST, Theo Buehler wrote:
> On Tue, Mar 29, 2022 at 08:51:25PM +0200, Jeremie Courreges-Anglas wrote:
> > On Tue, Mar 29 2022, Raf Czlonka  wrote:
> > > Hello,
> > >
> > > sparc and vax ports have been retired a while back; add riscv64
> > > while there.
> > 
> > Committed, thanks.
> > 
> > There are more missing entries I think.  If I follow the existing
> > pattern, naming the cpu architectures and not the platforms:
> > - aarch64 is missing
> > - powerpc64 is missing
> > - mips64el is missing
> 
> Perhaps we can ditch the architectures list that seems to have been out
> of sync more often than not and reduce categories to something like
> these?
> 
>   documentation userland kernel
> 
> If somebody is smart enough to narrow a bug down to something
> arch-specific, they're hopefully smart enough to mention that in their
> bug report.

Hi Theo,

My initial thought was to simply remove the whole second line leaving only:

const char *categories = "system user library documentation kernel"

Regards,

Raf

Index: usr.bin/sendbug/sendbug.c
===
RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v
retrieving revision 1.78
diff -u -p -r1.78 sendbug.c
--- usr.bin/sendbug/sendbug.c   21 Aug 2017 21:41:13 -  1.78
+++ usr.bin/sendbug/sendbug.c   29 Mar 2022 21:21:28 -
@@ -43,8 +43,7 @@ int   sendmail(const char *);
 void   template(FILE *);
 void   usbdevs(FILE *);
 
-const char *categories = "system user library documentation kernel "
-"alpha amd64 arm hppa i386 m88k mips64 powerpc sh sparc sparc64 vax";
+const char *categories = "system user library documentation kernel"
 const char *comment[] = {
"",
"",

> 
> > and after folding the line because of line wrapping:
> > 
> > ok?
> > 
> > 
> > Index: sendbug.c
> > ===
> > RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v
> > retrieving revision 1.79
> > diff -u -p -r1.79 sendbug.c
> > --- sendbug.c   29 Mar 2022 18:44:12 -  1.79
> > +++ sendbug.c   29 Mar 2022 18:49:41 -
> > @@ -44,7 +44,8 @@ void  template(FILE *);
> >  void   usbdevs(FILE *);
> >  
> >  const char *categories = "system user library documentation kernel "
> > -"alpha amd64 arm hppa i386 m88k mips64 powerpc riscv64 sh sparc64";
> > +"alpha aarch64 amd64 arm hppa i386 m88k mips64 mips64el powerpc 
> > powerpc64 "
> > +"riscv64 sh sparc64";
> >  const char *comment[] = {
> > "",
> > "",
> > 
> > -- 
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> > 

Re: [PATCH] [src] usr.bin/sendbug/sendbug.c - update categories

[Raf Czlonka]

On Tue, Mar 29, 2022 at 07:51:25PM BST, Jeremie Courreges-Anglas wrote:
> On Tue, Mar 29 2022, Raf Czlonka  wrote:
> > Hello,
> >
> > sparc and vax ports have been retired a while back; add riscv64
> > while there.
> 
> Committed, thanks.
> 
> There are more missing entries I think.  If I follow the existing
> pattern, naming the cpu architectures and not the platforms:
> - aarch64 is missing
> - powerpc64 is missing
> - mips64el is missing

Hi Jeremie,

Yeah, I though about but wasn't sure which way to go - in the end,
I followed each link under supported platform from plat.html[0] and
used the descriptions found there.

A small comment in sendbug.c might help I guess.

Either way, whichever works best :^)

[0] https://www.openbsd.org/plat.html

Regards,

Raf

> and after folding the line because of line wrapping:
> 
> ok?
> 
> 
> Index: sendbug.c
> ===
> RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v
> retrieving revision 1.79
> diff -u -p -r1.79 sendbug.c
> --- sendbug.c 29 Mar 2022 18:44:12 -  1.79
> +++ sendbug.c 29 Mar 2022 18:49:41 -
> @@ -44,7 +44,8 @@ voidtemplate(FILE *);
>  void usbdevs(FILE *);
>  
>  const char *categories = "system user library documentation kernel "
> -"alpha amd64 arm hppa i386 m88k mips64 powerpc riscv64 sh sparc64";
> +"alpha aarch64 amd64 arm hppa i386 m88k mips64 mips64el powerpc 
> powerpc64 "
> +"riscv64 sh sparc64";
>  const char *comment[] = {
>   "",
>   "",
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

[PATCH] [src] usr.bin/sendbug/sendbug.c - update categories

[Raf Czlonka]

Hello,

sparc and vax ports have been retired a while back; add riscv64
while there.

Regards,

Raf

Index: usr.bin/sendbug/sendbug.c
===
RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v
retrieving revision 1.78
diff -u -p -r1.78 sendbug.c
--- usr.bin/sendbug/sendbug.c   21 Aug 2017 21:41:13 -  1.78
+++ usr.bin/sendbug/sendbug.c   29 Mar 2022 17:39:38 -
@@ -44,7 +44,7 @@ void  template(FILE *);
 void   usbdevs(FILE *);
 
 const char *categories = "system user library documentation kernel "
-"alpha amd64 arm hppa i386 m88k mips64 powerpc sh sparc sparc64 vax";
+"alpha amd64 arm hppa i386 m88k mips64 powerpc riscv64 sh sparc64";
 const char *comment[] = {
"",
"",

Re: [PATCH] [src] usr.bin/make/PSD.doc/tutorial.ms - fix order: makefile -> Makefile

[Raf Czlonka]

Anyone?

On Wed, Feb 23, 2022 at 01:57:22PM GMT, Jason McIntyre wrote:
> On Wed, Feb 23, 2022 at 11:09:44AM +0000, Raf Czlonka wrote:
> > Hello,
> > 
> > Pretty straightforward, 'makefile' comes before 'Makefile'.
> > 
> > Regards,
> > 
> > Raf
> > 
> 
> yep, ok.
> jmc
> 
> > Index: usr.bin/make/PSD.doc/tutorial.ms
> > ===
> > RCS file: /cvs/src/usr.bin/make/PSD.doc/tutorial.ms,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 tutorial.ms
> > --- usr.bin/make/PSD.doc/tutorial.ms2 Nov 2007 17:27:24 -   
> > 1.13
> > +++ usr.bin/make/PSD.doc/tutorial.ms23 Feb 2022 11:07:46 -
> > @@ -168,9 +168,9 @@ other files to be complete and b) what t
> >  .Ix 0 def makefile
> >  kept in the top-most directory of the system to be built. While you
> >  can call the makefile anything you want, Make will look for
> > -.CW Makefile
> > -and
> >  .CW makefile
> > +and
> > +.CW Makefile
> >  (in that order) in the current directory if you don't tell it
> >  otherwise.
> >  .Ix 0 def makefile default
> > @@ -1164,9 +1164,9 @@ of output.
> >  .IP "\fB\-f\fP \fImakefile\fP"
> >  .Ix 0 def flags -f
> >  Specify a makefile to read different from the standard makefiles
> > -.CW Makefile "\&" (
> > +.CW makefile "\&" (
> >  or
> > -.CW makefile ).
> > +.CW Makefile ).
> >  .Ix 0 ref makefile default
> >  .Ix 0 ref makefile other
> >  If
> > 
> 

[PATCH] [src] usr.bin/make/PSD.doc/tutorial.ms - fix order: makefile -> Makefile

[Raf Czlonka]

Hello,

Pretty straightforward, 'makefile' comes before 'Makefile'.

Regards,

Raf

Index: usr.bin/make/PSD.doc/tutorial.ms
===
RCS file: /cvs/src/usr.bin/make/PSD.doc/tutorial.ms,v
retrieving revision 1.13
diff -u -p -r1.13 tutorial.ms
--- usr.bin/make/PSD.doc/tutorial.ms2 Nov 2007 17:27:24 -   1.13
+++ usr.bin/make/PSD.doc/tutorial.ms23 Feb 2022 11:07:46 -
@@ -168,9 +168,9 @@ other files to be complete and b) what t
 .Ix 0 def makefile
 kept in the top-most directory of the system to be built. While you
 can call the makefile anything you want, Make will look for
-.CW Makefile
-and
 .CW makefile
+and
+.CW Makefile
 (in that order) in the current directory if you don't tell it
 otherwise.
 .Ix 0 def makefile default
@@ -1164,9 +1164,9 @@ of output.
 .IP "\fB\-f\fP \fImakefile\fP"
 .Ix 0 def flags -f
 Specify a makefile to read different from the standard makefiles
-.CW Makefile "\&" (
+.CW makefile "\&" (
 or
-.CW makefile ).
+.CW Makefile ).
 .Ix 0 ref makefile default
 .Ix 0 ref makefile other
 If

Re: new manual: zonefile.5

[Raf Czlonka]

On Thu, Feb 17, 2022 at 07:31:47PM GMT, Evan Silberman wrote:
> Jason McIntyre  wrote:
> > as a start, i advise you to run your page through mandoc's inbuilt
> > checker
> 
> Yep, done. I've addressed all the ones I think I can properly address.
> Date still blank, $OpenBSD$ still absent. It also complains that
> .Sh FILES is not in its conventional location but I think that's because
> I have nonstandard sections after .Sh DESCRIPTION. Those could be
> subsections but mdoc(7) allows for nonstandard sections when it aids
> legibility, which I think it does here.
> 

Hi Evan,

No, this is because FILES comes before EXAMPLES.

> .\"
> .\" Copyright (c) 2022 Evan Silberman

Also, I don't think this is necessarily wrong, but there's usually
a blank line between the Copyright line and the license text.

Also, you can simply add:

.\" $OpenBSD$
   ^
BTW, I never know whether to use a space character or a tab there
- I've seen both being used.

and:

.Dd $Mdocdate$

Regards,

Raf

> .\" Permission to use, copy, modify, and distribute this software for any
> .\" purpose with or without fee is hereby granted, provided that the above
> .\" copyright notice and this permission notice appear in all copies.
> .\"
> .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> .\"
> .Dd
> .Dt ZONEFILE 5
> .Os
> .Sh NAME
> .Nm zonefile
> .Nd DNS authoritative zone definition file format
> .Sh DESCRIPTION
> A
> .Nm
> is a standardized textual representation of records in the Domain Name System.
> Zone files are used to define the records served by authoritative nameservers
> such as
> .Xr nsd 8 .
> .Pp
> Zone files are line-oriented; that is, each line of the file is generally a
> seperate entry.
> An entry can be split onto multiple lines by surrounding data fields with
> parentheses.
> Any newline characters within parentheses are ignored and the data within
> treated as a continuation of the preceding entry.
> .Pp
> Domain names in a zone file consist of labels separated by periods
> .Pq referred to as Dq dots .
> A
> .Tg label
> .Sy label
> is any string of bytes.
> A domain name ending in a dot is called
> .Tg absolute
> .Sy absolute
> or
> .Sy fully-qualified ;
> a domain name not ending in a dot is called
> .Tg relative
> .Sy relative
> and is processed as if it were followed by a dot and the current origin domain
> name, as indicated by the
> .Ic $ORIGIN
> and
> .Ic $INCLUDE
> directives (see below).
> .Pp
> While a label may be any arbitrary string of characters, most domain names in
> a zone file will be Internet host names.
> A
> .Tg host
> .Sy host name
> is a domain name whose labels consist only of ASCII letters, digits, and
> hyphens
> .Pq Dq - ,
> and do not begin or end with a hyphen.
> .Pp
> A semicolon
> .Pq Dq ;
> is used to begin a comment.
> Text from the semicolon to the end of the line is ignored.
> .Pq
> A backslash
> .Pq Dq \
> followed by a non-digit character quotes the following character and any
> special meaning it has is ignored.
> Thus, a label may include periods, semicolons, or parentheses by quoting them.
> .Sh DIRECTIVES
> Directives in a zone file begin with a dollar sign, and affect the processing
> of the zone file.
> There are only three directives commonly supported by authoritative name 
> server
> daemons:
> .Bl -tag -width Ds
> .It Ic $ORIGIN Ar origin
> Set the absolute name
> .Ar origin
> as the origin domain for relative names in following resource record entries.
> The origin remains the same until another
> .Ic $ORIGIN
> is reached.
> Note that the origin is applied to relative names in both the
> .Ar name
> field of a resource record and in any fields of the record
> .Ar data
> that are domain names.
> .It Ic $INCLUDE Ar file Op Ar origin
> Include and process the contents of
> .Ar file
> before processing the remaining entries in this file.
> If an
> .Ar origin
> is given, it will be set as the origin when processing records in
> .Ar file .
> The
> .Ic $INCLUDE
> directive never changes the current origin of the including file, regardless
> of any
> .Ic $ORIGIN
> or
> .Ic $INCLUDE
> directives in the included
> .Ar file .
> .It Ic $TTL Ar ttl
> Use
> .Ar ttl
> as the time-to-live value for all resource records with a blank
> .Ar ttl
> field.
> .El
> .Sh RESOURCE RECORDS
> A resource record has the general form:
> .Bd -ragged -offset indent
> .Ar name
> .Ar ttl
> .Ar class
> .Ar type
> .Ar data
> .Ed
> .Pp
> The
> .Ar name
> field is a domain name, as described above.
> If it ends with a dot, it is used 

[PATCH] [src] etc/etc.*/login.conf, share/man/man5/login.conf.5, libexec/login_radius/login_radius.8

[Raf Czlonka]

Hello,

Most changes touch the same files hence a single email and diff:

- login_ldap(8) is missing from login.conf(5)
- capitalise 'radius' where talking about the protocol, and use an
  indefinite article where relevant
- remove 'tis' style - moved to the attic a while ago[0]

I was also thinking of normalising 'snk' as it is described as:

"Digital Pathways SecureNet Key authentication"

in login.conf(5), but:

"SNK-004 authentication"

in all of its manual pages - login_snk(8), snkadm(8), and snkinit(8).
Also, the other token authentication styles in login.conf(5) file
mention (ANSI) X9.9 and the 'snk' line does not. Either way, I wasn't
sure which way around to go.

[0] https://marc.info/?l=openbsd-cvs=144805192217767=2

Regards,

Raf

cvs server: Diffing etc/etc.alpha
Index: etc/etc.alpha/login.conf
===
RCS file: /cvs/src/etc/etc.alpha/login.conf,v
retrieving revision 1.10
diff -u -p -r1.10 login.conf
--- etc/etc.alpha/login.conf25 Apr 2021 16:36:56 -  1.10
+++ etc/etc.alpha/login.conf28 Dec 2021 17:39:42 -
@@ -12,13 +12,13 @@
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
-# radius   Use radius authentication
+# ldap Use LDAP authentication
+# radius   Use RADIUS authentication
 # reject   Use rejected authentication
 # skey Use S/Key authentication
 # activActivCard X9.9 token authentication
 # crypto   CRYPTOCard X9.9 token authentication
 # snk  Digital Pathways SecureNet Key authentication
-# tis  TIS Firewall Toolkit authentication
 # tokenGeneric X9.9 token authentication
 # yubikey  YubiKey authentication
 #
cvs server: Diffing etc/etc.amd64
Index: etc/etc.amd64/login.conf
===
RCS file: /cvs/src/etc/etc.amd64/login.conf,v
retrieving revision 1.20
diff -u -p -r1.20 login.conf
--- etc/etc.amd64/login.conf12 Nov 2021 15:40:19 -  1.20
+++ etc/etc.amd64/login.conf28 Dec 2021 17:39:42 -
@@ -12,13 +12,13 @@
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
-# radius   Use radius authentication
+# ldap Use LDAP authentication
+# radius   Use RADIUS authentication
 # reject   Use rejected authentication
 # skey Use S/Key authentication
 # activActivCard X9.9 token authentication
 # crypto   CRYPTOCard X9.9 token authentication
 # snk  Digital Pathways SecureNet Key authentication
-# tis  TIS Firewall Toolkit authentication
 # tokenGeneric X9.9 token authentication
 # yubikey  YubiKey authentication
 #
cvs server: Diffing etc/etc.arm64
Index: etc/etc.arm64/login.conf
===
RCS file: /cvs/src/etc/etc.arm64/login.conf,v
retrieving revision 1.11
diff -u -p -r1.11 login.conf
--- etc/etc.arm64/login.conf12 Nov 2021 15:40:20 -  1.11
+++ etc/etc.arm64/login.conf28 Dec 2021 17:39:42 -
@@ -12,13 +12,13 @@
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
-# radius   Use radius authentication
+# ldap Use LDAP authentication
+# radius   Use RADIUS authentication
 # reject   Use rejected authentication
 # skey Use S/Key authentication
 # activActivCard X9.9 token authentication
 # crypto   CRYPTOCard X9.9 token authentication
 # snk  Digital Pathways SecureNet Key authentication
-# tis  TIS Firewall Toolkit authentication
 # tokenGeneric X9.9 token authentication
 # yubikey  YubiKey authentication
 #
cvs server: Diffing etc/etc.armv7
Index: etc/etc.armv7/login.conf
===
RCS file: /cvs/src/etc/etc.armv7/login.conf,v
retrieving revision 1.11
diff -u -p -r1.11 login.conf
--- etc/etc.armv7/login.conf25 Apr 2021 16:36:56 -  1.11
+++ etc/etc.armv7/login.conf28 Dec 2021 17:39:42 -
@@ -12,13 +12,13 @@
 #  the YP password if the user has one, else change the
 #  local password)
 # lchpass  Do not login; change user's local password instead
-# radius   Use radius authentication
+# ldap Use LDAP authentication
+# radius   Use RADIUS authentication
 # reject   Use rejected authentication
 # skey Use S/Key authentication
 # activActivCard X9.9 token authentication
 # crypto   CRYPTOCard X9.9 token authentication
 # snk  Digital Pathways SecureNet Key authentication
-# tis  TIS Firewall Toolkit 

Re: uhidppctl(8)

[Raf Czlonka]

On Wed, Dec 22, 2021 at 08:32:16AM GMT, Claudio Jeker wrote:
> On Tue, Dec 21, 2021 at 03:49:47PM -0500, jwinnie@tilde.institute wrote:
> > 
> > Hello OpenBSD developers,
> > 
> > I am interested in contributing to improve the uhidpp(4)
> > (Logitech Unifying Reciever) support in OpenBSD.
> > 
> > Currently, the uhidpp(4) driver only handles detecting certain
> > sensors, but I would like more robust support for these devices,
> > including:
> > 
> > * pairing and unpairing devices on the command-line
> > * controlling the scrolling speed/auxiliary buttons of wireless mice
> > 
> > Do you know where I should start? Should I work on the uhidpp(4)
> > driver, or should I go ahead and start writing a command-line utility,
> > like uhidppctl(8)?
> 
> I doubt we want a uhidppctl(8) unless it is really necessary.
> I would expect wsmouse(4) to handle the controlling of scrolling
> speed and auxiliary buttons.

Hi Claudio,

I had to do pair some devices recently for both Logitech Unifying
receiver as well as How Dell Universal Pairing receiver (out of
scope here), and it was a bit of a faff having to source another
machine and OS. So, purely from a user perspective, given that a
single receiver can pair up to six devices, it would be nice not
having to use another machine/OS to do the pairing step :^)

Regards,

Raf

Re: Fix typo in '}' command in less.1

[Raf Czlonka]

On Fri, Dec 10, 2021 at 03:04:11PM GMT, Richard Ulmer wrote:
> Hi,
> this is just a minor copy-and-paste error fix for the less(1) man page.
> I also contributed this upstream: https://github.com/gwsw/less/pull/228

Hi Richard,

You might want to consider reporting it to less-fork[0] which OpenBSD
used last time[1] - the issue is present there, too[2].

[0] https://github.com/gdamore/less-fork
[1] https://marc.info/?l=openbsd-cvs=144676136105460=2
[2] https://github.com/gdamore/less-fork/blob/master/less.1#L679

Regards,

Raf

> Index: less.1
> ===
> RCS file: /cvs/src/usr.bin/less/less.1,v
> retrieving revision 1.58
> diff -u -p -u -r1.58 less.1
> --- less.1  23 Sep 2021 18:46:25 -  1.58
> +++ less.1  10 Dec 2021 14:58:46 -
> @@ -852,7 +852,7 @@ If a right curly bracket appears in the
>  the } command will go to the matching left curly bracket.
>  The matching left curly bracket is positioned on the top
>  line of the screen.
> -If there is more than one right curly bracket on the top line,
> +If there is more than one right curly bracket on the bottom line,
>  a number N may be used to specify the N-th bracket on the line.
>  .It Ic \&(
>  Like {, but applies to parentheses rather than curly brackets.
> 

[PATCH] [www] faq/current.html - docoment recent changes in Xenocara [Was: Re: X server updated to version 21.1.1]

[Raf Czlonka]

On Mon, Nov 15, 2021 at 11:38:20AM GMT, Zé Loff wrote:
> 
> On Mon, Nov 15, 2021 at 11:01:39AM +, Stuart Henderson wrote:
> > Remove the symlink named something like 70-bitmap-only from 
> > /etc/fonts/conf.d
> 
> Yes! Thank you!
> For the archives: it's /etc/fonts/conf.d/70-no-bitmaps.conf

How about mentioning all of this in current.html[0]?

Please treat it as a stub - it'll obviously need some massaging.

Regards,

Raf

[0] https://www.openbsd.org/faq/current.html

Index: faq/current.html
===
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1080
diff -u -p -r1.1080 current.html
--- faq/current.html3 Nov 2021 16:56:52 -   1.1080
+++ faq/current.html15 Nov 2021 12:10:38 -
@@ -109,6 +109,27 @@ It can be re-enabled by adding the follo
 xterm*allowMouseOps: true
 
 
+2021/11/12 - upgrades to Xenocara: X server (21.1.1), 
FreeType (2.11.0), and fontconfig (2.13.94)
+
+If your fonts have changed sizes too much after the last snapshot
+update, you can add:
+
+xrandr --dpi 96
+
+in your ~/.xsession file to set the resolution manually to the
+previous default.
+
+You can also fiddle with the X resources (~/.Xresources ) to fix
+font sizes in individual applications. Older X applications are more
+likely to misbehave and need the global dpi fix.
+
+You'll also need to remove old config files, i.e.:
+
+/etc/fonts/conf.d/70-no-bitmaps.conf
+
+A more detailed cleanup can be done with the aid of the sysclean package.
+
+
 

Re: [PATCH] [src] share/man/man5/hostname.if.5 - nwid -> join

[Raf Czlonka]

On Thu, Nov 11, 2021 at 04:30:15PM GMT, Klemens Nanni wrote:
> 
> Maybe this reads better in general?
> 
> would run ifconfig three times to join a wireless network using WPA and
> to set the AUTOCONF6 and AUTOCONF4 flags, respectively.
> 
> [...]
> 
> Feedback? OK?

FWIW, this looks much better to me.

Raf

> 
> Index: hostname.if.5
> ===
> RCS file: /cvs/src/share/man/man5/hostname.if.5,v
> retrieving revision 1.77
> diff -u -p -r1.77 hostname.if.5
> --- hostname.if.5 17 Jul 2021 15:28:31 -  1.77
> +++ hostname.if.5 11 Nov 2021 16:30:00 -
> @@ -67,21 +67,15 @@ inet 10.0.0.1 255.255.255.0 10.0.0.255 d
>  Each line is processed separately and in order.
>  For example:
>  .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
>  inet6 autoconf
>  inet autoconf
>  .Ed
>  .Pp
> -would run ifconfig three times to set the
> -.Cm nwid
> -and
> -.Cm wpakey
> -of the interface,
> -the
> -.Sy AUTOCONF6
> -flag and the
> -.Sy AUTOCONF4
> -flag, respectively.
> +would run ifconfig three times to
> +.Cm join
> +a wireless network using WPA
> +and enable dynamic address configuration, respectively.
>  .Sh STATIC ADDRESS CONFIGURATION
>  The following packed formats are valid for configuring network
>  interfaces with static addresses.

[PATCH] [src] share/man/man5/hostname.if.5 - nwid -> join

[Raf Czlonka]

Hello,

It seems like this has been missed in recent thread[0].

Not entirely sure whether the sentence "flows" any longer but here
it goes anyway.

[0] https://marc.info/?l=openbsd-tech=163507448118443=2

Cheers,

Raf

Index: share/man/man5/hostname.if.5
===
RCS file: /cvs/src/share/man/man5/hostname.if.5,v
retrieving revision 1.77
diff -u -p -r1.77 hostname.if.5
--- share/man/man5/hostname.if.517 Jul 2021 15:28:31 -  1.77
+++ share/man/man5/hostname.if.511 Nov 2021 16:09:33 -
@@ -67,13 +67,13 @@ inet 10.0.0.1 255.255.255.0 10.0.0.255 d
 Each line is processed separately and in order.
 For example:
 .Bd -literal -offset indent
-nwid mynwid wpakey mywpakey
+join mynwid wpakey mywpakey
 inet6 autoconf
 inet autoconf
 .Ed
 .Pp
 would run ifconfig three times to set the
-.Cm nwid
+.Cm join
 and
 .Cm wpakey
 of the interface,

Re: [PATCH] [www] - spell 'X.509' consistently when talking about the standard

[Raf Czlonka]

Could someone "do it", please? ;^)

Regards,

Raf

On Fri, Oct 08, 2021 at 04:13:16PM BST, Theo de Raadt wrote:
> do it
> 
> Raf Czlonka  wrote:
> 
> > On Wed, Oct 06, 2021 at 11:50:01PM BST, Raf Czlonka wrote:
> > > Hello,
> > > 
> > > Outside of X509_* functions, filenames, openssl(1) commands, etc.
> > > there are places where the spelling of 'X.509' could be made
> > > consistent when talking about the standard.
> > 
> > I realise the patch might have been too long so how about only the
> > upcoming release page for now?
> > 
> > Cheers,
> > 
> > Raf
> > 
> > Index: 70.html
> > ===
> > RCS file: /cvs/www/70.html,v
> > retrieving revision 1.82
> > diff -u -p -r1.82 70.html
> > --- 70.html 8 Oct 2021 03:44:52 -   1.82
> > +++ 70.html 8 Oct 2021 09:11:34 -
> > @@ -567,7 +567,7 @@ to 7.0.
> > roa-sets.
> > In RRDP, limited the number of deltas to 300 per repo. If more 
> > deltas
> >exist, downloading a full snapshot is faster.
> > -   Limited the validation depth of X509 certificate chains to 12, 
> > double
> > +   Limited the validation depth of X.509 certificate chains to 12, 
> > double
> >the current depth seen in RPKI.
> >  
> >  
> > @@ -687,7 +687,7 @@ to 7.0.
> >  New Features
> >  
> >Added support for OpenSSL 1.1.1 TLSv1.3 APIs.
> > -  Enabled the new x509 validator to allow verification of modern 
> > certificate chains.
> > +  Enabled the new X.509 validator to allow verification of modern 
> > certificate chains.
> >  
> >  
> >  Portable Improvements
> > @@ -750,12 +750,12 @@ to 7.0.
> >  
> >Added additional state machine test coverage.
> >Improved integration test support with ruby/openssl tests.
> > -  Error codes and callback support in new x509 validator made 
> > compatible with p5-Net_SSLeay tests.
> > +  Error codes and callback support in new X.509 validator made 
> > compatible with p5-Net_SSLeay tests.
> >  
> >  
> >  Internal Improvements
> >  
> > -  Numerous fixes and improvements to the new X509 validator to 
> > ensure compatible error codes
> > +  Numerous fixes and improvements to the new X.509 validator to 
> > ensure compatible error codes
> > and callback support compatible with the legacy OpenSSL validator.
> >  
> >  
> > 

Re: [PATCH] [www] - spell 'X.509' consistently when talking about the standard

[Raf Czlonka]

On Wed, Oct 06, 2021 at 11:50:01PM BST, Raf Czlonka wrote:
> Hello,
> 
> Outside of X509_* functions, filenames, openssl(1) commands, etc.
> there are places where the spelling of 'X.509' could be made
> consistent when talking about the standard.

I realise the patch might have been too long so how about only the
upcoming release page for now?

Cheers,

Raf

Index: 70.html
===
RCS file: /cvs/www/70.html,v
retrieving revision 1.82
diff -u -p -r1.82 70.html
--- 70.html 8 Oct 2021 03:44:52 -   1.82
+++ 70.html 8 Oct 2021 09:11:34 -
@@ -567,7 +567,7 @@ to 7.0.
roa-sets.
In RRDP, limited the number of deltas to 300 per repo. If more 
deltas
   exist, downloading a full snapshot is faster.
-   Limited the validation depth of X509 certificate chains to 12, 
double
+   Limited the validation depth of X.509 certificate chains to 12, 
double
   the current depth seen in RPKI.
 
 
@@ -687,7 +687,7 @@ to 7.0.
 New Features
 
   Added support for OpenSSL 1.1.1 TLSv1.3 APIs.
-  Enabled the new x509 validator to allow verification of modern 
certificate chains.
+  Enabled the new X.509 validator to allow verification of modern 
certificate chains.
 
 
 Portable Improvements
@@ -750,12 +750,12 @@ to 7.0.
 
   Added additional state machine test coverage.
   Improved integration test support with ruby/openssl tests.
-  Error codes and callback support in new x509 validator made 
compatible with p5-Net_SSLeay tests.
+  Error codes and callback support in new X.509 validator made 
compatible with p5-Net_SSLeay tests.
 
 
 Internal Improvements
 
-  Numerous fixes and improvements to the new X509 validator to ensure 
compatible error codes
+  Numerous fixes and improvements to the new X.509 validator to ensure 
compatible error codes
and callback support compatible with the legacy OpenSSL validator.
 
 

[PATCH] [www] - spell 'X.509' consistently when talking about the standard

[Raf Czlonka]

Hello,

Outside of X509_* functions, filenames, openssl(1) commands, etc.
there are places where the spelling of 'X.509' could be made
consistent when talking about the standard.

Regards,

Raf

Index: plus29.html
===
RCS file: /cvs/www/plus29.html,v
retrieving revision 1.87
diff -u -p -r1.87 plus29.html
--- plus29.html 19 Sep 2021 19:22:16 -  1.87
+++ plus29.html 6 Oct 2021 22:46:22 -
@@ -199,7 +199,7 @@ For changes in other releases, click bel
 Avoid losing RTC after suspend/resume on some laptops.
 Repair an integer conversion bug in https://man.openbsd.org/pms.4;>pms(4) which fixes the mouse 
resolution setting in X.
 Fix non-TCP protocol mappings in https://man.openbsd.org/ipnat.4;>ipnat(4).
-In https://man.openbsd.org/isakmpd.8;>isakmpd(8), encode X509 
expirations into KeyNote credientials/policies.
+In https://man.openbsd.org/isakmpd.8;>isakmpd(8), encode 
X.509 expirations into KeyNote credientials/policies.
 In https://man.openbsd.org/pppoe.8;>pppoe(8), try every BPF 
device, not just even-numbered ones.
 Support -C flag in https://man.openbsd.org/nm.1;>nm(1).
 Update ISC https://man.openbsd.org/cron.8;>cron(8) to 4.0b1, 
maintaining our local changes, including signal handling fixes.
Index: plus30.html
===
RCS file: /cvs/www/plus30.html,v
retrieving revision 1.65
diff -u -p -r1.65 plus30.html
--- plus30.html 19 Sep 2021 19:22:16 -  1.65
+++ plus30.html 6 Oct 2021 22:46:22 -
@@ -455,7 +455,7 @@ For changes in other releases, click bel
 New https://man.openbsd.org/md5.1;>md5(1) implementation with 
a BSD copyright and other improvements; includes regression test.
 Improve https://man.openbsd.org/swapctl.8;>swapctl(8).
 Don't allow packets that need https://man.openbsd.org/ipsec.4;>IPsec(4) processing to be 
bridge-broadcast.
-Expand handling of X509 and KeyNote certificates in https://man.openbsd.org/isakmpd.8;>isakmpd(8).
+Expand handling of X.509 and KeyNote certificates in https://man.openbsd.org/isakmpd.8;>isakmpd(8).
 Fix some https://man.openbsd.org/tcp.4;>tcp(4) behaviour with 
connections in the CLOSING state.
 Some https://man.openbsd.org/ld.so.1;>ld.so(1) renovations.
 Repair https://man.openbsd.org/kqueue.2;>kqueue(2) related 
panic.
Index: plus55.html
===
RCS file: /cvs/www/plus55.html,v
retrieving revision 1.32
diff -u -p -r1.32 plus55.html
--- plus55.html 19 Sep 2021 19:22:17 -  1.32
+++ plus55.html 6 Oct 2021 22:46:22 -
@@ -712,7 +712,7 @@ For changes in other releases, click bel
 https://man.openbsd.org/iked.8;>iked(8) now drops duplicate 
requests, to avoid corrupt child-SA tables.
 Made https://man.openbsd.org/iked.8;>iked(8) discard & free 
duplicate IKESAs; made sure new SAs are not created that cannot be inserted in 
the SA tree.
 Include hexdump in https://man.openbsd.org/iked.8;>iked(8) 
debug output only for -vvv.
-Support raw pubkey authentication w/o x509 certificates in https://man.openbsd.org/iked.8;>iked(8).
+Support raw pubkey authentication w/o X.509 certificates in https://man.openbsd.org/iked.8;>iked(8).
 When https://man.openbsd.org/wpi.4;>wpi(4) has a fatal 
firmware error, reset the chip, reload the firmware and bring the interface up 
again.
 Limit the number of envelopes to recall in the https://man.openbsd.org/smtpd.8;>smtpd(8) hoststat cache.
 Removed some double frees in https://man.openbsd.org/fuse.4;>fuse(4).
@@ -808,7 +808,7 @@ For changes in other releases, click bel
 Made https://man.openbsd.org/athn.4;>athn(4) tick calculation 
work as intended. Should fix excessive timeouts and "Michael mic" errors.
 Cope with the EAGAIN API change for https://man.openbsd.org/msgbuf_write.3;>msgbuf_write(3) in various 
daemons.
 Improvements for https://man.openbsd.org/sppp.4;>sppp(4) 
address assignment and related issues in IPv6CP; deal with IFID collisions 
instead of ignoring them; use https://man.openbsd.org/arc4random.3;>arc4random(3) during IFID 
generation; assign destination address to /128 point-to-point links.
-Fixed https://man.openbsd.org/isakmpd.8;>isakmpd(8) parameter 
types for x509 routines.
+Fixed https://man.openbsd.org/isakmpd.8;>isakmpd(8) parameter 
types for X.509 routines.
 Be more specific in https://man.openbsd.org/ksh.1;>ksh(1) 
ulimit error messages.
 Fixed ^C handling in miniroot.
 
@@ -892,7 +892,7 @@ For changes in other releases, click bel
 Enabled TX checksum offload in https://man.openbsd.org/jme.4;>jme(4).
 Removed unnecessary spinlock that slowed down https://man.openbsd.org/pthread_getspecific.3;>pthread_getspecific(3).
 Use curve25519 for default https://man.openbsd.org/sshd.8;>sshd(8) key exchange 
(curve25519-sha...@libssh.org).
-Let https://man.openbsd.org/ssh.1;>ssh(1) support pkcs#11 
tokens that only provide x509 certificates instead of raw pubkeys (fixes 
bz#1908).
+Let 

Re: [PATCH] usr.sbin/ldapd: Match bind DN by suffix instead of complete DN.

[Raf Czlonka]

On Sat, Oct 02, 2021 at 02:15:53PM BST, vifino wrote:
> Index: ldapd.conf.5
> ===
> RCS file: /cvs/src/usr.sbin/ldapd/ldapd.conf.5,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 ldapd.conf.5
> --- ldapd.conf.5  24 Jun 2020 07:20:47 -  1.27
> +++ ldapd.conf.5  2 Oct 2021 12:43:29 -
> @@ -270,7 +270,7 @@ Finally, the filter rule can match a bin
>  The filter rule matches by any bind dn, including anonymous binds.
>  .It by Ar DN
>  The filter rule matches only if the requestor has previously performed
> -a bind as the specified distinguished name.
> +a bind as the specified distinguished name or a decendant.
   ^
A spellchecker[0] would have caught that ;^)

[0] https://manpages.bsd.lv/part3-3-2.html

Regards,

Raf

[PATCH] [src] etc/root/root.mail - /usr/X11R6/README no longer provided

[Raf Czlonka]

Hello,

This diff is simply to just highlight the fact that the file is not
longer provided[0], not necessarily remove the information outright
and not replace it with anything - I simply can't think of anything
concise right now.

[0] https://cvsweb.openbsd.org/cgi-bin/cvsweb/xenocara/distrib/notes/

Index: etc/root/root.mail
===
RCS file: /cvs/src/etc/root/root.mail,v
retrieving revision 1.146
diff -u -p -r1.146 root.mail
--- etc/root/root.mail  17 Aug 2021 15:03:56 -  1.146
+++ etc/root/root.mail  2 Sep 2021 10:11:31 -
@@ -22,9 +22,6 @@ the popular emacs editor.)
 Again, PLEASE READ THE MANUAL PAGES.  Our developers have spent countless
 hours improving them so that they are clear and precise.
 
-If you have installed the X11 file sets during the install process, you can
-find further information regarding configuration in the file /usr/X11R6/README.
-
 Several popular binary packages (pre-compiled applications) are
 available from mirror sites.  Mirror selection is usually automatic
 during install/upgrade -- a mirror URL from https://www.openbsd.org/ftp.html

Re: Removal of old users and groups in the upgrade notes

[Raf Czlonka]

Ping.

On Mon, May 24, 2021 at 05:06:08PM BST, Raf Czlonka wrote:
> Ping.
> 
> On Sun, May 09, 2021 at 01:07:15PM BST, Raf Czlonka wrote:
> > Hello,
> > 
> > This is both a general question and specific example of removal of
> > old users and groups.
> > 
> > With the release of 6.7, rebound(8) got tedued[0] ;^)
> > However, there were no specific instructions regarding removal of
> > _rebound user and group, or the /etc/rebound.conf file, in the
> > upgrade notes - I had the latter added to my /etc/sysclean.ignore
> > file and didn't notice it until today.
> > 
> > Grepping for '{user,group}del' under 'faq/upgrade*', shows a handful
> > of examples - some are straight after a user or a group has been
> > retired[1], others when the UID/GID got recycled[2].
> > 
> > Probably too little too late but, should the 6.7 upgrade page get:
> > 
> > # rm /etc/rebound.conf
> > # userdel _rebound
> > # groupdel _rebound
> > 
> > instructions added, i.e. need I bother you with a diff, or will you
> > simply add it once the UID/GID gets recycled?
> > 
> > [0] https://www.openbsd.org/faq/upgrade67.html
> > [1] https://www.openbsd.org/faq/upgrade61.html
> > [2] https://www.openbsd.org/faq/upgrade64.html
> > 
> > Cheers,
> > 
> > Raf

Re: [PATCH] [src] etc/services - duplicates

[Raf Czlonka]

Ping.

On Mon, May 24, 2021 at 05:05:31PM BST, Raf Czlonka wrote:
> Ping.
> 
> On Sun, May 16, 2021 at 07:10:22PM BST, Raf Czlonka wrote:
> > Hello,
> > 
> > During recent services(5)-related threads, I glanced over the file
> > and noticed a duplicate - namely(sic!), "nameserver" is being used
> > both as the a service name, as well as an alias for "domain".
> > 
> > nameserver  42/tcp  name# IEN 116
> > domain  53/tcp  nameserver  # name-domain server
> > domain  53/udp  nameserver
> > 
> > The above entries had remained unchanged since the file has been
> > imported into the tree[0]. As I found out some minutes later, NetBSD
> > have removed the duplicate in 1999[1].
> > 
> > As you can see from their commit[1], there is another duplicate
> > which has been removed from that file - "readnews". There, they
> > have removed it from:
> > 
> > netnews 532/tcp
> > 
> > and, even nowadays, still have it as a local alias[2]:
> > 
> > readnews119/tcp untp
> > 
> > on top of the usual[2]:
> > 
> > nntp119/tcp# Network News Transfer
> > nntp119/udp# Network News Transfer
> > 
> > while IANA entries look as follows[3]:
> > 
> > nntp119 tcp Network News Transfer
> > nntp119 udp Network News Transfer
> > netnews 532 tcp readnews
> > netnews 532 udp readnews
> > 
> > FreeBSD[4] and DragonFly BSD[5]:
> > 
> > nntp119/tcpusenet   #Network News Transfer Protocol
> > nntp119/udpusenet   #Network News Transfer Protocol
> > netnews 532/tcpreadnews
> > netnews 532/udpreadnews
> > 
> > To sum it up, I wasn't sure whether to remove it from:
> > 
> > nntp119/tcp readnews untp
> > 
> > or:
> > 
> > netnews 532/tcp readnews
> > 
> > Perhaps add "usenet" alias to the "nntp" entry while there...?
> > 
> > Either way, I'm leaving it "as is", at least for now.
> > 
> > In terms of the actual diff, I've also taken the liberty to update
> > the comment to the more modern/familiar - "Domain Name Server" -
> > as, nowadays, it is being used universally[2][3][4][5].
> > 
> > [0] https://cvsweb.openbsd.org/~checkout~/src/etc/services?rev=1.1
> > [1] 
> > http://cvsweb.netbsd.org/bsdweb.cgi/src/etc/services.diff?r1=1.30=1.31_with_tag=MAIN=h
> > [2] 
> > http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/etc/services?rev=1.103
> > [3] 
> > https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
> > [4] https://cgit.freebsd.org/src/plain/usr.sbin/services_mkdb/services
> > [5] 
> > https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/etc/services
> > 
> > Regards,
> > 
> > Raf
> > 
> > Index: etc/services
> > ===
> > RCS file: /cvs/src/etc/services,v
> > retrieving revision 1.102
> > diff -u -p -r1.102 services
> > --- etc/services12 May 2021 06:50:33 -  1.102
> > +++ etc/services16 May 2021 17:46:38 -
> > @@ -33,8 +33,8 @@ nameserver42/tcp  name# IEN 
> > 116
> >  whois  43/tcp  nicname
> >  tacacs 49/tcp  tacas+  # Login Host Protocol 
> > (TACACS)
> >  tacacs 49/udp  tacas+  # Login Host Protocol 
> > (TACACS)
> > -domain 53/tcp  nameserver  # name-domain server
> > -domain 53/udp  nameserver
> > +domain 53/tcp  # Domain Name Server
> > +domain 53/udp  # Domain Name Server
> >  mtp57/tcp  # deprecated
> >  bootps 67/tcp  # BOOTP server
> >  bootps 67/udp

Re: hidms: don't ignore mice with no x/y coordinates

[Raf Czlonka]

On Mon, May 24, 2021 at 03:15:14PM BST, joshua stein wrote:
> A bug was reported where a Kensington USB trackball didn't work 
> properly:
> 
> uhidev4 at uhub0 port 6 configuration 1 interface 0 "Kensington Expert 
> Wireless TB" rev 2.00/1.02 addr 9
> uhidev4: iclass 3/1, 3 report ids
> ums3 at uhidev4 reportid 1
> ums3: mouse has no X report
> ums4 at uhidev4 reportid 2: 0 button
> wsmouse3 at ums4 mux 0
> 
> After looking at the HID report descriptor, this device is weird in 
> that it puts the buttons and wheel on one report and the trackball 
> X/Y coordinates an another.  This causes uhidev to attach two ums 
> devices, but the first one fails because there are no X/Y reports 
> found.
> 
> The proper fix is probably to make ums act like umt and use 
> UHIDEV_CLAIM_MULTIPLE_REPORTID to find all of the necessary reports 
> and attach to multiple at once if needed.  I started working on this 
> but all of the logic in hidms_setup gets tricky when it has to look 
> at multiple reports.  So an easier fix is to just not consider a 
> mouse with no X/Y reports invalid.
> 
> Now the device attaches to the first button/wheel report:
> 
> uhidev4 at uhub4 port 4 configuration 1 interface 0 "Kensington Expert 
> Wireless TB" rev 2.00/1.02 addr 3
> uhidev4: iclass 3/1, 3 report ids
> ums1 at uhidev4 reportid 1: 5 buttons, Z and W dir
> wsmouse1 at ums1 mux 0
> ums2 at uhidev4 reportid 2: 0 buttons
> wsmouse2 at ums2 mux 0
> 
> Checking dmesglog for 'no X report' yields a lot of results, so this 
> may help on other devices.

Hi all,

Just an FYI, this is the trackball in question:


https://www.kensington.com/en-gb/p/products/control/trackballs/expert-mouse-wireless-trackball-1/

In its current state, it can only be used as a paperweight as, when
plugged in, only the trackball itself (pointer) works but none of
its four buttons or scroll ring do - they aren't being recognised
at all.  It works just fine on Linux, macOS, or Windows, though.

With the below patch, everything's fine - all four buttons and the
scroll ring are being recognised and work as expected.

Any chance of this getting in?

Regards,

Raf

> diff --git sys/dev/hid/hidms.c sys/dev/hid/hidms.c
> index ab9cd9c797e..92ca89537da 100644
> --- sys/dev/hid/hidms.c
> +++ sys/dev/hid/hidms.c
> @@ -76,10 +76,9 @@ hidms_setup(struct device *self, struct hidms *ms, 
> uint32_t quirks,
>   ms->sc_flags = quirks;
>  
>   if (!hid_locate(desc, dlen, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), id,
> - hid_input, >sc_loc_x, )) {
> - printf("\n%s: mouse has no X report\n", self->dv_xname);
> - return ENXIO;
> - }
> + hid_input, >sc_loc_x, ))
> + ms->sc_loc_x.size = 0;
> +
>   switch(flags & MOUSE_FLAGS_MASK) {
>   case 0:
>   ms->sc_flags |= HIDMS_ABSX;
> @@ -93,10 +92,9 @@ hidms_setup(struct device *self, struct hidms *ms, 
> uint32_t quirks,
>   }
>  
>   if (!hid_locate(desc, dlen, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), id,
> - hid_input, >sc_loc_y, )) {
> - printf("\n%s: mouse has no Y report\n", self->dv_xname);
> - return ENXIO;
> - }
> + hid_input, >sc_loc_y, ))
> + ms->sc_loc_y.size = 0;
> +
>   switch(flags & MOUSE_FLAGS_MASK) {
>   case 0:
>   ms->sc_flags |= HIDMS_ABSY;
> @@ -292,7 +290,7 @@ hidms_attach(struct hidms *ms, const struct 
> wsmouse_accessops *ops)
>  #endif
>  
>   printf(": %d button%s",
> - ms->sc_num_buttons, ms->sc_num_buttons <= 1 ? "" : "s");
> + ms->sc_num_buttons, ms->sc_num_buttons == 1 ? "" : "s");
>   switch (ms->sc_flags & (HIDMS_Z | HIDMS_W)) {
>   case HIDMS_Z:
>   printf(", Z dir");
> 

Re: sdmmc(4): check and retry bus width change

[Raf Czlonka]

On Tue, Jun 01, 2021 at 09:29:55AM BST, Patrick Wildt wrote:
> Am Mon, Feb 22, 2021 at 08:10:21PM +0100 schrieb Patrick Wildt:
> > Hi,
> > 
> > it seems like some eMMCs are not capable of doing 8-bit operation,
> > even if the controller supports it.  I was questioning our drivers
> > first, but it looks like it's the same on Linux.  In the case that
> > 8-bit doesn't work, they seem to fall back to lower values to make
> > that HW work.
> > 
> > This diff implements a mechanism that tries 8-bit, if available,
> > then 4-bit and in the end falls back to 1-bit.  This makes my HW
> > work, but I would like to have this tested by a broader audience.
> > 
> > Apparently there's a "bus test" command, but it isn't implemented
> > on all host controllers.  Hence I simply try to read the EXT_CSD
> > to make sure the transfer works.
> > 
> > For testing, a print like
> > 
> > printf("%s: using %u-bit width\n", DEVNAME(sc), width);
> > 
> > could be added at line 928.
> > 
> > What could possible regressions be?  The width could become smaller
> > then previously.  This would reduce the read/write transfer speed.
> > Also it's possible that eMMCs are not recognized/initialized anymore.
> > 
> > What could possible improvements be?  eMMCs that previously didn't
> > work now work, with at least 1-bit or 4-bit wide transfers.
> > 
> > Please note that this only works for eMMCs.  SD cards are *not* using
> > this code path.  SD cards have a different initialization code path.
> > 
> > Please report any changes or non-changes.  If nothing changes, that's
> > perfect.
> > 
> > Patrick
> 
> Anyone want to give this a try?  It's basically relevant for all
> ARM machines with eMMC ('soldered SD cards'), and they should work
> as well as before.

Hi Patrick,

I've managed to build the kernel with your patch and the machine
booted up just fine the first time - it was as slow as before ;^)

Then, I rebooted to the old kernel to compare dmesg before and after
- they're identical, BTW - and I shut the machine down.

I got a crash (ddb) on the next boot - don't have the time to
transcribe it right now, I'm afraid.

https://photos.app.goo.gl/Kr54uoppT4b6gR179

On subsequent boot I got:

ehci_device_bulk_start: not done, ex=0xff800800f378

scrolling(?) continuously on the screen.

Next boot, ddb again.

Old kernel booted up just fine.

Regards,

Raf

OpenBSD 6.9-current (GENERIC.MP) #0: Wed Jun  2 09:36:58 BST 2021
r...@foo.example.org:/usr/src/sys/arch/arm64/compile/GENERIC.MP
real mem  = 2013835264 (1920MB)
avail mem = 1919496192 (1830MB)
random: good seed from bootblocks
mainbus0 at root: Pinebook
psci0 at mainbus0: PSCI 1.1, SMCCC 1.2
cpu0 at mainbus0 mpidr 0: ARM Cortex-A53 r0p4
cpu0: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 512KB 64b/line 16-way L2 cache
cpu0: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu1 at mainbus0 mpidr 1: ARM Cortex-A53 r0p4
cpu1: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu1: 512KB 64b/line 16-way L2 cache
cpu1: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu2 at mainbus0 mpidr 2: ARM Cortex-A53 r0p4
cpu2: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu2: 512KB 64b/line 16-way L2 cache
cpu2: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu3 at mainbus0 mpidr 3: ARM Cortex-A53 r0p4
cpu3: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu3: 512KB 64b/line 16-way L2 cache
cpu3: CRC32,SHA2,SHA1,AES+PMULL,ASID16
efi0 at mainbus0: UEFI 2.8
efi0: Das U-Boot rev 0x20200400
apm0 at mainbus0
"osc24M_clk" at mainbus0 not configured
"osc32k_clk" at mainbus0 not configured
"internal-osc-clk" at mainbus0 not configured
simpleaudio0 at mainbus0
"spdif-out" at mainbus0 not configured
agtimer0 at mainbus0: 24000 kHz
simplebus0 at mainbus0: "soc"
sxisyscon0 at simplebus0
sxisid0 at simplebus0
sxiccmu0 at simplebus0
sxipio0 at simplebus0: 103 pins
ampintc0 at simplebus0 nirq 224, ncpu 4 ipi: 0, 1: "interrupt-controller"
sxirtc0 at simplebus0
sxiccmu1 at simplebus0
sxipio1 at simplebus0: 13 pins
sxirsb0 at simplebus0
axppmic0 at sxirsb0 addr 0x3a3: AXP803
"de2" at simplebus0 not configured
"dma-controller" at simplebus0 not configured
"lcd-controller" at simplebus0 not configured
"lcd-controller" at simplebus0 not configured
sximmc0 at simplebus0
sdmmc0 at sximmc0: 4-bit, sd high-speed, mmc high-speed, dma
sximmc1 at simplebus0
sdmmc1 at sximmc1: 4-bit, sd high-speed, mmc high-speed, dma
sximmc2 at simplebus0
sdmmc2 at sximmc2: 8-bit, sd high-speed, mmc high-speed, dma
"phy" at simplebus0 not configured
ehci0 at simplebus0
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00 
addr 1
ohci0 at simplebus0: version 1.0
ehci1 at simplebus0
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00 
addr 1
ohci1 at simplebus0: version 1.0
com0 at simplebus0: ns16550, no working fifo
sxipwm0 at simplebus0
"hdmi-phy" at 

Re: [PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

On Mon, May 24, 2021 at 05:07:50PM BST, Theo de Raadt wrote:
> Raf Czlonka  wrote:
> 
> > On Mon, May 24, 2021 at 04:10:00PM BST, Theo de Raadt wrote:
> > > But does it matter?
> > 
> > Did this[0] matter?
> 
> If you aren't curious enough to read the Makefile, devlist2h.awk,
> usbdevs.h, and usbdevs_data.h to recognize the full production
> of your changes (to wit, #defines AND structured strings in every
> kernel), then I don't understand what you are doing.

Hi Theo,

All I was trying to do is to have the vendor ID "pretty"-printed -
I thought that part was obvious.

Did I realise what the full impact of such change would be? Of
course not - otherwise, I would not have emailed the patch in the
first place.

Errare humanum est.

Raf

Re: Removal of old users and groups in the upgrade notes

[Raf Czlonka]

Ping.

On Sun, May 09, 2021 at 01:07:15PM BST, Raf Czlonka wrote:
> Hello,
> 
> This is both a general question and specific example of removal of
> old users and groups.
> 
> With the release of 6.7, rebound(8) got tedued[0] ;^)
> However, there were no specific instructions regarding removal of
> _rebound user and group, or the /etc/rebound.conf file, in the
> upgrade notes - I had the latter added to my /etc/sysclean.ignore
> file and didn't notice it until today.
> 
> Grepping for '{user,group}del' under 'faq/upgrade*', shows a handful
> of examples - some are straight after a user or a group has been
> retired[1], others when the UID/GID got recycled[2].
> 
> Probably too little too late but, should the 6.7 upgrade page get:
> 
>   # rm /etc/rebound.conf
>   # userdel _rebound
>   # groupdel _rebound
> 
> instructions added, i.e. need I bother you with a diff, or will you
> simply add it once the UID/GID gets recycled?
> 
> [0] https://www.openbsd.org/faq/upgrade67.html
> [1] https://www.openbsd.org/faq/upgrade61.html
> [2] https://www.openbsd.org/faq/upgrade64.html
> 
> Cheers,
> 
> Raf

Re: [PATCH] [src] etc/services - duplicates

[Raf Czlonka]

Ping.

On Sun, May 16, 2021 at 07:10:22PM BST, Raf Czlonka wrote:
> Hello,
> 
> During recent services(5)-related threads, I glanced over the file
> and noticed a duplicate - namely(sic!), "nameserver" is being used
> both as the a service name, as well as an alias for "domain".
> 
>   nameserver  42/tcp  name# IEN 116
>   domain  53/tcp  nameserver  # name-domain server
>   domain  53/udp  nameserver
> 
> The above entries had remained unchanged since the file has been
> imported into the tree[0]. As I found out some minutes later, NetBSD
> have removed the duplicate in 1999[1].
> 
> As you can see from their commit[1], there is another duplicate
> which has been removed from that file - "readnews". There, they
> have removed it from:
> 
>   netnews 532/tcp
> 
> and, even nowadays, still have it as a local alias[2]:
> 
>   readnews119/tcp untp
> 
> on top of the usual[2]:
> 
>   nntp119/tcp# Network News Transfer
>   nntp119/udp# Network News Transfer
> 
> while IANA entries look as follows[3]:
> 
>   nntp119 tcp Network News Transfer
>   nntp119 udp Network News Transfer
>   netnews 532 tcp readnews
>   netnews 532 udp readnews
> 
> FreeBSD[4] and DragonFly BSD[5]:
> 
>   nntp119/tcpusenet   #Network News Transfer Protocol
>   nntp119/udpusenet   #Network News Transfer Protocol
>   netnews 532/tcpreadnews
>   netnews 532/udpreadnews
> 
> To sum it up, I wasn't sure whether to remove it from:
> 
>   nntp119/tcp readnews untp
> 
> or:
> 
>   netnews 532/tcp readnews
> 
> Perhaps add "usenet" alias to the "nntp" entry while there...?
> 
> Either way, I'm leaving it "as is", at least for now.
> 
> In terms of the actual diff, I've also taken the liberty to update
> the comment to the more modern/familiar - "Domain Name Server" -
> as, nowadays, it is being used universally[2][3][4][5].
> 
> [0] https://cvsweb.openbsd.org/~checkout~/src/etc/services?rev=1.1
> [1] 
> http://cvsweb.netbsd.org/bsdweb.cgi/src/etc/services.diff?r1=1.30=1.31_with_tag=MAIN=h
> [2] http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/etc/services?rev=1.103
> [3] 
> https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
> [4] https://cgit.freebsd.org/src/plain/usr.sbin/services_mkdb/services
> [5] 
> https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/etc/services
> 
> Regards,
> 
> Raf
> 
> Index: etc/services
> ===
> RCS file: /cvs/src/etc/services,v
> retrieving revision 1.102
> diff -u -p -r1.102 services
> --- etc/services  12 May 2021 06:50:33 -  1.102
> +++ etc/services  16 May 2021 17:46:38 -
> @@ -33,8 +33,8 @@ nameserver  42/tcp  name# IEN 116
>  whois43/tcp  nicname
>  tacacs   49/tcp  tacas+  # Login Host Protocol 
> (TACACS)
>  tacacs   49/udp  tacas+  # Login Host Protocol 
> (TACACS)
> -domain   53/tcp  nameserver  # name-domain server
> -domain   53/udp  nameserver
> +domain   53/tcp  # Domain Name Server
> +domain   53/udp  # Domain Name Server
>  mtp  57/tcp  # deprecated
>  bootps   67/tcp  # BOOTP server
>  bootps   67/udp

Re: [PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

On Mon, May 24, 2021 at 04:37:57PM BST, Stuart Henderson wrote:
> On 2021/05/24 16:27, Raf Czlonka wrote:
> > On Mon, May 24, 2021 at 04:10:00PM BST, Theo de Raadt wrote:
> > > But does it matter?
> > 
> > Did this[0] matter?
> 
> > [0] 
> > https://cvsweb.openbsd.org/src/sys/dev/usb/usbdevs.diff?r1=1.698=1.699=date=h
> 
> Yes, that one is used in a driver.

Thanks!

R.

Re: [PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

On Mon, May 24, 2021 at 04:28:36PM BST, Jonathan Gray wrote:
> On Mon, May 24, 2021 at 03:52:44PM +0100, Raf Czlonka wrote:
> > Hello,
> > 
> > Pretty self-explanatory - add "SHARKOON Technologies GmbH" vendor ID.
> 
> 0x1ea7 / 7847 is 'SEMITEK INTERNATIONAL (HK) HOLDING LTD.' in
> https://usb.org/sites/default/files/vendor_ids033021.pdf

Hi Jonathan,

Elsewhere[0][1][2], this mouse shows up as what's below but it's
most likely due to the fact that it's several years old.

Now I see that there's been an update[3] - vendor renamed or sold?

Either way, thanks for the link!

[0] https://devicehunt.com/view/type/usb/vendor/1EA7
[1] https://www.devicekb.com/en/hardware/usb-vendors/vid_1ea7
[2] http://www.linux-usb.org/usb.ids
[3] https://usb-ids.gowdy.us/read/UD/1ea7

Cheers,

Raf

> > 
> > Regards,
> > 
> > Raf
> > 
> > Index: sys/dev/usb/usbdevs
> > ===
> > RCS file: /cvs/src/sys/dev/usb/usbdevs,v
> > retrieving revision 1.740
> > diff -u -p -r1.740 usbdevs
> > --- sys/dev/usb/usbdevs 18 May 2021 14:23:03 -  1.740
> > +++ sys/dev/usb/usbdevs 24 May 2021 14:37:14 -
> > @@ -618,6 +618,7 @@ vendor SELUXIT  0x1d6f  Seluxit
> >  vendor METAGEEK0x1dd5  MetaGeek
> >  vendor SIMCOM  0x1e0e  SIMCom Wireless Solutions Co., Ltd.
> >  vendor FESTO   0x1e29  Festo
> > +vendor SHARKOON0x1ea7  SHARKOON Technologies GmbH
> >  vendor MODACOM 0x1eb8  Modacom
> >  vendor AIRTIES 0x1eda  AirTies
> >  vendor LAKESHORE   0x1fb9  Lake Shore
> > 
> > 

Re: [PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

On Mon, May 24, 2021 at 04:10:00PM BST, Theo de Raadt wrote:
> But does it matter?

Did this[0] matter?

Well, in the grand scheme of things, not many things do, really.

Or is it just about the length of the vendor ID?

If the latter, then yes - a bit unfortunate that it's on the longer
side... I didn't come up with the name.

Maybe remove all without any product IDs? Your call.

[0] 
https://cvsweb.openbsd.org/src/sys/dev/usb/usbdevs.diff?r1=1.698=1.699=date=h

R.

> It adds sizeof pointer + 28 bytes to every OpenBSD kernel.
> 
> I have seriously considered deleting usbdevs device-naming support,
> because the cost keeps growing without bound.
> 
> Raf Czlonka  wrote:
> 
> > On Mon, May 24, 2021 at 04:00:20PM BST, Theo de Raadt wrote:
> > > Without proof it is required, no.
> > 
> > Sure - hope this will suffice.
> > 
> > Before:
> > 
> > uhidev1 at uhub3 port 2 configuration 1 interface 0 "vendor 0x1ea7 2.4G 
> > Mouse" rev 1.10/2.00 addr 4
> > 
> > After:
> > 
> > uhidev1 at uhub3 port 2 configuration 1 interface 0 "SHARKOON 
> > Technologies GmbH 2.4G Mouse" rev 1.10/2.00 addr 4
> > 
> > Cheers,
> > 
> > Raf
> > 
> > > Raf Czlonka  wrote:
> > > 
> > > > Hello,
> > > > 
> > > > Pretty self-explanatory - add "SHARKOON Technologies GmbH" vendor ID.
> > > > 
> > > > Regards,
> > > > 
> > > > Raf
> > > > 
> > > > Index: sys/dev/usb/usbdevs
> > > > ===
> > > > RCS file: /cvs/src/sys/dev/usb/usbdevs,v
> > > > retrieving revision 1.740
> > > > diff -u -p -r1.740 usbdevs
> > > > --- sys/dev/usb/usbdevs 18 May 2021 14:23:03 -  1.740
> > > > +++ sys/dev/usb/usbdevs 24 May 2021 14:37:14 -
> > > > @@ -618,6 +618,7 @@ vendor SELUXIT  0x1d6f  Seluxit
> > > >  vendor METAGEEK0x1dd5  MetaGeek
> > > >  vendor SIMCOM  0x1e0e  SIMCom Wireless Solutions Co., Ltd.
> > > >  vendor FESTO   0x1e29  Festo
> > > > +vendor SHARKOON0x1ea7  SHARKOON Technologies GmbH
> > > >  vendor MODACOM 0x1eb8  Modacom
> > > >  vendor AIRTIES 0x1eda  AirTies
> > > >  vendor LAKESHORE   0x1fb9  Lake Shore
> > > > 

Re: [PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

On Mon, May 24, 2021 at 04:00:20PM BST, Theo de Raadt wrote:
> Without proof it is required, no.

Sure - hope this will suffice.

Before:

uhidev1 at uhub3 port 2 configuration 1 interface 0 "vendor 0x1ea7 2.4G 
Mouse" rev 1.10/2.00 addr 4

After:

uhidev1 at uhub3 port 2 configuration 1 interface 0 "SHARKOON 
Technologies GmbH 2.4G Mouse" rev 1.10/2.00 addr 4

Cheers,

Raf

> Raf Czlonka  wrote:
> 
> > Hello,
> > 
> > Pretty self-explanatory - add "SHARKOON Technologies GmbH" vendor ID.
> > 
> > Regards,
> > 
> > Raf
> > 
> > Index: sys/dev/usb/usbdevs
> > ===
> > RCS file: /cvs/src/sys/dev/usb/usbdevs,v
> > retrieving revision 1.740
> > diff -u -p -r1.740 usbdevs
> > --- sys/dev/usb/usbdevs 18 May 2021 14:23:03 -  1.740
> > +++ sys/dev/usb/usbdevs 24 May 2021 14:37:14 -
> > @@ -618,6 +618,7 @@ vendor SELUXIT  0x1d6f  Seluxit
> >  vendor METAGEEK0x1dd5  MetaGeek
> >  vendor SIMCOM  0x1e0e  SIMCom Wireless Solutions Co., Ltd.
> >  vendor FESTO   0x1e29  Festo
> > +vendor SHARKOON0x1ea7  SHARKOON Technologies GmbH
> >  vendor MODACOM 0x1eb8  Modacom
> >  vendor AIRTIES 0x1eda  AirTies
> >  vendor LAKESHORE   0x1fb9  Lake Shore
> > 

[PATCH] [src] sys/dev/usb/usbdevs - add "SHARKOON Technologies GmbH" vendor ID

[Raf Czlonka]

Hello,

Pretty self-explanatory - add "SHARKOON Technologies GmbH" vendor ID.

Regards,

Raf

Index: sys/dev/usb/usbdevs
===
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.740
diff -u -p -r1.740 usbdevs
--- sys/dev/usb/usbdevs 18 May 2021 14:23:03 -  1.740
+++ sys/dev/usb/usbdevs 24 May 2021 14:37:14 -
@@ -618,6 +618,7 @@ vendor SELUXIT  0x1d6f  Seluxit
 vendor METAGEEK0x1dd5  MetaGeek
 vendor SIMCOM  0x1e0e  SIMCom Wireless Solutions Co., Ltd.
 vendor FESTO   0x1e29  Festo
+vendor SHARKOON0x1ea7  SHARKOON Technologies GmbH
 vendor MODACOM 0x1eb8  Modacom
 vendor AIRTIES 0x1eda  AirTies
 vendor LAKESHORE   0x1fb9  Lake Shore

[PATCH] [src] etc/services - duplicates

[Raf Czlonka]

Hello,

During recent services(5)-related threads, I glanced over the file
and noticed a duplicate - namely(sic!), "nameserver" is being used
both as the a service name, as well as an alias for "domain".

nameserver  42/tcp  name# IEN 116
domain  53/tcp  nameserver  # name-domain server
domain  53/udp  nameserver

The above entries had remained unchanged since the file has been
imported into the tree[0]. As I found out some minutes later, NetBSD
have removed the duplicate in 1999[1].

As you can see from their commit[1], there is another duplicate
which has been removed from that file - "readnews". There, they
have removed it from:

netnews 532/tcp

and, even nowadays, still have it as a local alias[2]:

readnews119/tcp untp

on top of the usual[2]:

nntp119/tcp# Network News Transfer
nntp119/udp# Network News Transfer

while IANA entries look as follows[3]:

nntp119 tcp Network News Transfer
nntp119 udp Network News Transfer
netnews 532 tcp readnews
netnews 532 udp readnews

FreeBSD[4] and DragonFly BSD[5]:

nntp119/tcpusenet   #Network News Transfer Protocol
nntp119/udpusenet   #Network News Transfer Protocol
netnews 532/tcpreadnews
netnews 532/udpreadnews

To sum it up, I wasn't sure whether to remove it from:

nntp119/tcp readnews untp

or:

netnews 532/tcp readnews

Perhaps add "usenet" alias to the "nntp" entry while there...?

Either way, I'm leaving it "as is", at least for now.

In terms of the actual diff, I've also taken the liberty to update
the comment to the more modern/familiar - "Domain Name Server" -
as, nowadays, it is being used universally[2][3][4][5].

[0] https://cvsweb.openbsd.org/~checkout~/src/etc/services?rev=1.1
[1] 
http://cvsweb.netbsd.org/bsdweb.cgi/src/etc/services.diff?r1=1.30=1.31_with_tag=MAIN=h
[2] http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/etc/services?rev=1.103
[3] 
https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
[4] https://cgit.freebsd.org/src/plain/usr.sbin/services_mkdb/services
[5] https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/etc/services

Regards,

Raf

Index: etc/services
===
RCS file: /cvs/src/etc/services,v
retrieving revision 1.102
diff -u -p -r1.102 services
--- etc/services12 May 2021 06:50:33 -  1.102
+++ etc/services16 May 2021 17:46:38 -
@@ -33,8 +33,8 @@ nameserver42/tcp  name# IEN 116
 whois  43/tcp  nicname
 tacacs 49/tcp  tacas+  # Login Host Protocol (TACACS)
 tacacs 49/udp  tacas+  # Login Host Protocol (TACACS)
-domain 53/tcp  nameserver  # name-domain server
-domain 53/udp  nameserver
+domain 53/tcp  # Domain Name Server
+domain 53/udp  # Domain Name Server
 mtp57/tcp  # deprecated
 bootps 67/tcp  # BOOTP server
 bootps 67/udp

Removal of old users and groups in the upgrade notes

[Raf Czlonka]

Hello,

This is both a general question and specific example of removal of
old users and groups.

With the release of 6.7, rebound(8) got tedued[0] ;^)
However, there were no specific instructions regarding removal of
_rebound user and group, or the /etc/rebound.conf file, in the
upgrade notes - I had the latter added to my /etc/sysclean.ignore
file and didn't notice it until today.

Grepping for '{user,group}del' under 'faq/upgrade*', shows a handful
of examples - some are straight after a user or a group has been
retired[1], others when the UID/GID got recycled[2].

Probably too little too late but, should the 6.7 upgrade page get:

# rm /etc/rebound.conf
# userdel _rebound
# groupdel _rebound

instructions added, i.e. need I bother you with a diff, or will you
simply add it once the UID/GID gets recycled?

[0] https://www.openbsd.org/faq/upgrade67.html
[1] https://www.openbsd.org/faq/upgrade61.html
[2] https://www.openbsd.org/faq/upgrade64.html

Cheers,

Raf

Re: iwx and sysupgrade

[Raf Czlonka]

On Tue, May 04, 2021 at 11:33:31AM BST, Stefan Sperling wrote:
> On Tue, May 04, 2021 at 11:15:45AM +0100, Raf Czlonka wrote:
> > Unless I'm missing something, Hrvoje's not suing dhclient(8) - as
> > there's no 'dhcp' entry in the /etc/hostname.iwx0 - but dhcpleased(8),
> > most likely.
> 
> It is happening in the ramdisk kernel, which is still using dhclient
> at this point in time regardless of hostname.if keywords. The ramdisk
> install/upgrade scripts simply treat 'autoconf' like 'dhcp' and start
> dhclient.

Thanks for clarifying, Stefan.

I now see that both are, relatively, recent changes[0][1].

[0] 
https://cvsweb.openbsd.org/src/share/man/man5/hostname.if.5.diff?r1=1.74=1.75=h
[1] 
https://cvsweb.openbsd.org/src/distrib/miniroot/install.sub.diff?r1=1.1161=1.1162=h
[2] 
https://cvsweb.openbsd.org/src/distrib/miniroot/install.sub?rev=1.1162=text/x-cvsweb-markup

Cheers,

Raf

Re: iwx and sysupgrade

[Raf Czlonka]

On Tue, May 04, 2021 at 10:55:37AM BST, Stefan Sperling wrote:
> On Tue, May 04, 2021 at 11:47:43AM +0200, Hrvoje Popovski wrote:
> > I'm not sure that with iwx and eduroam, sysupgrade can finish. Maybe i
> > need to wait longer, will try that ... sysupgrade will finish if iwx is
> > disabled or hostname.iwx0 is removed from etc before doing sysupgrade
>  
> If iwx is disabled, dhclient won't be started. The problem for sysupgrade
> is that dhclient never goes into the background when it gets started. This
> has nothing to with iwx. It is about dhclient and 802.1x.
> 
> I suspect proper link state reporting doesn't occur with 802.1x and no
> wpa_supplicant running. But I don't know enough. Locate someone who
> understands dhclient, and/or someone who understands our 802.1x hack,
> and they will hopefully find a solution for you.
> 

Unless I'm missing something, Hrvoje's not suing dhclient(8) - as
there's no 'dhcp' entry in the /etc/hostname.iwx0 - but dhcpleased(8),
most likely.

P.S. Commenting only as an 'eduroam', not iwx(4), user.

Raf

Re: shell manpage tweaks wrt getopt

[Raf Czlonka]

On Fri, Apr 30, 2021 at 12:14:26PM BST, Marc Espie wrote:
> On Fri, Apr 30, 2021 at 12:03:00PM +0100, Raf Czlonka wrote:
> > Hi Mark,
> > 
> > You and me both ;^)
> > 
> > Until recently, I thought that getopt(1) was POSIX, whereas it is
> > in fact getopts(1), and it is not a shell built-in there, but a
> > utility[0].
> 
> Nope, it is a shell built-in... the "wording" of posix is a bit strange,
> but you can't possibly set variables inside the shell from an outside
> command.
> 
> It has the same status as read.

You're obviously right - the "utility" got me confused :^P

R.

Re: shell manpage tweaks wrt getopt

[Raf Czlonka]

Hi Mark,

You and me both ;^)

Until recently, I thought that getopt(1) was POSIX, whereas it is
in fact getopts(1), and it is not a shell built-in there, but a
utility[0].

[0] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/getopts.html

Cheers,

Raf

On Fri, Apr 30, 2021 at 10:54:16AM BST, Marc Espie wrote:
> Until a patch from naddy, I wasn't even aware of getopts in sh(1)
> 
> Unless I made some mistakes, this translates the example in getopt(1)
> manpage.
> 
> It's likely some stronger wording might be adequate, I suspect some
> of the BUGS section in getopt(1) does not apply to the sh(1) built-in.
> 
> Index: bin/ksh/sh.1
> ===
> RCS file: /cvs/src/bin/ksh/sh.1,v
> retrieving revision 1.152
> diff -u -p -r1.152 sh.1
> --- bin/ksh/sh.1  22 May 2019 15:23:23 -  1.152
> +++ bin/ksh/sh.1  30 Apr 2021 09:51:42 -
> @@ -508,6 +508,26 @@ is a colon,
>  .Ev OPTARG
>  is set to the unsupported option,
>  otherwise an error message is displayed.
> +.Pp
> +The following example has identical functionality to the
> +example in
> +.Xr getopt 1 .
> +.Bd -literal -offset indent
> +while getopts abo: name
> +do
> + case "$name"
> + in
> + a|b)
> + flag="-$name";;
> + o)
> + oarg="$OPTARG";;
> + ?)
> + echo "Usage: ..."
> + exit 2
> + ;;
> + esac
> +done
> +.Ed
>  .It Ic hash Op Fl r | Ar utility
>  Add
>  .Ar utility
> Index: usr.bin/getopt/getopt.1
> ===
> RCS file: /cvs/src/usr.bin/getopt/getopt.1,v
> retrieving revision 1.19
> diff -u -p -r1.19 getopt.1
> --- usr.bin/getopt/getopt.1   16 Mar 2018 16:58:26 -  1.19
> +++ usr.bin/getopt/getopt.1   30 Apr 2021 09:51:42 -
> @@ -54,7 +54,7 @@ which requires an argument.
>  args=`getopt abo: $*`
>  if [ $? -ne 0 ]
>  then
> - echo 'Usage: ...'
> + echo "Usage: ..."
>   exit 2
>  fi
>  set -- $args
> @@ -79,6 +79,11 @@ cmd -a -o arg file file
>  cmd -oarg -a file file
>  cmd -a -oarg -- file file
>  .Ed
> +Note that
> +.Xr sh 1
> +offers the
> +.Ic getopts
> +built-in with a simpler usage.
>  .Sh DIAGNOSTICS
>  .Nm
>  prints an error message on the standard error output when it
> 

Re: httpd.conf grammar

[Raf Czlonka]

Hello,

Could this get committed before the freeze?

Cheers,

Raf

On Mon, Mar 22, 2021 at 02:20:42PM GMT, Jason McIntyre wrote:
> On Mon, Mar 22, 2021 at 01:33:34PM +0000, Raf Czlonka wrote:
> > On Mon, Mar 22, 2021 at 07:08:32AM GMT, Jason McIntyre wrote:
> > > On Sun, Mar 21, 2021 at 10:58:02PM +, Raf Czlonka wrote:
> > > > 
> > > > Hi Laurie,
> > > > 
> > > > I'd simply use the existing wording, without getting into details.
> > > > 
> > > > While there, "braces" dominate the manual page, with a single
> > > > occurrence of "brackets" so let's change that too, for consistency.
> > > > 
> > > > Regards,
> > > > 
> > > > Raf
> > > > 
> > 
> > Hi Jason,
> > 
> > > hi. i could have sworn i recently discussed this documenting of multiple
> > > options with someone else, but cannot find the mails. anyway, a couple
> > > of points:
> > > 
> > > - "a block of options that is enclosed in curly braces" can be shortened 
> > > to
> > >   "a block of options enclosed in curly braces". up to you.
> > 
> > Yup.
> > 
> > > - if it is generally true that where multiple options can be given they
> > >   are specified in the same way (curly braces) then it would be better
> > >   just to say up front that this is the case, rather than repeating the
> > >   text endlessly everywhere it's possible.
> > 
> > I did think about it as there's a lot of repetition:
> > 
> > $ grep '^Multiple options' /usr/share/man/man5/httpd.conf.5
> > Multiple options may be specified within curly braces.
> > Multiple options may be specified within curly braces.
> > Multiple options may be specified within curly braces.
> > Multiple options may be specified within curly braces.
> > Multiple options may be specified within curly braces.
> > Multiple options may be specified within curly braces.
> > 
> > but wanted the diff to be as small as possible ;^)
> > 
> > > in other respects i'm fine with the diff.
> > > jmc
> > 
> > How about this?
> > 
> > Cheers,
> > 
> > Raf
> > 
> 
> yes, exactly what i'd hoped. ok by me.
> jmc
> 
> > Index: usr.sbin/httpd/httpd.conf.5
> > ===
> > RCS file: /cvs/src/usr.sbin/httpd/httpd.conf.5,v
> > retrieving revision 1.114
> > diff -u -p -r1.114 httpd.conf.5
> > --- usr.sbin/httpd/httpd.conf.5 29 Oct 2020 12:30:52 -  1.114
> > +++ usr.sbin/httpd/httpd.conf.5 22 Mar 2021 13:24:58 -
> > @@ -78,6 +78,8 @@ the comment is effective until the end o
> >  Argument names not beginning with a letter, digit, or underscore
> >  must be quoted.
> >  .Pp
> > +Multiple options may be specified within curly braces.
> > +.Pp
> >  Additional configuration files can be included with the
> >  .Ic include
> >  keyword, for example:
> > @@ -155,7 +157,7 @@ see
> >  .Xr patterns 7 .
> >  .El
> >  .Pp
> > -Followed by a block of options that is enclosed in curly brackets:
> > +Followed by a block of options enclosed in curly braces:
> >  .Bl -tag -width Ds
> >  .It Ic alias Ar name
> >  Specify an additional alias
> > @@ -238,7 +240,6 @@ option.
> >  .El
> >  .It Ic connection Ar option
> >  Set the specified options and limits for HTTP connections.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Ic max request body Ar number
> > @@ -265,7 +266,6 @@ Set the default media type for the speci
> >  overwriting the global setting.
> >  .It Ic directory Ar option
> >  Set the specified options when serving or accessing directories.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Oo Ic no Oc Ic auto index
> > @@ -451,7 +451,6 @@ but can be changed per server or locatio
> >  Use the
> >  .Ic no log
> >  directive to disable logging of any requests.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Ic access Ar name
> > @@ -509,7 +508,6 @@ Disable any previous
> >  in a location.
> >  .It Ic request Ar option
> >  Configure the options for the request path.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Oo Ic no Oc Ic rewrite Ar path
> > @@ -547,7 +545,6 @@ Enable or disable the specified TCP/IP o
> >  and
> >  .Xr ip 4
> >  for more information about the options.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Ic backlog Ar number
> > @@ -577,7 +574,6 @@ This will affect the TCP window size.
> >  .It Ic tls Ar option
> >  Set the TLS configuration for the server.
> >  These options are only used if TLS has been enabled via the listen 
> > directive.
> > -Multiple options may be specified within curly braces.
> >  Valid options are:
> >  .Bl -tag -width Ds
> >  .It Ic certificate Ar file
> > 
> 

Re: cwm: add group-last command [Was: Re: cwm: add last-group command]

[Raf Czlonka]

On Sat, Apr 03, 2021 at 05:50:06PM BST, Omar Polo wrote:
> Omar Polo  writes:
> 
> > Hello tech@,

Hi Omar,

> > The attached patch adds a last-group command for cwm.  Admittedly,
> 
> (typo: it's group-last!  I mistyped that in the subject too, sorry)

Given that 'group_*' and not '*_group' is used in the code, shouldn't
'last_group' be renamed to 'group_last' for consistency?

Regards,

Raf

> > last-group probably makes sense only in sticky group mode; all it does
> > is switching to the last group.
> >
> > I've been happily using this since last summer, I'm quite confident it's
> > not 100% broken.
> >
> > I haven't added a default keybinding, so to test you have to add
> > something like this to your .cwmrc
> >
> > bind-key 4-Tab group-last
> >
> > Cheers!
> >
> > Omar Polo
> 
> ping.
> 
> I'm not too attached to this patch however, so I can keep it in my tree =)
> 
> Patch re-attached for convenience (and with a missing dot in the manpage
> description of the group-last command.)
> 
> Index: calmwm.h
> ===
> RCS file: /home/cvs/xenocara/app/cwm/calmwm.h,v
> retrieving revision 1.375
> diff -u -p -r1.375 calmwm.h
> --- calmwm.h  16 Apr 2020 13:32:35 -  1.375
> +++ calmwm.h  26 Aug 2020 12:18:50 -
> @@ -214,6 +214,7 @@ struct screen_ctx {
>   struct region_q  regionq;
>   struct group_q   groupq;
>   struct group_ctx*group_active;
> + int  last_group;
 ^^
Here.

>   Colormap colormap;
>   Visual  *visual;
>   struct {
> @@ -501,6 +502,7 @@ void   
> kbfunc_client_toggle_group(void 
>  void  kbfunc_client_movetogroup(void *, struct cargs *);
>  void  kbfunc_group_toggle(void *, struct cargs *);
>  void  kbfunc_group_only(void *, struct cargs *);
> +void  kbfunc_group_last(void *, struct cargs *);
>  void  kbfunc_group_close(void *, struct cargs *);
>  void  kbfunc_group_cycle(void *, struct cargs *);
>  void  kbfunc_group_toggle_all(void *, struct cargs *);
> Index: conf.c
> ===
> RCS file: /home/cvs/xenocara/app/cwm/conf.c,v
> retrieving revision 1.252
> diff -u -p -r1.252 conf.c
> --- conf.c16 Apr 2020 13:32:35 -  1.252
> +++ conf.c26 Aug 2020 12:29:53 -
> @@ -139,6 +139,7 @@ static const struct {
>  
>   { FUNC_SC(group-cycle, group_cycle, (CWM_CYCLE_FORWARD)) },
>   { FUNC_SC(group-rcycle, group_cycle, (CWM_CYCLE_REVERSE)) },
> + { FUNC_SC(group-last, group_last, 0) },
>   { FUNC_SC(group-toggle-all, group_toggle_all, 0) },
>   { FUNC_SC(group-toggle-1, group_toggle, 1) },
>   { FUNC_SC(group-toggle-2, group_toggle, 2) },
> Index: cwmrc.5
> ===
> RCS file: /home/cvs/xenocara/app/cwm/cwmrc.5,v
> retrieving revision 1.76
> diff -u -p -r1.76 cwmrc.5
> --- cwmrc.5   16 Apr 2020 13:32:35 -  1.76
> +++ cwmrc.5   3 Apr 2021 16:39:17 -
> @@ -273,6 +273,8 @@ menu.
>  Toggle visibility of group n, where n is 1-9.
>  .It group-only-[n]
>  Show only group n, where n is 1-9, hiding other groups.
> +.It group-last
> +Show only the last viewed group.
>  .It group-close-[n]
>  Close all windows in group n, where n is 1-9.
>  .It group-toggle-all
> Index: group.c
> ===
> RCS file: /home/cvs/xenocara/app/cwm/group.c,v
> retrieving revision 1.137
> diff -u -p -r1.137 group.c
> --- group.c   27 Feb 2020 14:56:39 -  1.137
> +++ group.c   30 Aug 2020 17:01:11 -
> @@ -215,6 +215,9 @@ group_only(struct screen_ctx *sc, int id
>  {
>   struct group_ctx*gc;
>  
> + if (sc->group_active->num != idx)
> + sc->last_group = sc->group_active->num;
^^
Here.

> +
>   TAILQ_FOREACH(gc, >groupq, entry) {
>   if (gc->num == idx)
>   group_show(gc);
> Index: kbfunc.c
> ===
> RCS file: /home/cvs/xenocara/app/cwm/kbfunc.c,v
> retrieving revision 1.170
> diff -u -p -r1.170 kbfunc.c
> --- kbfunc.c  20 Mar 2020 18:50:08 -  1.170
> +++ kbfunc.c  28 Aug 2020 06:45:50 -
> @@ -479,6 +479,14 @@ kbfunc_group_only(void *ctx, struct carg
>  }
>  
>  void
> +kbfunc_group_last(void *ctx, struct cargs *cargs)
> +{
> + struct screen_ctx   *sc = ctx;
> +
> + group_only(ctx, sc->last_group);
^^
Here.

> +}
> +
> +void
>  kbfunc_group_toggle(void *ctx, struct cargs *cargs)
>  {
>   group_toggle(ctx, cargs->flag);
> Index: screen.c
> ===
> RCS file: 

Re: wsconsctl.conf: mention mouse.tp.tapping in example

[Raf Czlonka]

On Wed, Mar 24, 2021 at 01:42:19PM GMT, Klemens Nanni wrote:
> On Tue, Mar 23, 2021 at 12:41:25PM +0000, Raf Czlonka wrote:
> > According to wsmouse(4), the orders is as follows:
> > 
> > This list of three parameters configures these mappings,
> > in the order:
> > 
> >one-finger,two-finger,three-finger
> > 
> > Setting a parameter to a positive value enables that tap
> > gesture and maps it to the given mouse button.  To disable
> > all three tap gestures at once, provide the single value
> > of 0.  Conversely, a single non-zero value will enable
> > one-finger, two-finger, and three-finger tap gestures with
> > their default mappings of left button, right button, and
> > middle button, respectively.
> I had to let this be for a day and reread it now.

Hi Klemens,

No worries - I had to re-read your patch and the man page several
times just to be sure I got it right ;^)

> > Your updated patch reads:
> > 
> > #mouse.tp.tapping=0 # 1,3,2=interpret one/three/two (simultaneous) 
> > # tap(s) as left/middle/right mouse button click
> > 
> > Whilst technically correct, if I'm reading the man page correctly,
> > it is a little bit confusing as the gestures are out of order and
> > the digits look like they represent the number of fingers when, in
> > reality, they represent the mouse *buttons* so, unless I got totally
> > confused by either of the above, or am missing something altogether,
> > the patch should probably read:
> > 
> > #mouse.tp.tapping=1 # 1,3,2=interpret one/two/three (simultaneous) 
> > # tap(s) as left/right/middle mouse button click
> > 
> > As it is clear that digits do not map to numerals.
> So yes, you're right.

I suggested "1" instead of "0" on purpose, as it would match the
comment/description. As per the man page, "0" disable all tap gestures.

Regards,

Raf

> Anyone willing to OK this?
> 
> Index: wsconsctl.conf
> ===
> RCS file: /cvs/src/etc/examples/wsconsctl.conf,v
> retrieving revision 1.1
> diff -u -p -r1.1 wsconsctl.conf
> --- wsconsctl.conf16 Jul 2014 13:21:33 -  1.1
> +++ wsconsctl.conf24 Mar 2021 13:40:02 -
> @@ -9,3 +9,5 @@
>  #display.vblank=on   # enable vertical sync blank for screen burner
>  #display.screen_off=6# set screen burner timeout to 60 seconds
>  #display.msact=off   # disable screen unburn w/ mouse
> +#mouse.tp.tapping=0  # 1,3,2=interpret one-/two-/three-finger taps as
> + # 1st/3rd/2nd, i.e. left/right/middle button 
> click

Re: wsconsctl.conf: mention mouse.tp.tapping in example

[Raf Czlonka]

On Tue, Mar 23, 2021 at 11:26:19AM GMT, Klemens Nanni wrote:
> On Tue, Mar 23, 2021 at 02:00:43AM +0100, Ulf Brosziewski wrote:
> > On 3/22/21 10:19 PM, Klemens Nanni wrote:
> > > On Mon, Mar 22, 2021 at 08:18:45PM +0100, Klemens Nanni wrote:
> > >> I was too stupid to look at `wsconsctl' output (which needs root) and
> > >> only looked here.
> > >>
> > >> Mailing the diff for my lack of better wording, plus the knob atually
> > >> takes three values which I have yet to decode by reading wsconsctl(8)
> > >> code.
> > > The reason I had to look is because the (default) functionality does not
> > > work reliably at all:
> > > 
> > >   $ doas wsconsctl mouse.tp.tapping=1
> > >   mouse.tp.tapping -> 1,3,2
> > > 
> > > Single taps are always detected reliably and deliver left mouse button
> > > clicks, but tripple and double taps for middle and right mouse button
> > > clicks work are recognised so poorly that I first though multitouch
> > > support wasn't there at all.

Hi Klemens,

According to wsmouse(4), the orders is as follows:

This list of three parameters configures these mappings,
in the order:

   one-finger,two-finger,three-finger

Setting a parameter to a positive value enables that tap
gesture and maps it to the given mouse button.  To disable
all three tap gestures at once, provide the single value
of 0.  Conversely, a single non-zero value will enable
one-finger, two-finger, and three-finger tap gestures with
their default mappings of left button, right button, and
middle button, respectively.

Your updated patch reads:

#mouse.tp.tapping=0 # 1,3,2=interpret one/three/two (simultaneous) 
# tap(s) as left/middle/right mouse button click

Whilst technically correct, if I'm reading the man page correctly,
it is a little bit confusing as the gestures are out of order and
the digits look like they represent the number of fingers when, in
reality, they represent the mouse *buttons* so, unless I got totally
confused by either of the above, or am missing something altogether,
the patch should probably read:

#mouse.tp.tapping=1 # 1,3,2=interpret one/two/three (simultaneous) 
# tap(s) as left/right/middle mouse button click

As it is clear that digits do not map to numerals.

Regards,

Raf

> > Can you tell whether that's a hardware or a driver problem?
> I'd assume it's a driver a problem since I get the exact same behaviour
> on both a Pinebook Pro and a Thinkpad X230.
> 
> > wsmouse logging might be helpful here. You could enable it by
> > $ doas wsconsctl mouse.param=256:1,257:1
> > , make a few two-finger taps, and deactivate it with
> > $ doas wsconsctl mouse.param=256:0,257:0
> > For the output:
> > $ grep 'wsmouse0-' /var/log/messages
> Thanks!  Here goes the Pinebook Pro:
> 
> One-finger tap:
>   [wsmouse0-in][4275] abs:636,444 mt:0x01:0
>   [wsmouse0-in][4556] mt:0x00:-1
> 
> Two-finger tap:
>   [wsmouse0-in][0319] abs:786,516 mt:0x01:0
>   [wsmouse0-in][0329] mt:0x03:0
>   [wsmouse0-in][0772] abs:652,270 mt:0x02:1
> 
> Three-finger tap:
>   [wsmouse0-in][8821] abs:942,561 mt:0x01:0
>   [wsmouse0-in][8831] mt:0x03:0
>   [wsmouse0-in][8842] mt:0x07:0
>   [wsmouse0-in][8852] abs:942,563
>   [wsmouse0-in][9434] mt:0x05:0
>   [wsmouse0-in][9455] abs:539,210 mt:0x04:2
> 
> Only the one-finger tap does a left click, the others do nothing.
> 
> Double two-finger tap:
>   [wsmouse0-in][1894] abs:740,312 mt:0x01:0
>   [wsmouse0-in][1894] mt:0x03:0
>   [wsmouse0-in][2035] abs:554,44 mt:0x02:1
>   [wsmouse0-in][2045] mt:0x00:-1
>   [wsmouse0-ev][2045] 5:2 18:0
>   [wsmouse0-in][2055] abs:744,344 mt:0x01:0
>   [wsmouse0-ev][2055] 4:2 18:0
>   [wsmouse0-in][2065] mt:0x03:0
>   [wsmouse0-in][2497] abs:555,67 mt:0x02:1
> 
> This delivers a right-click in almost all attempts (this is the log of a
> successful one).
> 
> Touble three-finger tap:
> 
>   [wsmouse0-in][7276] abs:1114,734 mt:0x01:0
>   [wsmouse0-in][7286] mt:0x03:0
>   [wsmouse0-in][7296] mt:0x07:0
>   [wsmouse0-in][7427] abs:769,543 mt:0x06:1
>   [wsmouse0-in][7437] abs:468,284 mt:0x04:2
>   [wsmouse0-in][7437] mt:0x00:-1
>   [wsmouse0-ev][7437] 5:1 18:0
>   [wsmouse0-in][7447] abs:476,238 mt:0x01:0
>   [wsmouse0-ev][7447] 4:1 18:0
>   [wsmouse0-in][7457] abs:476,239
>   [wsmouse0-in][7467] mt:0x03:0
>   [wsmouse0-in][7477] mt:0x07:0
>   [wsmouse0-in][7648] abs:1121,718 mt:0x06:1
>   [wsmouse0-in][7658] abs:761,521 mt:0x04:2
> 
> This practically never delivers a middle click except when I'm lucky
> (this is the log of a successful one).
> 
>   [wsmouse0-in][0238] abs:1113,661 mt:0x01:0
>   [wsmouse0-in][0248] mt:0x03:0
>   [wsmouse0-in][0258] mt:0x07:0
>   [wsmouse0-in][0399] mt:0x05:0
>   

Re: httpd.conf grammar

[Raf Czlonka]

On Mon, Mar 22, 2021 at 07:08:32AM GMT, Jason McIntyre wrote:
> On Sun, Mar 21, 2021 at 10:58:02PM +0000, Raf Czlonka wrote:
> > 
> > Hi Laurie,
> > 
> > I'd simply use the existing wording, without getting into details.
> > 
> > While there, "braces" dominate the manual page, with a single
> > occurrence of "brackets" so let's change that too, for consistency.
> > 
> > Regards,
> > 
> > Raf
> > 

Hi Jason,

> hi. i could have sworn i recently discussed this documenting of multiple
> options with someone else, but cannot find the mails. anyway, a couple
> of points:
> 
> - "a block of options that is enclosed in curly braces" can be shortened to
>   "a block of options enclosed in curly braces". up to you.

Yup.

> - if it is generally true that where multiple options can be given they
>   are specified in the same way (curly braces) then it would be better
>   just to say up front that this is the case, rather than repeating the
>   text endlessly everywhere it's possible.

I did think about it as there's a lot of repetition:

$ grep '^Multiple options' /usr/share/man/man5/httpd.conf.5
Multiple options may be specified within curly braces.
Multiple options may be specified within curly braces.
Multiple options may be specified within curly braces.
Multiple options may be specified within curly braces.
Multiple options may be specified within curly braces.
Multiple options may be specified within curly braces.

but wanted the diff to be as small as possible ;^)

> in other respects i'm fine with the diff.
> jmc

How about this?

Cheers,

Raf

Index: usr.sbin/httpd/httpd.conf.5
===
RCS file: /cvs/src/usr.sbin/httpd/httpd.conf.5,v
retrieving revision 1.114
diff -u -p -r1.114 httpd.conf.5
--- usr.sbin/httpd/httpd.conf.5 29 Oct 2020 12:30:52 -  1.114
+++ usr.sbin/httpd/httpd.conf.5 22 Mar 2021 13:24:58 -
@@ -78,6 +78,8 @@ the comment is effective until the end o
 Argument names not beginning with a letter, digit, or underscore
 must be quoted.
 .Pp
+Multiple options may be specified within curly braces.
+.Pp
 Additional configuration files can be included with the
 .Ic include
 keyword, for example:
@@ -155,7 +157,7 @@ see
 .Xr patterns 7 .
 .El
 .Pp
-Followed by a block of options that is enclosed in curly brackets:
+Followed by a block of options enclosed in curly braces:
 .Bl -tag -width Ds
 .It Ic alias Ar name
 Specify an additional alias
@@ -238,7 +240,6 @@ option.
 .El
 .It Ic connection Ar option
 Set the specified options and limits for HTTP connections.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Ic max request body Ar number
@@ -265,7 +266,6 @@ Set the default media type for the speci
 overwriting the global setting.
 .It Ic directory Ar option
 Set the specified options when serving or accessing directories.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Oo Ic no Oc Ic auto index
@@ -451,7 +451,6 @@ but can be changed per server or locatio
 Use the
 .Ic no log
 directive to disable logging of any requests.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Ic access Ar name
@@ -509,7 +508,6 @@ Disable any previous
 in a location.
 .It Ic request Ar option
 Configure the options for the request path.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Oo Ic no Oc Ic rewrite Ar path
@@ -547,7 +545,6 @@ Enable or disable the specified TCP/IP o
 and
 .Xr ip 4
 for more information about the options.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Ic backlog Ar number
@@ -577,7 +574,6 @@ This will affect the TCP window size.
 .It Ic tls Ar option
 Set the TLS configuration for the server.
 These options are only used if TLS has been enabled via the listen directive.
-Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Ic certificate Ar file

Re: httpd.conf grammar

[Raf Czlonka]

On Sun, Mar 21, 2021 at 05:08:00PM GMT, Laurence Tratt wrote:
> I wanted to use httpd's fastcgi "socket" and "strip" options and based upon
> the man page's brief text:
> 
>  [no] fastcgi [option]
>  Enable FastCGI instead of serving files.  Valid options are:
> 
> tried "obvious" permutations such as:
> 
>   fastcgi strip 1 socket "..."
>   fastcgi socket "..." strip 1
>   fastcgi socket "...", strip 1
> 
> but with each was greeted by a terse "syntax error".
> 
> After hunting around in the relevant parse.y file, it transpires that the
> grammar allows, roughly speaking, the following:
> 
>   fastcgi
>   fastcgi option
>   fastcgi { option ((',' '\n'? | '\n') option)* }
> 
> In other words, if you want to use more than one option you *have* to use
> the {...} notation, but there's more than one way for options inside curly
> brackets to be separated. In my case I can specify:
> 
>   fastcgi {
> socket "..."
> strip 1
>   }
> 
> or:
> 
>   fastcgi {
> socket "...", strip 1
>   }
> 
> or:
> 
>   fastcgi {
> socket "...",
> strip 1
>   }
> 
> This raised a couple of questions in my mind.
> 
> First, stylistically, I'm not quite sure if having three slightly different
> ways of separating multiple options is useful or not. That said, I assume
> that some people might already be taking advantage of this flexibility, so
> perhaps worrying about it now is pointless.
> 
> Second, is it worthwhile giving users a hint about what to do when multiple
> options need to be specified? For example, something like:
> 
>  [no] fastcgi [option]
>  Enable FastCGI instead of serving files.  If more than option
>  is specified, they must be included inside { ... }, with each
>  option separated by a comma or newline.  Valid options are:
> 
> I'm happy to raise a patch if other people think this is worth fixing,
> although I'm not entirely sure if we want to make people aware of the full
> extent of the grammar, or something a little less complete such as the
> suggestion above.
> 
> 
> Laurie
> 

Hi Laurie,

I'd simply use the existing wording, without getting into details.

While there, "braces" dominate the manual page, with a single
occurrence of "brackets" so let's change that too, for consistency.

Regards,

Raf

Index: usr.sbin/httpd/httpd.conf.5
===
RCS file: /cvs/src/usr.sbin/httpd/httpd.conf.5,v
retrieving revision 1.114
diff -u -p -r1.114 httpd.conf.5
--- usr.sbin/httpd/httpd.conf.5 29 Oct 2020 12:30:52 -  1.114
+++ usr.sbin/httpd/httpd.conf.5 21 Mar 2021 22:56:53 -
@@ -155,7 +155,7 @@ see
 .Xr patterns 7 .
 .El
 .Pp
-Followed by a block of options that is enclosed in curly brackets:
+Followed by a block of options that is enclosed in curly braces:
 .Bl -tag -width Ds
 .It Ic alias Ar name
 Specify an additional alias
@@ -282,6 +282,7 @@ will neither display nor generate a dire
 .El
 .It Oo Ic no Oc Ic fastcgi Oo Ar option Oc
 Enable FastCGI instead of serving files.
+Multiple options may be specified within curly braces.
 Valid options are:
 .Bl -tag -width Ds
 .It Ic socket Oo Cm tcp Oc Ar socket Oo Ar port Oc

Re: Mention vmd FFS boot support removal in current.html

[Raf Czlonka]

Hi Josh,

Just a quick note regarding  - it is used only once in there -
 being the dominant tag.

BTW is only about consistency, not about one vs the other.

Cheers,

Raf

On Fri, Mar 19, 2021 at 08:08:26PM GMT, Josh Rickmar wrote:
> On Fri, Mar 19, 2021 at 03:26:46PM -0400, Josh Rickmar wrote:
> > I got some emails off list asking about the removal and if it affected
> > them.  Worth adding to current.html?
> 
> sorry for the noise, missed a 
> 
> diff 0d7807046bcfacd3249f4c62031ac970d9b42ace /home/jrick/www
> blob - 9452b3672627fb39fa0c7ec17a17e08f57406afa
> file + faq/current.html
> --- faq/current.html
> +++ faq/current.html
> @@ -274,6 +274,22 @@ RFC 8981 changed the terminology from privacy to tempo
>  temporary.
>  
>  
> +2021/03/19 - FFS boot support removed in vmd
> +
> +Support in vmd(8) for booting OpenBSD guests installed to a FFS root
> +filesystem, without using the BIOS firmware or another boot kernel,
> +was removed.
> +This had only been possible by using both the -b and
> +-d flags to vmctl start, or boot and
> +disk parameters in vm.conf, with each specifying the
> +same disk image file.
> +This feature had not been implemented for FFS2.
> +
> +The use of the BIOS firmware is now required to boot the kernel
> +installed to a raw or qcow2 disk image, and will be used by default
> +after removing a boot parameter from vm.conf.
> +
> +
>  

[PATCH] [src] games/hack/help - fix ordinal directions

[Raf Czlonka]

Hello,

Ordinal (intercardinal) directions are swapped in hack(6)'s help.

For a second there, I though that no one else noticed since the 80s ;^)
...not the case[0] :^P

While there, I'm tempted to capitalise both cardinal and ordinal
directions as they traditionally are - patch for each option below.

[0] 
http://cvsweb.netbsd.org/bsdweb.cgi/src/games/hack/help.diff?r1=1.1=1.2_with_tag=MAIN=h

Cheers,

Raf

Index: games/hack/help
===
RCS file: /cvs/src/games/hack/help,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 help
--- games/hack/help 18 Oct 1995 08:49:02 -  1.1.1.1
+++ games/hack/help 7 Mar 2021 16:44:20 -
@@ -45,7 +45,7 @@ Commands:
>   down: go down (just like up).
kjhlyubn - go one step in the direction indicated.
k: north (i.e., to the top of the screen),
-   j: south, h: west, l: east, y: ne, u: nw, b: se, n: sw.
+   j: south, h: west, l: east, y: nw, u: ne, b: sw, n: se.
KJHLYUBN - Go in that direction until you hit a wall or run
into something.
m   (followed by one of kjhlyubn): move without picking up

And with directions capitalised:

Index: games/hack/help
===
RCS file: /cvs/src/games/hack/help,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 help
--- games/hack/help 18 Oct 1995 08:49:02 -  1.1.1.1
+++ games/hack/help 7 Mar 2021 16:45:24 -
@@ -44,8 +44,8 @@ Commands:
<   up: go up the staircase (if you are standing on it).
>   down: go down (just like up).
kjhlyubn - go one step in the direction indicated.
-   k: north (i.e., to the top of the screen),
-   j: south, h: west, l: east, y: ne, u: nw, b: se, n: sw.
+   k: North (i.e., to the top of the screen),
+   j: South, h: West, l: East, y: NW, u: NE, b: SW, n: SE.
KJHLYUBN - Go in that direction until you hit a wall or run
into something.
m   (followed by one of kjhlyubn): move without picking up

Re: [PATCH] [www] faq/current.html - fix formatting

[Raf Czlonka]

Ping.

On Tue, Feb 02, 2021 at 01:45:25AM GMT, Raf Czlonka wrote:
> Hello,
> 
> Fix formatting of the snmpd.conf configuration snippet.
> 
> While there:
> 
> - reduce whitespace from three to two lines as per the comment:
> 
>   

[PATCH] [www] faq/current.html - fix formatting

[Raf Czlonka]

Hello,

Fix formatting of the snmpd.conf configuration snippet.

While there:

- reduce whitespace from three to two lines as per the comment:

Re: New ujoy(4) device for USB gamecontrollers

[Raf Czlonka]

On Fri, Jan 15, 2021 at 01:23:01PM GMT, Thomas Frohwein wrote:
> On Sat, Jan 09, 2021 at 10:16:16AM +0100, Marcus Glocker wrote:
> > On Thu, Jan 07, 2021 at 08:20:35PM +0100, Marcus Glocker wrote:
> > 
> > > > I have heard from others who tried the diff that the PS4 controller is
> > > > causing problems with the way it attaches. I ordered one to trial-and-
> > > > error this myself at home. Could you share output of lsusb -vv? Thanks
> > > > for giving it a try!
> > > 
> > > Sure, here we go.
> > > If I can find anything myself in the meantime I let you know.
> > 
> > So the problem doesn't seem to be in your new ujoy(4) code, but how the
> > dev/hid/hid.c:hid_is_collection() function tries to cope with the PS4
> > controller.
> 
> So with the hid_is_collection() problem not easy to mitigate [1],
> should we table the ujoy(4) proposal for now pending a fix for the
> problems with the PS4 controller? Or is this interesting enough for
> some to work on moving forward despite this issue and finding a
> solution for this specific (and in some ways unusual) device later?
> 
> 3-4 have tested and reported to me so far. It seems so far that the
> only new breakage is with the PS4 controller, and there is probably
> another solution that can be found later that doesn't break other
> drivers like [1]?
> 
> [1] https://marc.info/?l=openbsd-tech=161043081617336=mbox

Hi Thomas,

Hadn't had a chance to test your diff yet but, FWIW, I rely on PS4
controller working so would appreciate if it remained in a working
state :^)

Cheers,

Raf

Re: clean /dev from /etc/daily ?

[Raf Czlonka]

On Mon, Nov 23, 2020 at 12:53:01PM GMT, Solene Rapenne wrote:
> A common mistake when using dd is to create a file in /dev which
> fills up the space of / and may stay silent until / gets filled up
> by something else that will fail.
> 
> Would it be OK to add this in /etc/daily?
> 
> find /dev -type f ! -name MAKEDEV -delete
> 
> AFAIK /dev should have only MAKEDEV as a regular file.
> hier(7) says /dev only have block and character devices
> with the exception of MAKEDEV.
> 

Whichever way this ends up going - or not - please don't forget
about MAKEDEV.local

Cheers,

Raf

Re: [PATCH] Add USB Product ID for Logitech Webcam Pro 9000

[Raf Czlonka]

Ping.

On Sun, Oct 11, 2020 at 11:33:21AM BST, Raf Czlonka wrote:
> Hi all,
> 
> I just dug a Logitech Webcam Pro 9000 (for Business) out.
> 
> After a quick test, it seems to be working just fine but the
> Product ID isn't pretty-printed:
> 
>   $ usbdevs | grep 0x0809   
>   addr 08: 046d:0809 Logitech, product 0x0809
> 
> lsusb confirms the Product ID:
> 
>   $ doas lsusb -v | grep 0x0809
> idProduct  0x0809 Webcam Pro 9000
> 
> Regards,
> 
> Raf
> 
> Index: sys/dev/usb/usbdevs
> ===
> RCS file: /cvs/src/sys/dev/usb/usbdevs,v
> retrieving revision 1.721
> diff -u -p -r1.721 usbdevs
> --- sys/dev/usb/usbdevs   5 Oct 2020 05:28:13 -   1.721
> +++ sys/dev/usb/usbdevs   11 Oct 2020 10:29:54 -
> @@ -2672,6 +2672,7 @@ product LOGITECH QUICKCAMWEB0x0801  Quic
>  product LOGITECH WEBCAMC200  0x0802  Webcam C200
>  product LOGITECH WEBCAMC250  0x0804  Webcam C250
>  product LOGITECH WEBCAMC500  0x0807  Webcam C500
> +product LOGITECH WEBCAMPRO9000   0x0809  Webcam Pro 9000
>  product LOGITECH QUICKCAMPRO 0x0810  QuickCam Pro
>  product LOGITECH WEBCAMC210  0x0819  Webcam C210
>  product LOGITECH WEBCAMC310  0x081b  Webcam C310

[PATCH] Add USB Product ID for Logitech Webcam Pro 9000

[Raf Czlonka]

Hi all,

I just dug a Logitech Webcam Pro 9000 (for Business) out.

After a quick test, it seems to be working just fine but the
Product ID isn't pretty-printed:

$ usbdevs | grep 0x0809   
addr 08: 046d:0809 Logitech, product 0x0809

lsusb confirms the Product ID:

$ doas lsusb -v | grep 0x0809
  idProduct  0x0809 Webcam Pro 9000

Regards,

Raf

Index: sys/dev/usb/usbdevs
===
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.721
diff -u -p -r1.721 usbdevs
--- sys/dev/usb/usbdevs 5 Oct 2020 05:28:13 -   1.721
+++ sys/dev/usb/usbdevs 11 Oct 2020 10:29:54 -
@@ -2672,6 +2672,7 @@ product LOGITECH QUICKCAMWEB  0x0801  Quic
 product LOGITECH WEBCAMC2000x0802  Webcam C200
 product LOGITECH WEBCAMC2500x0804  Webcam C250
 product LOGITECH WEBCAMC5000x0807  Webcam C500
+product LOGITECH WEBCAMPRO9000 0x0809  Webcam Pro 9000
 product LOGITECH QUICKCAMPRO   0x0810  QuickCam Pro
 product LOGITECH WEBCAMC2100x0819  Webcam C210
 product LOGITECH WEBCAMC3100x081b  Webcam C310

Re: [PATCH] [xenocara] app/xenodm/config/Xsetup_0 - reduce the number of lines

[Raf Czlonka]

Ping.

CC'ing espie@ as he committed the initial code.

Cheers,

Raf

On Sun, Jun 07, 2020 at 07:30:39PM BST, Raf Czlonka wrote:
> Hi all,
> 
> I've been running openbsd-backgrounds on all of my desktop machines and
> thought this can be simplified a bit:
> 
> - fewer lines to uncomment
> - easier to automate, i.e. via one liner, script, config management, etc.
> - still under 80 columns wide
> 
> For your consideration.
> 
> Cheers,
> 
> Raf
> 
> Index: app/xenodm/config/Xsetup_0
> ===
> RCS file: /cvs/xenocara/app/xenodm/config/Xsetup_0,v
> retrieving revision 1.6
> diff -u -p -r1.6 Xsetup_0
> --- app/xenodm/config/Xsetup_029 Jun 2019 13:33:06 -  1.6
> +++ app/xenodm/config/Xsetup_07 Jun 2020 18:29:16 -
> @@ -6,9 +6,6 @@ xconsole -geometry 480x130-0-0 -daemon -
>  #  install package openbsd-backgrounds
>  #  then uncomment:
>  #
> -# if test -x /usr/local/bin/openbsd-wallpaper
> -# then
> -#/usr/local/bin/openbsd-wallpaper
> -# fi
> +# test -x /usr/local/bin/openbsd-wallpaper && 
> /usr/local/bin/openbsd-wallpaper
>  
>  # sxpm OpenBSD.xpm &

[PATCH] [xenocara] app/xenodm/config/Xsetup_0 - reduce the number of lines

[Raf Czlonka]

Hi all,

I've been running openbsd-backgrounds on all of my desktop machines and
thought this can be simplified a bit:

- fewer lines to uncomment
- easier to automate, i.e. via one liner, script, config management, etc.
- still under 80 columns wide

For your consideration.

Cheers,

Raf

Index: app/xenodm/config/Xsetup_0
===
RCS file: /cvs/xenocara/app/xenodm/config/Xsetup_0,v
retrieving revision 1.6
diff -u -p -r1.6 Xsetup_0
--- app/xenodm/config/Xsetup_0  29 Jun 2019 13:33:06 -  1.6
+++ app/xenodm/config/Xsetup_0  7 Jun 2020 18:29:16 -
@@ -6,9 +6,6 @@ xconsole -geometry 480x130-0-0 -daemon -
 #  install package openbsd-backgrounds
 #  then uncomment:
 #
-# if test -x /usr/local/bin/openbsd-wallpaper
-# then
-#  /usr/local/bin/openbsd-wallpaper
-# fi
+# test -x /usr/local/bin/openbsd-wallpaper && /usr/local/bin/openbsd-wallpaper
 
 # sxpm OpenBSD.xpm &

[PATCH] [src] usr.bin/audioctl/audioctl.8, usr.bin/mixerctl/mixerctl.8 - manpages moved to section 8, mark them as such

[Raf Czlonka]

Hi all,

Recently moved manpages bear section 1 number - update accordingly.

Regards,

Raf

Index: usr.bin/audioctl/audioctl.8
===
RCS file: /cvs/src/usr.bin/audioctl/audioctl.8,v
retrieving revision 1.3
diff -u -p -r1.3 audioctl.8
--- usr.bin/audioctl/audioctl.8 22 Apr 2020 21:39:21 -  1.3
+++ usr.bin/audioctl/audioctl.8 22 Apr 2020 23:55:27 -
@@ -27,7 +27,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd $Mdocdate: April 22 2020 $
-.Dt AUDIOCTL 1
+.Dt AUDIOCTL 8
 .Os
 .Sh NAME
 .Nm audioctl
Index: usr.bin/mixerctl/mixerctl.8
===
RCS file: /cvs/src/usr.bin/mixerctl/mixerctl.8,v
retrieving revision 1.4
diff -u -p -r1.4 mixerctl.8
--- usr.bin/mixerctl/mixerctl.8 22 Apr 2020 21:39:21 -  1.4
+++ usr.bin/mixerctl/mixerctl.8 22 Apr 2020 23:56:20 -
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd $Mdocdate: April 22 2020 $
-.Dt MIXERCTL 1
+.Dt MIXERCTL 8
 .Os
 .Sh NAME
 .Nm mixerctl

[PATCH] [src] - etc/root/root.mail - correct time zone

[Raf Czlonka]

Hi all,

Time zone change.

Regards,

Raf

Index: etc/root/root.mail
===
RCS file: /cvs/src/etc/root/root.mail,v
retrieving revision 1.137
diff -u -p -r1.137 root.mail
--- etc/root/root.mail  5 Apr 2020 16:15:39 -   1.137
+++ etc/root/root.mail  6 Apr 2020 02:36:53 -
@@ -1,6 +1,6 @@
-From dera...@do-not-reply.openbsd.org Fri May  1 06:30:00 MST 2020
+From dera...@do-not-reply.openbsd.org Fri May  1 06:30:00 MDT 2020
 Return-Path: root
-Date: May 1 06:30:00 MST 2020
+Date: May 1 06:30:00 MDT 2020
 From: dera...@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
 Subject: Welcome to OpenBSD 6.7!

Re: Audio control API, part 1: libsndio, sndiod bits

[Raf Czlonka]

On Mon, Feb 24, 2020 at 09:33:19AM GMT, Alexandre Ratchov wrote:
> On Thu, Feb 13, 2020 at 05:15:34AM +0000, Raf Czlonka wrote:
> > On Sun, Feb 09, 2020 at 12:13:02PM GMT, Alexandre Ratchov wrote:
> > > +++ lib/libsndio/sioctl_aucat.c   8 Feb 2020 14:49:37 -
> > > [...]
> > > + * Copyright (c) 2010-2011 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ lib/libsndio/sioctl_open.38 Feb 2020 14:49:37 -
> > > [...]
> > > +.\" Copyright (c) 2011 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ lib/libsndio/sioctl_priv.h8 Feb 2020 14:49:38 -
> > > [...]
> > > + * Copyright (c) 2008 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ lib/libsndio/sioctl_sun.c 8 Feb 2020 14:49:38 -
> > > [...]
> > > + * Copyright (c) 2010-2011 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ lib/libsndio/sioctl.c 8 Feb 2020 14:49:37 -
> > > [...]
> > > + * Copyright (c) 2008 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ usr.bin/sndioctl/sndioctl.1   9 Feb 2020 11:05:02 -
> > > [...]
> > > +.\" Copyright (c) 2007 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ usr.bin/sndioctl/sndioctl.c   9 Feb 2020 11:05:02 -
> > > [...]
> > > + * Copyright (c) 2007-2011 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ usr.bin/sndiod/dev_sioctl.c   8 Feb 2020 14:49:38 -
> > > [...]
> > > + * Copyright (c) 2014 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > > +++ usr.bin/sndiod/dev_sioctl.h   8 Feb 2020 14:49:38 -
> > > [...]
> > > + * Copyright (c) 2014 Alexandre Ratchov 
> > > 
> > > [...]
> > > 
> > 
> > Hi Alexandre,
> > 
> > Shouldn't all of these dates be adjusted?
> > 
> 
> Sure; added 2020 as copyright year. Thanks.

Hi Alexandre,

AFAIK, range would only be applicable if the files were "changed" (for a
lack of a better term) each year between the years stated (inclusive)[0].

After license.template[1]:

It is important to specify the year of the copyright.  Additional years
should be separated by a comma, e.g.
Copyright (c) 2003, 2004

Which then *could* change to range should the, consecutive, years
formed a long line, i.e.:

Copyright (c) 2003-2010

[0] https://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html
[1] https://cvsweb.openbsd.org/src/share/misc/license.template?rev=HEAD

Regards,

Raf

Re: [PATCH] [www] books.html - remove superfluous angle bracket

[Raf Czlonka]

Ping.

On Mon, Nov 25, 2019 at 11:16:09AM GMT, Raf Czlonka wrote:
> Regards,
> 
> Raf
> 
> Index: books.html
> ===
> RCS file: /cvs/www/books.html,v
> retrieving revision 1.117
> diff -u -p -r1.117 books.html
> --- books.html1 Jun 2019 23:12:47 -   1.117
> +++ books.html25 Nov 2019 11:15:11 -
> @@ -355,7 +355,7 @@ Lots of examples and real world code sni
>  
>  Network administration
>  
> ->Das SSH-Buch
> +Das SSH-Buch
>  (German)
>  by Timo Dotzauer and Tobias Ltticke
>  ISBN 3-938626-03-8

[PATCH] [www] faq/current.html - be consistent with naming of the 'id' attribute

[Raf Czlonka]

Hi all,

Small inconsistency.

Personally, I prefer id *without* the 'r' but the below is "the odd
one out" so...

Regards,

Raf

Index: faq/current.html
===
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1029
diff -u -p -r1.1029 current.html
--- faq/current.html13 Feb 2020 16:29:21 -  1.1029
+++ faq/current.html14 Feb 2020 13:46:41 -
@@ -229,7 +229,7 @@ root crontab or /etc/weekly.local<
 /etc/locate.rc.
 
 
-2020/02/13 - man.conf(5) _whatdb directive no longer 
supported
+2020/02/13 - man.conf(5) _whatdb directive no longer 
supported
 
 In https://man.openbsd.org/man.conf.5;>man.conf(5),
 change lines of the form

Re: Audio control API, part 1: libsndio, sndiod bits

[Raf Czlonka]

On Sun, Feb 09, 2020 at 12:13:02PM GMT, Alexandre Ratchov wrote:
> +++ lib/libsndio/sioctl_aucat.c   8 Feb 2020 14:49:37 -
> [...]
> + * Copyright (c) 2010-2011 Alexandre Ratchov 
> 
> [...]
> 
> +++ lib/libsndio/sioctl_open.38 Feb 2020 14:49:37 -
> [...]
> +.\" Copyright (c) 2011 Alexandre Ratchov 
> 
> [...]
> 
> +++ lib/libsndio/sioctl_priv.h8 Feb 2020 14:49:38 -
> [...]
> + * Copyright (c) 2008 Alexandre Ratchov 
> 
> [...]
> 
> +++ lib/libsndio/sioctl_sun.c 8 Feb 2020 14:49:38 -
> [...]
> + * Copyright (c) 2010-2011 Alexandre Ratchov 
> 
> [...]
> 
> +++ lib/libsndio/sioctl.c 8 Feb 2020 14:49:37 -
> [...]
> + * Copyright (c) 2008 Alexandre Ratchov 
> 
> [...]
> 
> +++ usr.bin/sndioctl/sndioctl.1   9 Feb 2020 11:05:02 -
> [...]
> +.\" Copyright (c) 2007 Alexandre Ratchov 
> 
> [...]
> 
> +++ usr.bin/sndioctl/sndioctl.c   9 Feb 2020 11:05:02 -
> [...]
> + * Copyright (c) 2007-2011 Alexandre Ratchov 
> 
> [...]
> 
> +++ usr.bin/sndiod/dev_sioctl.c   8 Feb 2020 14:49:38 -
> [...]
> + * Copyright (c) 2014 Alexandre Ratchov 
> 
> [...]
> 
> +++ usr.bin/sndiod/dev_sioctl.h   8 Feb 2020 14:49:38 -
> [...]
> + * Copyright (c) 2014 Alexandre Ratchov 
> 
> [...]
> 

Hi Alexandre,

Shouldn't all of these dates be adjusted?

Regards,

Raf

Re: Audio control API, part 2: add new sndioctl(1) utility

[Raf Czlonka]

On Mon, Feb 10, 2020 at 09:14:57PM GMT, Alexandre Ratchov wrote:
> On Mon, Feb 10, 2020 at 09:59:09AM +0000, Raf Czlonka wrote:
> > On Sun, Feb 09, 2020 at 12:14:47PM GMT, Alexandre Ratchov wrote:
> > > Here's a new sndioctl utility similar to mixerctl(1) but using the new
> > > sndio API. Example:
> > > 
> > > $ sndioctl 
> > > output.level=127
> > > app/aucat0.level=127
> > > app/firefox0.level=127
> > > app/firefox1.level=12
> > > app/midisyn0.level=127
> > > app/mpv0.level=127
> > > app/prog5.level=127
> > > app/prog6.level=127
> > > app/prog7.level=127
> > > hw/input.level=62
> > > hw/input.mute=0
> > > hw/output.level=63
> > > hw/output.mute=0
> > > 
> > 
> > Hi Alexandre,
> > 
> > Just a quick question.
> > 
> > Is there a good reason to have the above using "slash" ('/') as the
> > first separator instead of the, more familiar, "dot" ('.') known
> > from sysctl(8)'s MIB (Management Information Base) style names or
> > even the "pseudo" MIB know from mixerctl(1)?
> 
> Hi,
> 
> I don't know if the following qualifies as a "good reason". The first
> part (the group) is a prefix of the control identifier. The identifier
> itself has a strict "[channel]." format. The prefix
> is not always present, examples:
> 
>   output.level<- sndiod volume knob
>   hw/output.level <- underlying hardware volume knob
> 
> I tried to avoid the group part, but as mixers may be nested it seems
> necessary to avoid name clashes.
> 
> In the sndioctl syntax, we could replace '/' by '.' but this looks
> confusing as the syntax doesn't map directly to the underlying
> model. But maybe we should hide such developer-centric details and
> just use only dots to make this look as a MIB.
> 
> Another option I've considered is to drop the group concept in the API
> and simply prefix the stream name to make it unique; in turn we obtain
> a flat control list. It's uglier and seems to complicate GUIs
> task. For instance the group part could be used to represent controls
> of different groups in different sections or to filter-out certain
> groups).

Hi Alexandre,

I honestly can't tell which one of these would be "better" - best
if others chime in.

I was thinking only from a "uniform" interface angle, i.e. if (some
of) these are to be set from the command line, and its similarity
to MIB-like mixerctl(1) variables, I suspect it might cause some
"muscle memory"-related issues ;^)

If no one else shares it, then I rest my case.

Either way, thanks for the explanation.

Regards,

Raf

Re: Audio control API, part 1: libsndio, sndiod bits

[Raf Czlonka]

On Tue, Feb 11, 2020 at 07:15:00PM GMT, Alexandre Ratchov wrote:
> On Tue, Feb 11, 2020 at 07:01:28PM +0100, Florian Obser wrote:
> > I've been running the base diffs since you posted them. Firefox,
> > chrome and mpv still make noise :)
> > 
> > I'm puzzled by this:
> > 
> > $ cat /etc/mixerctl.conf
> >   
> > outputs.master=255,255
> > record.enable=off
> > 
> > $ mixerctl outputs.master   
> >   
> > outputs.master=255,255
> > 
> > $ sndioctl 
> > output.level=127
> > 
> > I don't understand how they relate and why one goes to 255 and the
> > other to 127.
> > The error reporting is confusing, too:
> > 
> > $ sndioctl output.level=128 
> >   
> > integer overflow
> > 
> > But no regressions to report :)
> > 
> 
> Thanks, the code is base on MIDI bits, which uses the 0..127 range;
> sndiod, aucat and many codecs also use the 0..127 range. Anyway,
> replaced the error message by:
> 
> $ sndioctl output.level=128 
> 128: expected integer in the 0..127 range
> 
> [...]
> 
> I'm wondering if persents or floating points in the [0:1] range would
> be less confusing and solve most "units" problems.
> 

Hi Alexandre,

I have to say that I also find the two ranges mildly confusing,
i.e. 0-255 in one place, and 0-127 in another. In terms of units,
personally, I'm used to, and quite like, the granularity of 0-255.

Again, not my place so others will certainly be more help here.

One more point regarding the interface, though.

This is the way mixerctl(1) currently behaves:

$ mixerctl outputs.master 
outputs.master=255,255
$ mixerctl outputs.master=100 
outputs.master: 255,255 -> 100,100
$ mixerctl outputs.master=300 
outputs.master: 100,100 -> 255,255

Should sndioctl(1) behave the same way?

Cheers,

Raf

Re: Audio control API, part 2: add new sndioctl(1) utility

[Raf Czlonka]

On Sun, Feb 09, 2020 at 12:14:47PM GMT, Alexandre Ratchov wrote:
> Here's a new sndioctl utility similar to mixerctl(1) but using the new
> sndio API. Example:
> 
> $ sndioctl 
> output.level=127
> app/aucat0.level=127
> app/firefox0.level=127
> app/firefox1.level=12
> app/midisyn0.level=127
> app/mpv0.level=127
> app/prog5.level=127
> app/prog6.level=127
> app/prog7.level=127
> hw/input.level=62
> hw/input.mute=0
> hw/output.level=63
> hw/output.mute=0
> 

Hi Alexandre,

Just a quick question.

Is there a good reason to have the above using "slash" ('/') as the
first separator instead of the, more familiar, "dot" ('.') known
from sysctl(8)'s MIB (Management Information Base) style names or
even the "pseudo" MIB know from mixerctl(1)?

Regards,

Raf

> Configuration parameters that are not exposed by sndiod will be
> handled by audioctl(1), including the /etc/mixerctl.conf file at
> system startup.
> 
> Originally the program was designed to handle modern many-channel
> devices by presenting many-channel knobs on a single line; this
> feature isn't used yet as the corresponding kernel bits are missing.
> 
> Index: usr.bin/Makefile
> ===
> RCS file: /cvs/src/usr.bin/Makefile,v
> retrieving revision 1.161
> diff -u -p -u -p -r1.161 Makefile
> --- usr.bin/Makefile  9 Aug 2019 06:18:25 -   1.161
> +++ usr.bin/Makefile  9 Feb 2020 11:05:02 -
> @@ -22,7 +22,7 @@ SUBDIR= apply arch at aucat audioctl awk
>   pr printenv printf quota radioctl rcs rdist rdistd \
>   readlink renice rev rpcgen rpcinfo rs rsync rup rusers rwall \
>   sdiff script sed sendbug shar showmount signify skey \
> - skeyaudit skeyinfo skeyinit sndiod snmp \
> + skeyaudit skeyinfo skeyinit sndioctl sndiod snmp \
>   sort spell split ssh stat su systat \
>   tail talk tcpbench tee telnet tftp tic time \
>   tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \
> Index: usr.bin/sndioctl/Makefile
> ===
> RCS file: usr.bin/sndioctl/Makefile
> diff -N usr.bin/sndioctl/Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ usr.bin/sndioctl/Makefile 9 Feb 2020 11:05:02 -
> @@ -0,0 +1,5 @@
> +#$OpenBSD$
> +
> +PROG=sndioctl
> +LDADD+=  -lsndio
> +.include 
> Index: usr.bin/sndioctl/sndioctl.1
> ===
> RCS file: usr.bin/sndioctl/sndioctl.1
> diff -N usr.bin/sndioctl/sndioctl.1
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ usr.bin/sndioctl/sndioctl.1   9 Feb 2020 11:05:02 -
> @@ -0,0 +1,148 @@
> +.\" $OpenBSD$
> +.\"
> +.\" Copyright (c) 2007 Alexandre Ratchov 
> +.\"
> +.\" Permission to use, copy, modify, and distribute this software for any
> +.\" purpose with or without fee is hereby granted, provided that the above
> +.\" copyright notice and this permission notice appear in all copies.
> +.\"
> +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> +.\"
> +.Dd $Mdocdate: April 8 2011 $
> +.Dt SNDIOCTL 1
> +.Os
> +.Sh NAME
> +.Nm sndioctl
> +.Nd control audio parameters
> +.Sh SYNOPSIS
> +.Nm
> +.Bk -words
> +.Op Fl iv
> +.Op Fl f Ar device
> +.Op Ar command ...
> +.Ek
> +.Nm
> +.Bk -words
> +.Fl d
> +.Ek
> +.Sh DESCRIPTION
> +The
> +.Nm
> +utility can display or change parameters of
> +.Xr sndio 7
> +audio devices.
> +The options are as follows:
> +.Bl -tag -width Ds
> +.It Fl d
> +Dump the raw list of available parameters and exit.
> +Useful as a debug tool.
> +.It Fl f Ar device
> +Use this
> +.Xr sndio 7
> +audio device.
> +.It Fl m
> +Monitor and display audio parameters changes.
> +.It Fl i
> +Display characteristics of requested parameters
> +instead of their values.
> +.It Fl v
> +Enable verbose mode, a.k.a. multi-channel mode.
> +By default parameters affecting different channels
> +of the same stream are disguised as a single mono
> +parameter to hide details that are not essential.
> +.El
> +.Pp
> +If no commands are specified all valid parameters are displayed on
> +.Em stdout .
> +Unless
> +.Fl d ,
> +.Fl m ,
> +or
> +.Fl i
> +are used, displayed parameters are valid commands.
> +The set of available controls depends on the control device.
> +.Pp
> +Commands use the following two formats to display and set
> +parameters respectively:
> +.Pp
> +.Dl group/stream[channel].function
> +.Dl group/stream[channel].function=value
> +.Pp
> +On the 

[PATCH] [www] faq/current.html - pretty print paths

[Raf Czlonka]

Hi all,

Using the convention from earlier in the faq/current.html file,
enclose file/directory paths in .

Cheers,

Raf

Index: faq/current.html
===
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1021
diff -u -p -r1.1021 current.html
--- faq/current.html28 Jan 2020 00:16:29 -  1.1021
+++ faq/current.html28 Jan 2020 10:42:42 -
@@ -173,8 +173,8 @@ Users are advised to consider alternativ
 
 2020/01/24 - [packages] firefox 71.0: pledge configuration 
change
 Previously, disabling pledge was done by modifying an entry in about:config
-but now it is done using files in /etc/firefox as explained in the pkg-readme
-file, /usr/local/share/doc/pkg-readmes/firefox.
+but now it is done using files in /etc/firefox as explained in 
the pkg-readme
+file, /usr/local/share/doc/pkg-readmes/firefox.
 Unveil has been added to firefox to restrict filesystem access by default.
 To grant access to additional paths or disable unveil, see the pkg-readme file.
 

[PATCH] [src] - usr.sbin/bind/configure{,.in} - /dev/arandom no longer exists

[Raf Czlonka]

Hi all,

This effectively reinstates what has been nuked[0] by the recent
import.

[0] 
https://cvsweb.openbsd.org/src/usr.sbin/bind/configure.diff?r1=1.15=1.16=h

Regards,

Raf

Index: usr.sbin/bind/configure
===
RCS file: /cvs/src/usr.sbin/bind/configure,v
retrieving revision 1.30
diff -u -p -u -r1.30 configure
--- usr.sbin/bind/configure 7 Jan 2020 19:11:17 -   1.30
+++ usr.sbin/bind/configure 8 Jan 2020 21:42:29 -
@@ -14200,14 +14200,7 @@ case "$use_randomdev" in
 $as_echo "unspecified" >&6; }
as_fn_error $? " need --with-randomdev=PATH or 
--with-randomdev=no" "$LINENO" 5
esac
-   case "$host" in
-   *-openbsd*)
-   devrandom=/dev/arandom
-   ;;
-   *)
-   devrandom=/dev/random
-   ;;
-   esac
+   devrandom=/dev/random
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $devrandom" >&5
 $as_echo "$devrandom" >&6; }
as_ac_File=`$as_echo "ac_cv_file_$devrandom" | $as_tr_sh`
Index: usr.sbin/bind/configure.in
===
RCS file: /cvs/src/usr.sbin/bind/configure.in,v
retrieving revision 1.29
diff -u -p -u -r1.29 configure.in
--- usr.sbin/bind/configure.in  7 Jan 2020 19:11:17 -   1.29
+++ usr.sbin/bind/configure.in  8 Jan 2020 21:43:25 -
@@ -1061,14 +1061,7 @@ case "$use_randomdev" in
AC_MSG_RESULT(unspecified)
AC_MSG_ERROR([ need --with-randomdev=PATH or 
--with-randomdev=no])
esac
-   case "$host" in
-   *-openbsd*)
-   devrandom=/dev/arandom
-   ;;
-   *)
-   devrandom=/dev/random
-   ;;
-   esac
+   devrandom=/dev/random
AC_MSG_RESULT($devrandom)
AC_CHECK_FILE($devrandom,
  AC_DEFINE_UNQUOTED(PATH_RANDOMDEV,

usbhidaction(1) with a foot pedal/control

[Raf Czlonka]

Hi all,

I use a Philips USB foot pedal[0] as an additional input device.
With usbhidaction(1), I can "program" its four "buttons".

After recent changes to uhid(4) device nodes' permissions, my USB
foot pedal "stopped working".

I understand that it is a *very recent* change but I rely on this
input device for my day-to-day computer usage and have a couple of
questions. I understand that the below permissions are final(?).

crw---  1 root  wheel   62,   0 Dec 16 11:17 /dev/uhid0
crw---  1 root  wheel   62,   1 Dec 16 11:17 /dev/uhid1
crw---  1 root  wheel   62,   2 Dec 16 11:17 /dev/uhid2
crw---  1 root  wheel   62,   3 Dec 16 11:17 /dev/uhid3
crw---  1 root  wheel   62,   4 Dec 16 11:17 /dev/uhid4
crw---  1 root  wheel   62,   5 Dec 16 11:17 /dev/uhid5
crw---  1 root  wheel   62,   6 Dec 16 11:17 /dev/uhid6
crw---  1 root  wheel   62,   7 Dec 16 11:17 /dev/uhid7

I use(d) the below script (executed from .xsession) in order to
configure and use the foot pedal:

#!/bin/sh
test -r $HOME/.footpedal.conf && {
pgrep usbhidaction > /dev/null ||
usbhidaction -f $(dmesg | awk '/Footcontrol USB/ {
getline
getline
print $1
}' | tail -n 1) -c $HOME/.footpedal.conf -i
}

$ cat $HOME/.footpedal.conf
Generic_Desktop:Joystick.Generic_Desktop:Pointer.Button:Button_1
1
action1
Generic_Desktop:Joystick.Generic_Desktop:Pointer.Button:Button_2
1
action2
Generic_Desktop:Joystick.Generic_Desktop:Pointer.Button:Button_3
1
action3
Generic_Desktop:Joystick.Generic_Desktop:Pointer.Button:Button_4
1
action4

1. Shall I *simply* introduce chmod(1)/chown(8) step in the above script?

2. Is the situation still more of a "watch this space"?

3. Is there any other way to get the uhid(4) device node (-f option) for
   a particular USB device, other than the above dmesg(8)|awk(1) hack?

4. Or perhaps I'm doing it all wrong?

Relevant bits:

$ dmesg
[...]
uhidev1 at uhub0 port 10 configuration 1 interface 0 "Philips Speech 
Processing Footcontrol USB" rev 1.00/3.02 addr 3
uhidev1: iclass 3/1
uhid0 at uhidev1: input=3, output=0, feature=0
[...]

$ usbdevs -v
Controller /dev/usb0:
addr 01: 8086: Intel, xHCI root hub
 super speed, self powered, config 1, rev 1.00
 driver: uhub0
addr 02: 047d:1002 Kensington, USB/PS2 Wheel Mouse
 low speed, power 100 mA, config 1, rev 4.00
 driver: uhidev0
addr 03: 0911:091a Philips Speech Processing, Footcontrol USB
 full speed, power 100 mA, config 1, rev 3.02
 driver: uhidev1
addr 04: 1209:2301 Keyboardio, Model 01
 full speed, power 500 mA, config 1, rev 1.00, iSerial Ckbio01
 driver: umodem0
 driver: uhidev2
 driver: uhidev3

[0] 
https://www.dictation.philips.com/gb/products/transcription-accessories/foot-control-acc2300/

Thanks in advance,

Raf

[PATCH] [www] books.html - remove superfluous angle bracket

[Raf Czlonka]

Regards,

Raf

Index: books.html
===
RCS file: /cvs/www/books.html,v
retrieving revision 1.117
diff -u -p -r1.117 books.html
--- books.html  1 Jun 2019 23:12:47 -   1.117
+++ books.html  25 Nov 2019 11:15:11 -
@@ -355,7 +355,7 @@ Lots of examples and real world code sni
 
 Network administration
 
->Das SSH-Buch
+Das SSH-Buch
 (German)
 by Timo Dotzauer and Tobias Ltticke
 ISBN 3-938626-03-8

Re: [PATCH] [src] bin/ed/README - fix quote/comma

[Raf Czlonka]

On Sun, Nov 17, 2019 at 10:23:38AM GMT, Otto Moerbeek wrote:
> On Sun, Nov 17, 2019 at 08:31:00AM +0000, Raf Czlonka wrote:
> 
> > Hi all,
> > 
> > Pretty straightforward - comma snuck in inside the quoted book title.
> 
> This is how I learned it. Myabe a bit old-fashinoed, but not wrong.
> 
>   -Otto

Hi Otto,

Unless I'm misunderstanding CMOS (i.e. american style), comma would
indeed be *inside* quotes, when we are actually "using" quotes,
i.e.  quoting text, or quotes are a part of a boot title itself.

Here, however, quotes are used *instead of* italics to represent
the book title itself, so, i.e. in print, they wouldn't be present
at all.

The below is a bibliographical reference (of sorts) so the comma
should merely separate the book title from the publisher.

Unfortunately, the finer details of CMOS are behind a paywall so I
can't confirm that categorically.

Chances are, I might be wrong, though. In which case, I'd appreciate
pointing me to the source :^)

Cheers,

Raf

> 
> > 
> > Regards,
> > 
> > Raf
> > 
> > Index: bin/ed/README
> > ===
> > RCS file: /cvs/src/bin/ed/README,v
> > retrieving revision 1.5
> > diff -u -p -r1.5 README
> > --- bin/ed/README   15 Jun 2018 08:46:24 -  1.5
> > +++ bin/ed/README   17 Nov 2019 08:29:14 -
> > @@ -16,4 +16,4 @@ The ./test directory contains regression
> >  file in that directory explains how to run these.
> >  
> >  For a description of the ed algorithm, see Kernighan and Plauger's book
> > -"Software Tools in Pascal," Addison-Wesley, 1981.
> > +"Software Tools in Pascal", Addison-Wesley, 1981.
> > 

[PATCH] [src] bin/ed/README - fix quote/comma

[Raf Czlonka]

Hi all,

Pretty straightforward - comma snuck in inside the quoted book title.

Regards,

Raf

Index: bin/ed/README
===
RCS file: /cvs/src/bin/ed/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- bin/ed/README   15 Jun 2018 08:46:24 -  1.5
+++ bin/ed/README   17 Nov 2019 08:29:14 -
@@ -16,4 +16,4 @@ The ./test directory contains regression
 file in that directory explains how to run these.
 
 For a description of the ed algorithm, see Kernighan and Plauger's book
-"Software Tools in Pascal," Addison-Wesley, 1981.
+"Software Tools in Pascal", Addison-Wesley, 1981.

Re: /etc/daily : flexible df output

[Raf Czlonka]

On Mon, Oct 28, 2019 at 09:25:22PM GMT, Raf Czlonka wrote:
> On Mon, Oct 28, 2019 at 01:32:05PM GMT, Andre Stoebe wrote:
> > 
> > -   df -ikl
> > +   df ${DFARGS-"-ikl"}
> > 
> 
> Hi Andre,
> 
> Instead of ${DFARGS-"-ikl"}, you should most likely be using:
> 
>   ${DFARGS:-"-ikl"}
> 
> Cheers,
> 
> Raf

Unless, of course, you were thinking of allowing running df(1)
*without* any options, in which case, sure :^)

R.

Re: /etc/daily : flexible df output

[Raf Czlonka]

On Mon, Oct 28, 2019 at 01:32:05PM GMT, Andre Stoebe wrote:
> 
> - df -ikl
> + df ${DFARGS-"-ikl"}
> 

Hi Andre,

Instead of ${DFARGS-"-ikl"}, you should most likely be using:

${DFARGS:-"-ikl"}

Cheers,

Raf

[PATCH] www - 66.html - fix a typo - aggregation

[Raf Czlonka]

Hello,

... and a small typo.

Raf
Index: 66.html
===
RCS file: /cvs/www/66.html,v
retrieving revision 1.72
diff -u -p -r1.72 66.html
--- 66.html 17 Oct 2019 13:49:28 -  1.72
+++ 66.html 18 Oct 2019 06:18:22 -
@@ -345,7 +345,7 @@ to 6.6.
 Added https://man.openbsd.org/iavf.4;>iavf(4), a driver 
for
   Intel SR-IOV Virtual Functions of Intel 700 series Ethernet controllers.
 Added https://man.openbsd.org/aggr.4;>aggr(4), a
-  dedicated driver to implement 802.1AX link aggregration.
+  dedicated driver to implement 802.1AX link aggregation.
 Added port protection support
   to https://man.openbsd.org/switch.4;>switch(4). Domain
   membership is checked for unicast, flooded (broadcast) and local

[PATCH] www - 66.html - fix a broken link to relayd(8) man page

[Raf Czlonka]

Hi,

The URL to the relayd(8) manual page is incomplete.

Regards,

Raf

Index: 66.html
===
RCS file: /cvs/www/66.html,v
retrieving revision 1.72
diff -u -p -r1.72 66.html
--- 66.html 17 Oct 2019 13:49:28 -  1.72
+++ 66.html 18 Oct 2019 06:16:14 -
@@ -511,7 +511,7 @@ to 6.6.
   support for SNI with new 'tls keypair' option to load additional
   certificates.
 Added support for 'from/to address[/prefix]'
-  in https://man.openbsd.org/.8;>relayd(8) filter rules.
+  in https://man.openbsd.org/relayd.8;>relayd(8) filter rules.
 Implemented RFC 8555 "Automatic Certificate Management
   Environment (ACME)" to
   enable https://man.openbsd.org/acme-client.1;>acme-client(1)

[PATCH] www - 66.html - correct acpi(4) and systat(1) manual pages' sections

[Raf Czlonka]

Hello,

acpi manual page is in section 4 - device drivers - and systat in
section 1 - general commands.

While there, fix link to the, now removed, snmpctl(8).

Regards,

Raf

Index: 66.html
===
RCS file: /cvs/www/66.html,v
retrieving revision 1.72
diff -u -p -r1.72 66.html
--- 66.html 17 Oct 2019 13:49:28 -  1.72
+++ 66.html 17 Oct 2019 23:23:09 -
@@ -164,7 +164,7 @@ to 6.6.
   driver for the GPIO controllers on Intel's Apollo Lake SoC.
 Implemented MSI-X support on sparc64.
 Skipped PCI host bridges and devices not present with
-  https://man.openbsd.org/acpi.1;>acpi(1) when establishing
+  https://man.openbsd.org/acpi.4;>acpi(4) when establishing
   the mapping between ACPI device nodes and PCI devices.
 Added the https://man.openbsd.org/ukspan.4;>ukspan(4)
   driver for the Keyspan USA19HS USB serial adapter.
@@ -437,7 +437,7 @@ to 6.6.
   https://man.openbsd.org/freezero.3;>freezero(3)
   on https://man.openbsd.org/free.3;>free(3).
 Make 'systat pf' not require root permissions
-(https://man.openbsd.org/systat.8;>systat(8)).
+(https://man.openbsd.org/systat.1;>systat(1)).
 Added support for the EFI Random Number Generator Protocol,
   using it to XOR random data into the buffer we feed the kernel for
   https://www.openbsd.org/amd64.html;>amd64.
@@ -463,7 +463,7 @@ to 6.6.
 Imported https://man.openbsd.org/snmp.1;>snmp(1),
   a new SNMP client which aims to be netsnmp-compatible for
   supported features, and
-  removed https://man.openbsd.org/snmpctl.8;>snmpctl(8).
+  removed https://man.openbsd.org/OpenBSD-6.5/snmpctl.8;>snmpctl(8).
 Improvements
   in https://man.openbsd.org/ntpd.8;>ntpd(8) DNS
   resolving and constraints checking, especially during

[PATCH] [src] - etc/root/root.mail - correct date

[Raf Czlonka]

Hi,

Probably too little to late but still...

Cheers,

Raf

Index: etc/root/root.mail
===
RCS file: /cvs/src/etc/root/root.mail,v
retrieving revision 1.135
diff -u -p -r1.135 root.mail
--- etc/root/root.mail  7 Oct 2019 15:34:31 -   1.135
+++ etc/root/root.mail  17 Oct 2019 23:00:49 -
@@ -1,4 +1,4 @@
-From dera...@do-not-reply.openbsd.org Wed Nov  1 06:30:00 MST 2019
+From dera...@do-not-reply.openbsd.org Fri Nov  1 06:30:00 MST 2019
 Return-Path: root
 Date: Nov 1 06:30:00 MST 2019
 From: dera...@do-not-reply.openbsd.org (Theo de Raadt)

ftpd: vfprintf %s NULL in "Opening %s mode data connection for '%s'%s."

[Raf Czlonka]

Hi all,

I've used the base ftpd(8) today:

$ echo $USER | doas tee -a /etc/ftpchroot
$ doas rcctl enable ftpd
$ doas rcctl start ftpd

And, after connecting to it:

$ ftp localhost

authenticating, and listing the content of the directory, I found
this message in /var/log/messages:

ftpd: vfprintf %s NULL in "Opening %s mode data connection for '%s'%s."

I can't seem to be able to reproduce it but it appeared in the logs
twice in the last 5 minutes.

Regards,

Raf

openrsync(1) usage quirks

[Raf Czlonka]

Hi all,

Today, I've decided to try openrsync(1) instead of cp(1) and here
my thoughts so far:

1. Without rsync package installed, as is the case on a fresh OpenBSD
install, openrsync's --rsync-path attribute becomes compulsory, i.e.:

$ touch file
$ openrsync file /tmp
/usr/src/usr.bin/rsync/io.c:224: error: unexpected end of file

while this succeeds as expected:

$ openrsync --rsync-path openrsync file /tmp

This has caused me a bit of head scratching, especially since the
attribute's description:

Run program on the remote host instead of the default rsync.

does not apply here - there is no "remote host" to speak of - I ran
the tests on the local filesystem(s).

Also, shouldn't it default to openrsync? Or, perhaps an automatic
fallback to openrsync if rsync is not found or copying is done only
locally?

Either way, less typing would be greatly appreciated! :^)

2. openrsync does not allow for multiple files to be given as source:

$ touch file{1,2}
$ openrsync --rsync-path openrsync file{1,2} /tmp
/usr/src/usr.bin/rsync/flist.c:1064: error: file2: lstat: No such file 
or directory
/usr/src/usr.bin/rsync/io.c:224: error: unexpected end of file

This is regardless of whether I use file{1,2}, file*, or "file1 file2".
rsync obviously complies.

3. Given that the binary is installed as openrsync and it is also
referred as such in the manual page, the EXAMPLES section should
probably use that name. This has been suggested by Ingo (schwarze@)
in his diff a while back[0] but it isn't clear to my why it hasn't
been committed so not cooking up a diff just yet - also, not sure
what to do about the aforementioned --rsync-path.

[0] https://marc.info/?l=openbsd-tech=155404994129838=2

I've also noticed an issue where a content of a source directory
has been repeatedly copied to a destination (using -rt arguments)
despite both being identical. This was between FFS and MSDOS
filesystems if that's of importance. Other directories from the
same source directory copied into the same destination directory,
were copied only once. I'll try to reproduce it tomorrow if I can.

Regards,

Raf

[PATCH] [www] innovations.html - add unwind(8) to the list

[Raf Czlonka]

Hi all,

unwind(8) looks like a good candidate for inclusion into
innovations.html[0].

While there, add "released with ..." to the preceding entry.

[0] https://www.openbsd.org/innovations.html

Regards,

Raf

Index: innovations.html
===
RCS file: /cvs/www/innovations.html,v
retrieving revision 1.72
diff -u -p -r1.72 innovations.html
--- innovations.html11 Apr 2019 01:14:07 -  1.72
+++ innovations.html30 Apr 2019 11:16:32 -
@@ -804,7 +804,12 @@
 
 https://man.openbsd.org/rad.8;>rad(8):
 Written and maintained by Florian Obser.
-Imported July 10, 2018.
+Imported July 10, 2018; released with OpenBSD 6.4.
+
+
+https://man.openbsd.org/unwind.8;>unwind(8):
+Written and maintained by Florian Obser.
+Imported January 23, 2019; released with OpenBSD 6.5.
 
 
 

Re: [PATCH] [www] cvsync.html - use class="cmdbox"

[Raf Czlonka]

On Wed, Apr 17, 2019 at 10:53:54PM BST, Theo Buehler wrote:
> On Wed, Apr 17, 2019 at 11:34:56PM +0200, Solene Rapenne wrote:
> > On Wed, Apr 17, 2019 at 09:55:26PM +0100, Raf Czlonka wrote:
> > > Hi all,
> > > 
> > > Similar to other pages[0][1], use class="cmdbox", add prompt character
> > > where appropriate, and remove superfluous indentation while there.
> > > 
> > > [0] https://www.openbsd.org/anoncvs.html
> > > [1] https://www.openbsd.org/ddb.html
> > > 
> > > Regards,
> > > 
> > > Raf
> > 
> > this looks much better with this
> > 
> > ok solene@
> > 
> 
> Please send a diff for www/build/mirrors/cvsync.html.* instead

After cvsync.html -> build/mirrors/cvsync.html.head change, the patch
applies just fine but, as requested, re-done for the
build/mirrors/cvsync.html.head below anyway.

> hiro$ head -1 cvsync.html
> 

Arghhh... force of habit:

$ vi +/pre cvsync.html

:^P

Cheers,

Raf

Index: build/mirrors/cvsync.html.head
===
RCS file: /cvs/www/build/mirrors/cvsync.html.head,v
retrieving revision 1.36
diff -u -p -r1.36 cvsync.html.head
--- build/mirrors/cvsync.html.head  2 Apr 2018 02:48:19 -   1.36
+++ build/mirrors/cvsync.html.head  17 Apr 2019 22:37:34 -
@@ -57,8 +57,8 @@ CVS is part of OpenBSD's base system.
 CVSync is an entirely different program and can be installed from
 packages:
 
-
-pkg_add cvsync
+
+# pkg_add cvsync
 
 
 Do not build your own copy from unmodified upstream source -
@@ -69,17 +69,17 @@ used in the OpenBSD repository.
 In order to mirror the OpenBSD repository with CVSync,
 the following configuration file might be used:
 
-
-   config {
-   hostname anoncvs.eu.openbsd.org
-   # If your network link is a T1 or faster, comment out the following 
line.
-   compress
-   collection {
-   name openbsd release rcs
-   prefix /cvs
-   umask 002
-   }
-   }
+
+config {
+hostname anoncvs.eu.openbsd.org
+# If your network link is a T1 or faster, comment out the following line.
+compress
+collection {
+   name openbsd release rcs
+   prefix /cvs
+   umask 002
+}
+}
 
 
 
@@ -93,8 +93,8 @@ The local copy of the files are stored i
 Assuming this file is saved as cvs-syncfile, the
 following command would be used to invoke cvsync
 
-
-cvsync -c cvs-syncfile
+
+$ cvsync -c cvs-syncfile
 
 
 Getting Started Using Rsync
@@ -104,13 +104,13 @@ file synchronization program.
 Again this should be installed from packages.
 Two flavours are available:
 
-
-   # pkg_add rsync
-   Ambiguous: choose package for rsync
-   a   0: 
-   1: rsync-3.1.2p0
-   2: rsync-3.1.2p0-iconv
-   Your choice:
+
+# pkg_add rsync
+Ambiguous: choose package for rsync
+a  0: 
+   1: rsync-3.1.2p0
+   2: rsync-3.1.2p0-iconv
+Your choice:
 
 
 Unless you have other requirements, simply install the standard version
@@ -118,15 +118,15 @@ Unless you have other requirements, simp
 You can select the flavour on the command-line to avoid
 pkg_add(1) prompting for the
 version like so:
-
-   pkg_add rsync--
+
+# pkg_add rsync--
 
 
 In order to mirror the OpenBSD repository with rsync,
 the following command line might be used:
 
-
-   rsync -avz --delete rsync://obsdacvs.cs.toronto.edu/obsdcvs/ 
/cvs/
+
+$ rsync -avz --delete rsync://obsdacvs.cs.toronto.edu/obsdcvs/ /cvs/
 
 
 Using CVS to Work With Your Repository
@@ -135,10 +135,10 @@ Now that you have a local copy of the CV
 to check out, update, or do any of the other CVS operations you would
 normally do against a remote repository, locally.
 For example:
-
-cvs -d/cvs checkout -P src
-cvs -d/cvs up -Pd
-cvs -d/cvs diff -u file.c
+
+$ cvs -d/cvs checkout -P src
+$ cvs -d/cvs up -Pd
+$ cvs -d/cvs diff -u file.c
 
 More details on CVS operation can be found in
 FAQ5, Fetching appropriate source

[PATCH] [www] cvsync.html - use class="cmdbox"

[Raf Czlonka]

Hi all,

Similar to other pages[0][1], use class="cmdbox", add prompt character
where appropriate, and remove superfluous indentation while there.

[0] https://www.openbsd.org/anoncvs.html
[1] https://www.openbsd.org/ddb.html

Regards,

Raf

Index: cvsync.html
===
RCS file: /cvs/www/cvsync.html,v
retrieving revision 1.141
diff -u -p -r1.141 cvsync.html
--- cvsync.html 6 Apr 2018 23:41:34 -   1.141
+++ cvsync.html 13 Apr 2019 07:21:21 -
@@ -57,8 +57,8 @@ CVS is part of OpenBSD's base system.
 CVSync is an entirely different program and can be installed from
 packages:
 
-
-pkg_add cvsync
+
+# pkg_add cvsync
 
 
 Do not build your own copy from unmodified upstream source -
@@ -69,17 +69,17 @@ used in the OpenBSD repository.
 In order to mirror the OpenBSD repository with CVSync,
 the following configuration file might be used:
 
-
-   config {
-   hostname anoncvs.eu.openbsd.org
-   # If your network link is a T1 or faster, comment out the following 
line.
-   compress
-   collection {
-   name openbsd release rcs
-   prefix /cvs
-   umask 002
-   }
-   }
+
+config {
+hostname anoncvs.eu.openbsd.org
+# If your network link is a T1 or faster, comment out the following line.
+compress
+collection {
+   name openbsd release rcs
+   prefix /cvs
+   umask 002
+}
+}
 
 
 
@@ -93,8 +93,8 @@ The local copy of the files are stored i
 Assuming this file is saved as cvs-syncfile, the
 following command would be used to invoke cvsync
 
-
-cvsync -c cvs-syncfile
+
+$ cvsync -c cvs-syncfile
 
 
 Getting Started Using Rsync
@@ -104,13 +104,13 @@ file synchronization program.
 Again this should be installed from packages.
 Two flavours are available:
 
-
-   # pkg_add rsync
-   Ambiguous: choose package for rsync
-   a   0: 
-   1: rsync-3.1.2p0
-   2: rsync-3.1.2p0-iconv
-   Your choice:
+
+# pkg_add rsync
+Ambiguous: choose package for rsync
+a  0: 
+   1: rsync-3.1.2p0
+   2: rsync-3.1.2p0-iconv
+Your choice:
 
 
 Unless you have other requirements, simply install the standard version
@@ -118,15 +118,15 @@ Unless you have other requirements, simp
 You can select the flavour on the command-line to avoid
 pkg_add(1) prompting for the
 version like so:
-
-   pkg_add rsync--
+
+# pkg_add rsync--
 
 
 In order to mirror the OpenBSD repository with rsync,
 the following command line might be used:
 
-
-   rsync -avz --delete rsync://obsdacvs.cs.toronto.edu/obsdcvs/ 
/cvs/
+
+$ rsync -avz --delete rsync://obsdacvs.cs.toronto.edu/obsdcvs/ /cvs/
 
 
 Using CVS to Work With Your Repository
@@ -135,10 +135,10 @@ Now that you have a local copy of the CV
 to check out, update, or do any of the other CVS operations you would
 normally do against a remote repository, locally.
 For example:
-
-cvs -d/cvs checkout -P src
-cvs -d/cvs up -Pd
-cvs -d/cvs diff -u file.c
+
+$ cvs -d/cvs checkout -P src
+$ cvs -d/cvs up -Pd
+$ cvs -d/cvs diff -u file.c
 
 More details on CVS operation can be found in
 FAQ5, Fetching appropriate source

[PATCH] [www] 65.html - use class="cmdbox" for command examples

[Raf Czlonka]

Hi all,

class="cmdbox" has been introduced last year so, since it is has
already been used in upgrade64.html[0], how about using it for
release pages, too?

I wasn't sure about signify(1) subkeys  tag but added it there
anyway...

[0] https://www.openbsd.org/faq/upgrade64.html

Regards,

Raf
Index: 65.html
===
RCS file: /cvs/www/65.html,v
retrieving revision 1.79
diff -u -p -r1.79 65.html
--- 65.html 13 Apr 2019 03:40:42 -  1.79
+++ 65.html 13 Apr 2019 06:18:11 -
@@ -38,7 +38,7 @@ Artwork by Hans Tseng, Efrain Farias, an
 
 https://man.openbsd.org/signify.1;>signify(1)
 pubkeys for this release:
-
+
 base: RWSZaRmt1LEQT9CtPygf9CvONu8kYPTlVEJdysNoUR62/NkeWgdkc3zY
 fw:   RWQYdGVtTv5IvpH2c+TLQAC4iV7RjoGZ/v75q8MCuC9Mca7nFVCXRefy
 pkg:  RWS5D4+188RI6jULDOFzga0Cm1zrXYUAHT6xu0mLrZidbn6xrMB5aZeR
@@ -907,21 +907,21 @@ This file contains everything you need e
 which are in a separate archive.
 To extract:
 
-
+
 # mkdir -p /usr/src
 # cd /usr/src
 # tar xvfz /tmp/src.tar.gz
-
+
 
 sys.tar.gz contains a source archive starting at 
/usr/src/sys.
 This file contains all the kernel sources you need to rebuild kernels.
 To extract:
 
-
+
 # mkdir -p /usr/src/sys
 # cd /usr/src
 # tar xvfz /tmp/sys.tar.gz
-
+
 
 Both of these trees are a regular CVS checkout.  Using these trees it
 is possible to get a head-start on using the anoncvs servers as
@@ -937,10 +937,10 @@ a fresh checkout of the full OpenBSD sou
 
 A ports tree archive is also provided.  To extract:
 
-
+
 # cd /usr
 # tar xvfz /tmp/ports.tar.gz
-
+
 
 Go read the ports page
 if you know nothing about ports
@@ -955,10 +955,10 @@ So, in order to keep up to date with the
 the ports/ tree available on a read-write medium and update the tree
 with a command like:
 
-
+
 # cd /usr/ports
 # cvs -d anon...@server.openbsd.org:/cvs update -Pd -rOPENBSD_6_5
-
+
 
 [Of course, you must replace the server name here with a nearby anoncvs
 server.]

Unexpected boot(8) behaviour

[Raf Czlonka]

On Mon, Apr 08, 2019 at 02:55:46PM BST, Florian Obser wrote:
> CVSROOT:  /cvs
> Module name:  src
> Changes by:   flor...@cvs.openbsd.org 2019/04/08 07:55:46
> 
> Modified files:
>   sys/stand/boot : boot.c cmd.c cmd.h 
> 
> Log message:
> Detect /bsd.upgrade kernel and boot it if present instead of default
> /bsd. To be used for unattended upgrades in the future.
> Idea & OK deraadt
> 

Hi all,

This breaks the expected boot(8) behaviour, i.e.:

$ cat /etc/boot.conf
set timeout 1
boot bsd.up

bsd.up is *not* being ran at boot.

It was working fine a couple of days ago.

Regards,

Raf

[PATCH] [src] sbin/unwind/unwind.conf.5 - DoT capitalisation

[Raf Czlonka]

Hi all,

Consistently capitalise 'DoT'.

Regards,

Raf

Index: unwind.conf.5
===
RCS file: /cvs/src/sbin/unwind/unwind.conf.5,v
retrieving revision 1.11
diff -u -p -r1.11 unwind.conf.5
--- unwind.conf.5   2 Apr 2019 09:20:52 -   1.11
+++ unwind.conf.5   2 Apr 2019 14:45:00 -
@@ -52,7 +52,7 @@ Macro names may not be reserved words (f
 .Ic forwarder ,
 .Ic port ,
 or
-.Ic Dot ) .
+.Ic DoT ) .
 Macros are not expanded inside quotes.
 .Pp
 For example:

[PATCH] [www] events.html - fix presentation title

[Raf Czlonka]

Hi all,

A quick/small title fix.

Regards,

Raf

Index: events.html
===
RCS file: /cvs/www/events.html,v
retrieving revision 1.1150
diff -u -p -r1.1150 events.html
--- events.html 24 Mar 2019 21:51:33 -  1.1150
+++ events.html 28 Mar 2019 22:06:32 -
@@ -189,7 +189,7 @@ June 6-9, 2018, Ottawa, Canada.
 
 http://cuug.ab.ca/;>Calgary Unix Users Group,
 March 27, 2018, Alberta, Canada.
-Theo de Raadt gave a presentation Thwarting (ROP) 
Return Oriented Programming (ROP) Attacks.
+Theo de Raadt gave a presentation Thwarting Return 
Oriented Programming (ROP) Attacks.
 
 
 

[www] [faq] - IPSec -> IPsec [Was: Re: CVS: cvs.openbsd.org: www]

[Raf Czlonka]

On Fri, Feb 22, 2019 at 10:07:05PM GMT, Landry Breuil wrote:
> CVSROOT:  /cvs
> Module name:  www
> Changes by:   lan...@cvs.openbsd.org  2019/02/22 15:07:05
> 
> Modified files:
>   faq: index.html 
> Added files:
>   faq: faq17.html 
> 
> Log message:
> Add a (wip!) VPN FAQ, because 'How do i VPN with OpenBSD?' seems to be a
> frequently asked question, and IPSec is hard. Now is the time to polish
> it in-tree.
> 

Spelling/capitalisation is harder still! ;^)

As per https://marc.info/?t=15196474751=1=2

This patch is only for the faq directory.

Regards,

Raf

Index: faq/faq10.html
===
RCS file: /cvs/www/faq/faq10.html,v
retrieving revision 1.285
diff -u -p -r1.285 faq10.html
--- faq/faq10.html  18 Oct 2018 03:14:38 -  1.285
+++ faq/faq10.html  23 Feb 2019 06:08:51 -
@@ -358,7 +358,7 @@ In particular, YP is inadequate if poten
 to your network.
 Anybody gaining root access to any computer connected to your network segments
 carrying YP traffic can bind your YP domain and retrieve its data.
-In some cases, passing YP traffic through SSL or IPSec tunnels might be
+In some cases, passing YP traffic through SSL or IPsec tunnels might be
 an option.
 
 Setting Up a YP Server
Index: faq/faq17.html
===
RCS file: /cvs/www/faq/faq17.html,v
retrieving revision 1.1
diff -u -p -r1.1 faq17.html
--- faq/faq17.html  22 Feb 2019 22:07:05 -  1.1
+++ faq/faq17.html  23 Feb 2019 06:08:51 -
@@ -170,7 +170,7 @@ ikev2_recv: IKE_AUTH response from respo
 sa_state: VALID -> ESTABLISHED from 192.0.2.1:4500 to 198.51.100.1:4500 policy 
'server2_rsa'
 
 
-The IPSec flows can be viewed with https://man.openbsd.org/ipsecctl;>ipsecctl(8):
 
 
@@ -291,7 +291,7 @@ ikev2 'responder_rsa' passive esp \
 tag "ROADW"
 
 
-It also needs to allow IPSec from any host (since clients might connect from
+It also needs to allow IPsec from any host (since clients might connect from
 anywhere), allow traffic tagged ROADW on enc0 and apply NAT to it:
 
 
@@ -356,7 +356,7 @@ After starting the initiator, this addit
 roadwarrior# ipsecctl -f /etc/ipsec.conf
 
 
-This will happen at boot if IPSec has been enabled with
+This will happen at boot if IPsec has been enabled with
 rcctl enable ipsec.
 
 

Re: security.html -> broken link

[Raf Czlonka]

On Tue, Feb 19, 2019 at 09:49:15AM GMT, Oleg Pahl wrote:
> Hi @all,
> 
> On https://www.openbsd.org/security.html there is a broken link.
> 
> 
>  --->
> 
> 
>  Full Disclosure
> 
> Like many readers of theBUGTRAQ mailing list
> , we believe in full disclosure
> of security problems.
> 
> * http://online.securityfocus.com/archive/1
> 
> <---
> 
> Please check!
> 
> BR,
> 
> Oleg Pahl
> 

Hi Oleg,

You "forgot" the diff ;^)

Cheers,

Raf

Index: security.html
===
RCS file: /cvs/www/security.html,v
retrieving revision 1.437
diff -u -p -r1.437 security.html
--- security.html   18 Oct 2018 12:29:23 -  1.437
+++ security.html   19 Feb 2019 10:13:10 -
@@ -89,7 +89,7 @@ fixing security problems.
 Full Disclosure
 
 Like many readers of the
-http://online.securityfocus.com/archive/1;>
+https://www.securityfocus.com/archive/1;>
 BUGTRAQ mailing list,
 we believe in full disclosure of security problems.  In the
 operating system arena, we were probably the first to embrace

[www] hackathons.html - fix spelling

[Raf Czlonka]

Hi all,

A small spelling fix.

Cheers,

Raf

Index: hackathons.html
===
RCS file: /cvs/www/hackathons.html,v
retrieving revision 1.134
diff -u -p -r1.134 hackathons.html
--- hackathons.html 13 Jan 2019 23:55:05 -  1.134
+++ hackathons.html 14 Jan 2019 12:37:34 -
@@ -89,7 +89,7 @@ so don't worry if you can't understand t
 
 
 
-a2k19: antipodian mini hackathon
+a2k19: antipodean mini hackathon
 Jan 17-24, 2019
 Wellington, New Zealand
 18 developers

Re: /usr/share/calendar/calendar.christian - two entries for "First Sunday of Advent (4th Sunday before Christmas)"

[Raf Czlonka]

It's that magical time of the year again :^)

Anyone?

R.

On Sun, Nov 12, 2017 at 08:11:04AM GMT, Raf Czlonka wrote:
> Hi all,
> 
> I've just noticed something strange in the
> /usr/share/calendar/calendar.christian file, namely:
> 
>   11/SunLast  First Sunday of Advent (4th Sunday before Christmas)
>   12/SunFirst First Sunday of Advent (4th Sunday before Christmas)
> 
> Obviously, in any given year either is true - not both.
> 
> I do understand the intent - the beginning of Advent will either
> be on the last Sunday of November or the first Sunday of December
> depending which day of the week Christmas Day falls on.
> 
> Calculating it isn't difficult - last Thursday of November + 3 days -
> but I'm not sure whether adding any additional code to calendar(1)
> is desirable.
> 
> I don't know what the best solution to the above is as currently,
> as it stands, these entries are confusing - at first glance the
> above looks like a bug and after figuring out it isn't one, I'm
> sill none the wise which one it is without consulting another
> calendar.
> 
> Adding code, modifying the above entries or an additional entry in
> the BUGS section in the manual. What are your thought?
> 
> Best regards,
> 
> Raf

[PATCH] [src] usr.sbin/tftp-proxy/tftp-proxy.8 - style improvement

[Raf Czlonka]

Hi,

A small style improvement.

Regards,

Raf

Index: usr.sbin/tftp-proxy/tftp-proxy.8
===
RCS file: /cvs/src/usr.sbin/tftp-proxy/tftp-proxy.8,v
retrieving revision 1.8
diff -u -p -r1.8 tftp-proxy.8
--- usr.sbin/tftp-proxy/tftp-proxy.817 Oct 2017 22:47:58 -  1.8
+++ usr.sbin/tftp-proxy/tftp-proxy.84 Nov 2018 11:22:23 -
@@ -140,4 +140,4 @@ pass out quick on $ext_if inet proto udp
 The current stand-alone implementation first appeared in
 .Ox 5.3 .
 .Sh AUTHORS
-.An David Gwynne 
+.An David Gwynne Aq Mt d...@openbsd.org

[PATCH] [src] usr.sbin/ldapd/btree.3 - style fix

[Raf Czlonka]

Hi all,

Style fix.

Regards,

Raf

Index: usr.sbin/ldapd/btree.3
===
RCS file: /cvs/src/usr.sbin/ldapd/btree.3,v
retrieving revision 1.4
diff -u -p -r1.4 btree.3
--- usr.sbin/ldapd/btree.3  16 Jul 2013 11:13:33 -  1.4
+++ usr.sbin/ldapd/btree.3  3 Nov 2018 21:45:09 -
@@ -43,9 +43,9 @@
 .Nm btree_get_path ,
 .Nm btree_cmp ,
 .Nm btval_reset
-.Nd Append-only prefix B+Tree database library.
+.Nd append-only prefix B+Tree database library
 .Sh SYNOPSIS
-.Fd #include 
+.In btree.h
 .Ft "struct btree *"
 .Fn "btree_open_fd" "int fd" "unsigned int flags"
 .Ft "struct btree *"

Re: Fix descriptions of smtps vs smtp+tls in smtpd.conf.5

[Raf Czlonka]

On Thu, Oct 25, 2018 at 07:11:47AM BST, Gilles Chehade wrote:
> 
> smtpd will _always_ display a 'starttls' log line when the TLS channel starts,
> disregarding if TLS was started at connect time (smtps) or within the protocol
> (smtp+tls, or even smtp since it does opportunistic tls).
> 

I guess this is the confusing bit - seeing 'starttls' in the log
file and thinking 'STARTTLS', i.e. the "TLS upgrade".

R.

Re: [PATCH] src/etc/root/root.mail - URLs -> URL

[Raf Czlonka]

Ping.

After installurl(5):

The /etc/installurl file contains a single line specifying
an OpenBSD mirror server URL, [...]

Cheers,

Raf

On Fri, Mar 30, 2018 at 11:05:44PM BST, Raf Czlonka wrote:
> Hi all,
> 
> A small typo - plural -> singular.
> 
> Regards,
> 
> Raf
> 
> Index: etc/root/root.mail
> ===
> RCS file: /cvs/src/etc/root/root.mail,v
> retrieving revision 1.127
> diff -u -p -r1.127 root.mail
> --- etc/root/root.mail23 Mar 2018 15:45:56 -  1.127
> +++ etc/root/root.mail30 Mar 2018 22:02:39 -
> @@ -27,7 +27,7 @@ find further information regarding confi
>  
>  Several popular binary packages (pre-compiled applications) are
>  available from mirror sites.  Mirror selection is usually automatic
> -during install/upgrade -- a mirror URLs from https://www.openbsd.org/ftp.html
> +during install/upgrade -- a mirror URL from https://www.openbsd.org/ftp.html
>  is stored into the file /etc/installurl.  Installation of packages is
>  as simple as:
>  

[PATCH][src] share/man/man8/starttls.8 - use the new cert keyword

[Raf Czlonka]

Hi all,

The certificate keyword has been recently shortened to cert.

Regards,

Raf

Index: share/man/man8/starttls.8
===
RCS file: /cvs/src/share/man/man8/starttls.8,v
retrieving revision 1.25
diff -u -p -r1.25 starttls.8
--- share/man/man8/starttls.8   11 Jun 2018 05:49:09 -  1.25
+++ share/man/man8/starttls.8   27 Jun 2018 00:21:56 -
@@ -143,7 +143,7 @@ For
 it's as simple as adding pki configuration to
 .Xr smtpd.conf 5 :
 .Bd -literal -offset indent
-pki mail.example.com certificate "/etc/ssl/mail.example.com.crt"
+pki mail.example.com cert "/etc/ssl/mail.example.com.crt"
 pki mail.example.com key "/etc/ssl/private/mail.example.com.key"
 
 listen on [...] tls pki mail.example.com auth

Re: [patch] Fix inaccurate comment in usr.bin/w/w.c

[Raf Czlonka]

On Thu, Jun 14, 2018 at 06:28:47AM BST, Nan Xiao wrote:
> Hi tech@,
> 
> The following patch fix some inaccurate comment in w.c. E.g., there is
> no "-n" option, and "-a" instead. Sorry id I am wrong, thanks!
> 
> Index: w.c
> ===
> RCS file: /cvs/src/usr.bin/w/w.c,v
> retrieving revision 1.65
> diff -u -p -r1.65 w.c
> --- w.c   18 Dec 2017 05:51:53 -  1.65
> +++ w.c   14 Jun 2018 05:17:00 -
> @@ -71,9 +71,9 @@ struct winsize  ws;
>  kvm_t   *kd;
>  time_t   now;/* the current time of day */
>  int  ttywidth;   /* width of tty */
> -int  argwidth;   /* width of tty */
> -int  header = 1; /* true if -h flag: don't print heading */
> -int  nflag = 1;  /* true if -n flag: don't convert addrs */
> +int  argwidth;   /* width of name and args of the current 
> process */
> +int  header = 1; /* false if -h or -M flag: don't print heading 
> */
> +int  nflag = 1;  /* false if -a flag: don't convert addrs */
>  int  sortidle;   /* sort by idle time */
>  char*sel_user;   /* login of particular user selected */
>  char domain[HOST_NAME_MAX+1];

FYI, the '-n' to '-a' change happened nearly 22 years ago[0].

Given that "-a flag" should clearly be in the comment, shouldn't
there a mechanical nflag -> aflag change also take place?

[0] 
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/w/w.c.diff?r1=1.5=1.6=h

Regards,

Raf

[PATCH] [src] usr.sbin/smtpd/smtp.1 - normalise protocol definitions

[Raf Czlonka]

Hi all,

This patch normalises the protocol definitions.

Regards,

Raf

Index: usr.sbin/smtpd/smtp.1
===
RCS file: /cvs/src/usr.sbin/smtpd/smtp.1,v
retrieving revision 1.5
diff -u -p -r1.5 smtp.1
--- usr.sbin/smtpd/smtp.1   29 Apr 2018 11:58:45 -  1.5
+++ usr.sbin/smtpd/smtp.1   11 May 2018 10:59:58 -
@@ -66,7 +66,7 @@ The following protocols are available:
 .Pp
 .Bl -tag -width "smtp+notls" -compact
 .It smtp
-Normal SMTP session, with opportunistic STARTTLS.
+Normal SMTP session with opportunistic STARTTLS.
 .It smtp+tls
 Normal SMTP session with mandatory STARTTLS.
 .It smtp+notls
@@ -76,7 +76,7 @@ LMTP session with opportunistic STARTTLS
 .It lmtp+tls
 LMTP session with mandatory STARTTLS.
 .It lmtp+notls
-Plain text LMTP session.
+Plain text LMTP session without TLS.
 .It smtps
 SMTP session with forced TLS on connection.
 .El