Re: Unescaped backslashes in manual pages

[Ingo Schwarze]

Hi Peter,

Peter Piwowarski wrote on Tue, Mar 19, 2019 at 10:03:20PM -0400:

> qsort(3) has in its EXAMPLE a C \n with its backslash unescaped; a quick
> grep through manpages showed similar errors in CONF_modules_load_file.3.

Ouch!  Thanks for the report, committed.
  Ingo


> Index: lib/libc/stdlib/qsort.3
> ===
> RCS file: /cvs/src/lib/libc/stdlib/qsort.3,v
> retrieving revision 1.24
> diff -u -p -r1.24 qsort.3
> --- lib/libc/stdlib/qsort.3   22 Jan 2019 06:49:17 -  1.24
> +++ lib/libc/stdlib/qsort.3   19 Mar 2019 16:49:59 -
> @@ -179,7 +179,7 @@ main()
>  
>   qsort(array, N, sizeof(array[0]), cmp);
>   for (i =  0; i < N; i++)
> - printf("%s\n", array[i]);
> + printf("%s\en", array[i]);
>  }
>  
>  
> Index: lib/libcrypto/man/CONF_modules_load_file.3
> ===
> RCS file: /cvs/src/lib/libcrypto/man/CONF_modules_load_file.3,v
> retrieving revision 1.7
> diff -u -p -r1.7 CONF_modules_load_file.3
> --- lib/libcrypto/man/CONF_modules_load_file.322 Mar 2018 21:08:22 
> -  1.7
> +++ lib/libcrypto/man/CONF_modules_load_file.319 Mar 2019 16:49:59 
> -
> @@ -163,7 +163,7 @@ Load a configuration file and print out 
>  file considered fatal):
>  .Bd -literal
>  if (CONF_modules_load_file(NULL, NULL, 0) <= 0) {
> - fprintf(stderr, "FATAL: error loading configuration file\n");
> + fprintf(stderr, "FATAL: error loading configuration file\en");
>   ERR_print_errors_fp(stderr);
>   exit(1);
>  }
> @@ -174,7 +174,7 @@ by "myapp", tolerate missing files, but 
>  .Bd -literal
>  if (CONF_modules_load_file(NULL, "myapp",
>  CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
> - fprintf(stderr, "FATAL: error loading configuration file\n");
> + fprintf(stderr, "FATAL: error loading configuration file\en");
>   ERR_print_errors_fp(stderr);
>   exit(1);
>  }
> @@ -185,7 +185,7 @@ error, missing configuration file ignore
>  .Bd -literal
>  if (CONF_modules_load_file("/something/app.cnf", "myapp",
>  CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
> - fprintf(stderr, "WARNING: error loading configuration file\n");
> + fprintf(stderr, "WARNING: error loading configuration file\en");
>   ERR_print_errors_fp(stderr);
>  }
>  .Ed
> @@ -198,17 +198,17 @@ long eline;
>  
>  fp = fopen("/somepath/app.cnf", "r");
>  if (fp == NULL) {
> - fprintf(stderr, "Error opening configuration file\n");
> + fprintf(stderr, "Error opening configuration file\en");
>   /* Other missing configuration file behaviour */
>  } else {
>   cnf = NCONF_new(NULL);
>   if (NCONF_load_fp(cnf, fp, &eline) == 0) {
> - fprintf(stderr, "Error on line %ld of configuration file\n",
> + fprintf(stderr, "Error on line %ld of configuration file\en",
>   eline);
>   ERR_print_errors_fp(stderr);
>   /* Other malformed configuration file behaviour */
>   } else if (CONF_modules_load(cnf, "appname", 0) <= 0) {
> - fprintf(stderr, "Error configuring application\n");
> + fprintf(stderr, "Error configuring application\en");
>   ERR_print_errors_fp(stderr);
>   /* Other configuration error behaviour */
>   }

Unescaped backslashes in manual pages

[Peter Piwowarski]

qsort(3) has in its EXAMPLE a C \n with its backslash unescaped; a quick
grep through manpages showed similar errors in CONF_modules_load_file.3.

Index: lib/libc/stdlib/qsort.3
===
RCS file: /cvs/src/lib/libc/stdlib/qsort.3,v
retrieving revision 1.24
diff -u -p -r1.24 qsort.3
--- lib/libc/stdlib/qsort.3 22 Jan 2019 06:49:17 -  1.24
+++ lib/libc/stdlib/qsort.3 19 Mar 2019 16:49:59 -
@@ -179,7 +179,7 @@ main()
 
qsort(array, N, sizeof(array[0]), cmp);
for (i =  0; i < N; i++)
-   printf("%s\n", array[i]);
+   printf("%s\en", array[i]);
 }
 
 
Index: lib/libcrypto/man/CONF_modules_load_file.3
===
RCS file: /cvs/src/lib/libcrypto/man/CONF_modules_load_file.3,v
retrieving revision 1.7
diff -u -p -r1.7 CONF_modules_load_file.3
--- lib/libcrypto/man/CONF_modules_load_file.3  22 Mar 2018 21:08:22 -  
1.7
+++ lib/libcrypto/man/CONF_modules_load_file.3  19 Mar 2019 16:49:59 -
@@ -163,7 +163,7 @@ Load a configuration file and print out 
 file considered fatal):
 .Bd -literal
 if (CONF_modules_load_file(NULL, NULL, 0) <= 0) {
-   fprintf(stderr, "FATAL: error loading configuration file\n");
+   fprintf(stderr, "FATAL: error loading configuration file\en");
ERR_print_errors_fp(stderr);
exit(1);
 }
@@ -174,7 +174,7 @@ by "myapp", tolerate missing files, but 
 .Bd -literal
 if (CONF_modules_load_file(NULL, "myapp",
 CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
-   fprintf(stderr, "FATAL: error loading configuration file\n");
+   fprintf(stderr, "FATAL: error loading configuration file\en");
ERR_print_errors_fp(stderr);
exit(1);
 }
@@ -185,7 +185,7 @@ error, missing configuration file ignore
 .Bd -literal
 if (CONF_modules_load_file("/something/app.cnf", "myapp",
 CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
-   fprintf(stderr, "WARNING: error loading configuration file\n");
+   fprintf(stderr, "WARNING: error loading configuration file\en");
ERR_print_errors_fp(stderr);
 }
 .Ed
@@ -198,17 +198,17 @@ long   eline;
 
 fp = fopen("/somepath/app.cnf", "r");
 if (fp == NULL) {
-   fprintf(stderr, "Error opening configuration file\n");
+   fprintf(stderr, "Error opening configuration file\en");
/* Other missing configuration file behaviour */
 } else {
cnf = NCONF_new(NULL);
if (NCONF_load_fp(cnf, fp, &eline) == 0) {
-   fprintf(stderr, "Error on line %ld of configuration file\n",
+   fprintf(stderr, "Error on line %ld of configuration file\en",
eline);
ERR_print_errors_fp(stderr);
/* Other malformed configuration file behaviour */
} else if (CONF_modules_load(cnf, "appname", 0) <= 0) {
-   fprintf(stderr, "Error configuring application\n");
+   fprintf(stderr, "Error configuring application\en");
ERR_print_errors_fp(stderr);
/* Other configuration error behaviour */
}

Re: update xf86-video-ati to version 19.0.1

[Jonathan Gray]

On Tue, Mar 19, 2019 at 11:06:36PM +0100, Matthieu Herrb wrote:
> tested on:
> radeondrm0 at pci2 dev 0 function 0 "ATI Radeon HD 3650" rev 0x00
> 
> Bug fix release... ok ?

ok jsg@

Tested on i386 with:

radeondrm0 at pci1 dev 0 function 0 "ATI Radeon Mobility M7" rev 0x00

Extended renderer info (GLX_MESA_query_renderer):
Vendor: Mesa Project (0x1002)
Device: Mesa DRI R100 (RV200 4C57) x86/MMX/SSE2 DRI2 (0x4c57)

and amd64 with carrizo-l/mullins where the default is glamor:

radeondrm0 at pci0 dev 1 function 0 vendor "ATI", unknown product 0x9851 rev 
0x45

Extended renderer info (GLX_MESA_query_renderer):
Vendor: X.Org (0x1002)
Device: AMD MULLINS (DRM 2.43.0, 6.5, LLVM 7.0.1) (0x9851)

update xf86-video-ati to version 19.0.1

[Matthieu Herrb]

tested on:
radeondrm0 at pci2 dev 0 function 0 "ATI Radeon HD 3650" rev 0x00

Bug fix release... ok ?

Index: ChangeLog
===
RCS file: /cvs/xenocara/driver/xf86-video-ati/ChangeLog,v
retrieving revision 1.17
diff -u -p -u -r1.17 ChangeLog
--- ChangeLog   8 Mar 2019 21:59:55 -   1.17
+++ ChangeLog   19 Mar 2019 22:01:52 -
@@ -1,3 +1,52 @@
+commit 36703f66c3b06875651606a6280d5dc9d9dad51e
+Author: Michel Dänzer 
+Date:   Tue Mar 19 18:01:02 2019 +0100
+
+Bump version for 19.0.1 release
+
+commit 4407c78bd86da4460ee07a15a365e07d99e0dd27
+Author: Dave Airlie 
+Date:   Thu Mar 14 11:17:32 2019 +0100
+
+modesetting: add tile property support
+
+This adds tiling support to the driver, it retrieves the tile info from
+the kernel and translates it into the server format and exposes the
+property.
+
+(Ported from xserver commits 8fb8bbb3062f1a06621ab7030a9e89d5e8367b35
+ and 6abdb54a11dac4e8854ff94ecdcb90a14321ab31)
+(Ported from amdgpu commit 6ee857726166f495abcd68e4ff60e3a09593d079)
+Reviewed-by: Alex Deucher 
+
+commit 79bc0e054f37026377d54cac6cd8127d4aa9baca
+Author: Michel Dänzer 
+Date:   Thu Mar 14 11:10:51 2019 +0100
+
+Use radeon_finish in drmmode_crtc_scanout_update
+
+radeon_glamor_finish only works if we're using glamor, otherwise it'll
+crash.
+
+Fixes: ce7db51020d3 "Cancel pending scanout update in 
drmmode_crtc_scanout_update"
+Bug: https://bugs.debian.org/924540
+Reviewed-by: Alex Deucher 
+
+commit f6cd4a67d7de5d3ff1a6e58a8c83749fc8ffc310
+Author: Michel Dänzer 
+Date:   Fri Mar 8 11:48:10 2019 +0100
+
+Revert "glamor: Avoid glamor_create_pixmap for pixmaps backing windows"
+
+This reverts commit 274703087f80342f51fa69c935bb9a1cb0c4ae47.
+
+Reports of visual corruption were bisected to this, e.g.
+https://bugs.archlinux.org/task/61941 . I can reproduce this with Turks,
+but not with Bonaire. I assume it's a Mesa/glamor bug, but let's revert
+for now.
+
+Acked-by: Alex Deucher 
+
 commit 0d132d99e0b750896a78f47d73a8639680495d8c
 Author: Michel Dänzer 
 Date:   Wed Mar 6 17:48:03 2019 +0100
Index: configure
===
RCS file: /cvs/xenocara/driver/xf86-video-ati/configure,v
retrieving revision 1.26
diff -u -p -u -r1.26 configure
--- configure   8 Mar 2019 21:59:56 -   1.26
+++ configure   19 Mar 2019 22:01:54 -
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-ati 19.0.0.
+# Generated by GNU Autoconf 2.69 for xf86-video-ati 19.0.1.
 #
 # Report bugs to 
.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-video-ati'
 PACKAGE_TARNAME='xf86-video-ati'
-PACKAGE_VERSION='19.0.0'
-PACKAGE_STRING='xf86-video-ati 19.0.0'
+PACKAGE_VERSION='19.0.1'
+PACKAGE_STRING='xf86-video-ati 19.0.1'
 
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Radeon'
 PACKAGE_URL=''
 
@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-ati 19.0.0 to adapt to many kinds of 
systems.
+\`configure' configures xf86-video-ati 19.0.1 to adapt to many kinds of 
systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1468,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 19.0.0:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 19.0.1:";;
esac
   cat <<\_ACEOF
 
@@ -1629,7 +1629,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-ati configure 19.0.0
+xf86-video-ati configure 19.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2044,7 +2044,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-ati $as_me 19.0.0, which was
+It was created by xf86-video-ati $as_me 19.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2876,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-ati'
- VERSION='19.0.0'
+ VERSION='19.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20122,7 +20122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-ati $as_me 19.0.0, which was
+This file was extended by xf86-video-ati $as_me 

Re: smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Todd C . Miller]

On Tue, 19 Mar 2019 23:24:24 +0200, Lauri Tirkkonen wrote:

> I might be blind, but 'grep -r send-mail /usr/ports/pobj/nmh-1.7.1'
> comes up empty for me after 'make extract' in /usr/ports/mail/nmh?

It looks like spost.c is historical code that is not actually packaged
in the distribution (though it is in the nmh repo).

 - todd

Re: smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Lauri Tirkkonen]

On Tue, Mar 19 2019 15:16:10 -0600, Todd C. Miller wrote:
> On Tue, 19 Mar 2019 22:15:17 +0200, Lauri Tirkkonen wrote:
> 
> > thanks. that means no need for smtpctl and mailer.conf to check for it
> > any more.
> 
> Not so fast.  There are still things in ports that use send-mail.
> I haven't grepped the ports tree but the nmh port at least uses
> "send-mail" for argv[0] in its spost utility.  

I might be blind, but 'grep -r send-mail /usr/ports/pobj/nmh-1.7.1'
comes up empty for me after 'make extract' in /usr/ports/mail/nmh?

-- 
Lauri Tirkkonen | lotheac @ IRCnet

Re: smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Todd C . Miller]

On Tue, 19 Mar 2019 22:15:17 +0200, Lauri Tirkkonen wrote:

> thanks. that means no need for smtpctl and mailer.conf to check for it
> any more.

Not so fast.  There are still things in ports that use send-mail.
I haven't grepped the ports tree but the nmh port at least uses
"send-mail" for argv[0] in its spost utility.  It probably got that
from mail(1) originally.

 - todd

Re: smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Lauri Tirkkonen]

On Tue, Mar 19 2019 14:18:06 -0600, Theo de Raadt wrote:
> Have you verified there are *no other programs* in the entire greater 
> ecosystem
> using that name?

I have not. But eg. FreeBSD and NetBSD don't support these names in
mailer.conf either:

https://github.com/freebsd/freebsd/blob/master/etc/mail/mailer.conf
https://github.com/NetBSD/src/blob/trunk/etc/mailer.conf

so I'm not really worried about that.

-- 
Lauri Tirkkonen | lotheac @ IRCnet

Re: smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Theo de Raadt]

Have you verified there are *no other programs* in the entire greater ecosystem
using that name?

> On Tue, Mar 19 2019 07:26:41 -0600, Todd C. Miller wrote:
> > On Tue, 19 Mar 2019 10:33:07 +0200, Lauri Tirkkonen wrote:
> > 
> > > ping - doesn't look removed yet :)
> > 
> > Committed.
> 
> thanks. that means no need for smtpctl and mailer.conf to check for it
> any more.
> 
> diff --git a/etc/mailer.conf b/etc/mailer.conf
> index fff9e7adbd1..9c752022261 100644
> --- a/etc/mailer.conf
> +++ b/etc/mailer.conf
> @@ -3,7 +3,6 @@
>  # Execute the "real" sendmail program, which is now smtpd by default
>  #
>  sendmail /usr/sbin/smtpctl
> -send-mail/usr/sbin/smtpctl
>  mailq/usr/sbin/smtpctl
>  makemap  /usr/sbin/smtpctl
>  newaliases   /usr/sbin/smtpctl
> diff --git a/usr.sbin/mailwrapper/mailer.conf.5 
> b/usr.sbin/mailwrapper/mailer.conf.5
> index 288ff4f4c2e..2c303dedbdc 100644
> --- a/usr.sbin/mailwrapper/mailer.conf.5
> +++ b/usr.sbin/mailwrapper/mailer.conf.5
> @@ -67,7 +67,6 @@ MTA suite:
>  .Bd -literal
>  # Emulate sendmail using smtpd
>  sendmail /usr/sbin/smtpctl
> -send-mail/usr/sbin/smtpctl
>  mailq/usr/sbin/smtpctl
>  makemap  /usr/sbin/smtpctl
>  newaliases   /usr/sbin/smtpctl
> @@ -80,7 +79,6 @@ MTA suite in place of
>  .Bd -literal
>  # Execute the "real" sendmail program
>  sendmail /usr/local/libexec/sendmail/sendmail
> -send-mail/usr/local/libexec/sendmail/sendmail
>  mailq/usr/local/libexec/sendmail/sendmail
>  makemap  /usr/local/libexec/sendmail/makemap
>  newaliases   /usr/local/libexec/sendmail/sendmail
> diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
> index 4b44d9dd30a..9ebef45f159 100644
> --- a/usr.sbin/smtpd/smtpctl.c
> +++ b/usr.sbin/smtpd/smtpctl.c
> @@ -1116,8 +1116,7 @@ sendmail_compat(int argc, char **argv)
>   gid_tgid;
>   int  i, r;
>  
> - if (strcmp(__progname, "sendmail") == 0 ||
> - strcmp(__progname, "send-mail") == 0) {
> + if (strcmp(__progname, "sendmail") == 0) {
>   /*
>* determine whether we are called with flags
>* that should invoke makemap/newaliases.
> 
> -- 
> Lauri Tirkkonen | lotheac @ IRCnet
> 

smtpctl, mailer.conf: drop send-mail (was: mail(1): use "sendmail" as argv[0] for sendmail)

[Lauri Tirkkonen]

On Tue, Mar 19 2019 07:26:41 -0600, Todd C. Miller wrote:
> On Tue, 19 Mar 2019 10:33:07 +0200, Lauri Tirkkonen wrote:
> 
> > ping - doesn't look removed yet :)
> 
> Committed.

thanks. that means no need for smtpctl and mailer.conf to check for it
any more.

diff --git a/etc/mailer.conf b/etc/mailer.conf
index fff9e7adbd1..9c752022261 100644
--- a/etc/mailer.conf
+++ b/etc/mailer.conf
@@ -3,7 +3,6 @@
 # Execute the "real" sendmail program, which is now smtpd by default
 #
 sendmail   /usr/sbin/smtpctl
-send-mail  /usr/sbin/smtpctl
 mailq  /usr/sbin/smtpctl
 makemap/usr/sbin/smtpctl
 newaliases /usr/sbin/smtpctl
diff --git a/usr.sbin/mailwrapper/mailer.conf.5 
b/usr.sbin/mailwrapper/mailer.conf.5
index 288ff4f4c2e..2c303dedbdc 100644
--- a/usr.sbin/mailwrapper/mailer.conf.5
+++ b/usr.sbin/mailwrapper/mailer.conf.5
@@ -67,7 +67,6 @@ MTA suite:
 .Bd -literal
 # Emulate sendmail using smtpd
 sendmail   /usr/sbin/smtpctl
-send-mail  /usr/sbin/smtpctl
 mailq  /usr/sbin/smtpctl
 makemap/usr/sbin/smtpctl
 newaliases /usr/sbin/smtpctl
@@ -80,7 +79,6 @@ MTA suite in place of
 .Bd -literal
 # Execute the "real" sendmail program
 sendmail   /usr/local/libexec/sendmail/sendmail
-send-mail  /usr/local/libexec/sendmail/sendmail
 mailq  /usr/local/libexec/sendmail/sendmail
 makemap/usr/local/libexec/sendmail/makemap
 newaliases /usr/local/libexec/sendmail/sendmail
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index 4b44d9dd30a..9ebef45f159 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1116,8 +1116,7 @@ sendmail_compat(int argc, char **argv)
gid_tgid;
int  i, r;
 
-   if (strcmp(__progname, "sendmail") == 0 ||
-   strcmp(__progname, "send-mail") == 0) {
+   if (strcmp(__progname, "sendmail") == 0) {
/*
 * determine whether we are called with flags
 * that should invoke makemap/newaliases.

-- 
Lauri Tirkkonen | lotheac @ IRCnet

Re: mail(1): use "sendmail" as argv[0] for sendmail

[Todd C . Miller]

On Tue, 19 Mar 2019 10:33:07 +0200, Lauri Tirkkonen wrote:

> ping - doesn't look removed yet :)

Committed.

 - todd

Re: remove date from signify zsig

[Andre Stoebe]

On 18.03.2019 20:49, Ted Unangst wrote:
> Andre Stoebe wrote:
>> Hi,
>>
>> I, too, would like to have a way of signing the gzip archive in a
>> reproducible way, so here's a diff that uses -n, similar to gzip(1).
> 
> Thanks. I think it's more consistent to store a zero time stamp. This diff is
> a little simpler and avoids some variable reabuse.

Hi Ted,

I agree, this diff is pretty elegant. And it works fine here.

Regards
Andre

> Index: signify.1
> ===
> RCS file: /home/cvs/src/usr.bin/signify/signify.1,v
> retrieving revision 1.45
> diff -u -p -r1.45 signify.1
> --- signify.1 26 Feb 2019 22:24:41 -  1.45
> +++ signify.1 18 Mar 2019 19:47:05 -
> @@ -35,7 +35,7 @@
>  .Fl s Ar seckey
>  .Nm signify
>  .Fl S
> -.Op Fl ez
> +.Op Fl enz
>  .Op Fl x Ar sigfile
>  .Fl s Ar seckey
>  .Fl m Ar message
> @@ -91,10 +91,15 @@ When verifying with
>  .Fl e ,
>  the file to create.
>  .It Fl n
> -Do not ask for a passphrase during key generation.
> +When generating a key pair, do not ask for a passphrase.
>  Otherwise,
>  .Nm
>  will prompt the user for a passphrase to protect the secret key.
> +When signing with
> +.Fl z ,
> +store a zero time stamp in the
> +.Xr gzip 1
> +header.
>  .It Fl p Ar pubkey
>  Public key produced by
>  .Fl G ,
> Index: signify.c
> ===
> RCS file: /home/cvs/src/usr.bin/signify/signify.c,v
> retrieving revision 1.130
> diff -u -p -r1.130 signify.c
> --- signify.c 17 Jan 2019 05:40:10 -  1.130
> +++ signify.c 18 Mar 2019 19:41:05 -
> @@ -80,7 +80,7 @@ usage(const char *error)
>  #ifndef VERIFYONLY
>   "\t%1$s -C [-q] -p pubkey -x sigfile [file ...]\n"
>   "\t%1$s -G [-n] [-c comment] -p pubkey -s seckey\n"
> - "\t%1$s -S [-ez] [-x sigfile] -s seckey -m message\n"
> + "\t%1$s -S [-enz] [-x sigfile] -s seckey -m message\n"
>  #endif
>   "\t%1$s -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m 
> message\n",
>   getprogname());
> @@ -754,7 +754,8 @@ main(int argc, char **argv)
>   char sigfilebuf[PATH_MAX];
>   const char *comment = "signify";
>   char *keytype = NULL;
> - int ch, rounds;
> + int ch;
> + int none = 0;
>   int embedded = 0;
>   int quiet = 0;
>   int gzip = 0;
> @@ -769,8 +770,6 @@ main(int argc, char **argv)
>   if (pledge("stdio rpath wpath cpath tty", NULL) == -1)
>   err(1, "pledge");
>  
> - rounds = 42;
> -
>   while ((ch = getopt(argc, argv, "CGSVzc:em:np:qs:t:x:")) != -1) {
>   switch (ch) {
>  #ifndef VERIFYONLY
> @@ -808,7 +807,7 @@ main(int argc, char **argv)
>   msgfile = optarg;
>   break;
>   case 'n':
> - rounds = 0;
> + none = 1;
>   break;
>   case 'p':
>   pubkeyfile = optarg;
> @@ -871,14 +870,14 @@ main(int argc, char **argv)
>   if (!pubkeyfile || !seckeyfile)
>   usage("must specify pubkey and seckey");
>   check_keyname_compliance(pubkeyfile, seckeyfile);
> - generate(pubkeyfile, seckeyfile, rounds, comment);
> + generate(pubkeyfile, seckeyfile, none ? 0 : 42, comment);
>   break;
>   case SIGN:
>   /* no pledge */
>   if (gzip) {
>   if (!msgfile || !seckeyfile || !sigfile)
>   usage("must specify message sigfile seckey");
> - zsign(seckeyfile, msgfile, sigfile);
> + zsign(seckeyfile, msgfile, sigfile, none);
>   } else {
>   if (!msgfile || !seckeyfile)
>   usage("must specify message and seckey");
> Index: signify.h
> ===
> RCS file: /home/cvs/src/usr.bin/signify/signify.h,v
> retrieving revision 1.1
> diff -u -p -r1.1 signify.h
> --- signify.h 2 Sep 2016 16:10:56 -   1.1
> +++ signify.h 18 Mar 2019 19:38:33 -
> @@ -19,7 +19,7 @@
>  #ifndef signify_h
>  #define signify_h
>  extern void zverify(const char *, const char *, const char *, const char *);
> -extern void zsign(const char *, const char *, const char *);
> +extern void zsign(const char *, const char *, const char *, int);
>  
>  extern void *xmalloc(size_t);
>  extern void writeall(int, const void *, size_t, const char *);
> Index: zsig.c
> ===
> RCS file: /home/cvs/src/usr.bin/signify/zsig.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 zsig.c
> --- zsig.c11 Jul 2017 23:52:05 -  1.15
> +++ zsig.c18 Mar 2019 19:43:08 -
> @@ -231,7 +231,8 @@ zverify(const char *pubkeyfile, const ch
>  }
>  
>  void
> -zsign(const char *seckeyfile, const char *msgfile, const char *sigfile)
>

Re: mail(1): use "sendmail" as argv[0] for sendmail

[Lauri Tirkkonen]

On Mon, Mar 04 2019 09:01:40 -0700, Todd C. Miller wrote:
> On Mon, 04 Mar 2019 16:38:37 +0100, Gilles Chehade wrote:
> 
> > I wish we had an historian who could enlighten us as to why both exist.
> 
> That code actually predates sendmail and was in the original revision
> when delivermail was still in use.  Sendmail itself never checked
> its argv[0] for "send-mail" as far as I know.
> 
> At this point I consider it a historical oddity that is safe to
> remove.

ping - doesn't look removed yet :)

-- 
Lauri Tirkkonen | lotheac @ IRCnet