openbsd: Update to 6.7

9 files changed, 47 insertions, 103 deletions

diff --git a/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch b/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
index 9cd4120c..b88aa2b8 100644
--- a/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
+++ b/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
@@ -1,16 +1,16 @@
-From fdfd554d5e24850f7ebbc67798c893c4ec6b7506 Mon Sep 17 00:00:00 2001
+From ec3fd37495e977af375a98a472d19ae0ccbcd874 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 3 Dec 2016 20:49:24 -0800
 Subject: [PATCH] pax: Fix GNU long name handling with short read
 
 ---
- bin/pax/ar_subs.c   | 66 +++++++++++++++++++++++++++++++++++++++--------------
- bin/pax/buf_subs.c  |  4 +---
- bin/pax/file_subs.c | 25 +-------------------
+ bin/pax/ar_subs.c   | 66 +++++++++++++++++++++++++++++++++------------
+ bin/pax/buf_subs.c  |  4 +--
+ bin/pax/file_subs.c | 25 +----------------
  3 files changed, 51 insertions(+), 44 deletions(-)
 
 diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
-index f70ec4ed0..222bfafa5 100644
+index e5b0a4ee5d1..f0a55abe2f7 100644
 --- a/bin/pax/ar_subs.c
 +++ b/bin/pax/ar_subs.c
 @@ -37,6 +37,7 @@
@@ -114,7 +114,7 @@ index f70ec4ed0..222bfafa5 100644
 +	return 1;
 +}
 diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
-index 30be3dc46..6a9594918 100644
+index 68534dcbe25..e84f9e0d3d6 100644
 --- a/bin/pax/buf_subs.c
 +++ b/bin/pax/buf_subs.c
 @@ -673,9 +673,7 @@ rd_wrfile(ARCHD *arcn, int ofd, off_t *left)
@@ -129,10 +129,10 @@ index 30be3dc46..6a9594918 100644
  			sz = (int)sb.st_blksize;
  	} else
 diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
-index 57ebdb490..1a8f58d57 100644
+index 89b4872988b..8aa3d249923 100644
 --- a/bin/pax/file_subs.c
 +++ b/bin/pax/file_subs.c
-@@ -917,7 +917,6 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
+@@ -919,7 +919,6 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
  	char *end;
  	int wcnt;
  	char *st = str;
@@ -140,7 +140,7 @@ index 57ebdb490..1a8f58d57 100644
  
  	/*
  	 * while we have data to process
-@@ -976,29 +975,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
+@@ -978,29 +977,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
  		/*
  		 * have non-zero data in this file system block, have to write
  		 */
@@ -172,5 +172,5 @@ index 57ebdb490..1a8f58d57 100644
  			return(-1);
  		}
 -- 
-2.12.2
+2.26.2
 
diff --git a/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch b/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
index cd9034cc..00f8a8b9 100644
--- a/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
+++ b/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
@@ -1,4 +1,4 @@
-From d3515f559d148e217f2a8799fd1e3db63dd817ad Mon Sep 17 00:00:00 2001
+From ac4a17dd01df3889bac917b0dc34ba9fd15aa7fe Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 3 Dec 2016 23:50:27 -0800
 Subject: [PATCH] pax: Support xz compression with -J flag
@@ -8,7 +8,7 @@ Subject: [PATCH] pax: Support xz compression with -J flag
  1 file changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/bin/pax/options.c b/bin/pax/options.c
-index 022c59664..c2d046d07 100644
+index c7e64a5d22c..917414c999a 100644
 --- a/bin/pax/options.c
 +++ b/bin/pax/options.c
 @@ -154,6 +154,7 @@ static int xz_id(char *_blk, int _size);
@@ -72,7 +72,7 @@ index 022c59664..c2d046d07 100644
  		switch (c) {
  			case 'a':
  				/*
-@@ -1347,6 +1360,12 @@ cpio_options(int argc, char **argv)
+@@ -1348,6 +1361,12 @@ cpio_options(int argc, char **argv)
  				(void)fputs("\n\n", stderr);
  				cpio_usage();
  				break;
@@ -86,5 +86,5 @@ index 022c59664..c2d046d07 100644
  				/*
  				 * follow symbolic links
 -- 
-2.12.2
+2.26.2
 
diff --git a/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch b/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch
index 3db9f3da..fa76ca7c 100644
--- a/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch
+++ b/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch
@@ -1,4 +1,4 @@
-From a9958b98fd7e746f4da6df5b8e89507a5ac85dab Mon Sep 17 00:00:00 2001
+From 5dd6a34aacb8c4248823f708f68201ba06ec6c25 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 26 Feb 2017 16:50:55 -0800
 Subject: [PATCH] doas: Port to linux/musl
@@ -57,7 +57,7 @@ index fc769bdb336..c7196e347a9 100644
  Parse and check the configuration file
  .Ar config ,
 diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
-index dfd8c8603bf..b2180a5f0e0 100644
+index a723c67a3eb..e7e3e639401 100644
 --- a/usr.bin/doas/doas.c
 +++ b/usr.bin/doas/doas.c
 @@ -20,8 +20,6 @@
@@ -93,7 +93,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  	    " command [args]\n");
  	exit(1);
  }
-@@ -193,23 +200,36 @@ checkconfig(const char *confpath, int argc, char **argv,
+@@ -197,23 +204,36 @@ checkconfig(const char *confpath, int argc, char **argv,
  	}
  }
  
@@ -140,7 +140,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  	if (!challenge) {
  		char host[HOST_NAME_MAX + 1];
  		if (gethostname(host, sizeof(host)))
-@@ -221,21 +241,18 @@ authuser(char *myname, char *login_style, int persist)
+@@ -225,21 +245,18 @@ authuser(char *myname, char *login_style, int persist)
  	response = readpassphrase(challenge, rbuf, sizeof(rbuf),
  	    RPP_REQUIRE_TTY);
  	if (response == NULL && errno == ENOTTY) {
@@ -166,7 +166,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  		close(fd);
  	}
  }
-@@ -281,15 +298,14 @@ done:
+@@ -285,15 +302,14 @@ done:
  int
  main(int argc, char **argv)
  {
@@ -184,7 +184,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  	struct passwd mypwstore, targpwstore;
  	struct passwd *mypw, *targpw;
  	const struct rule *rule;
-@@ -302,28 +318,20 @@ main(int argc, char **argv)
+@@ -306,28 +322,20 @@ main(int argc, char **argv)
  	int nflag = 0;
  	char cwdpath[PATH_MAX];
  	const char *cwd;
@@ -216,7 +216,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  		case 'u':
  			if (parseuid(optarg, &target) != 0)
  				errx(1, "unknown user");
-@@ -391,16 +399,16 @@ main(int argc, char **argv)
+@@ -395,16 +403,16 @@ main(int argc, char **argv)
  	cmd = argv[0];
  	if (!permit(uid, groups, ngroups, &rule, target, cmd,
  	    (const char **)argv + 1)) {
@@ -237,7 +237,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  	}
  
  	if ((p = getenv("PATH")) != NULL)
-@@ -427,11 +435,12 @@ main(int argc, char **argv)
+@@ -431,11 +439,12 @@ main(int argc, char **argv)
  	if (targpw == NULL)
  		errx(1, "no passwd entry for target");
  
@@ -255,7 +255,7 @@ index dfd8c8603bf..b2180a5f0e0 100644
  
  	if (pledge("stdio rpath exec", NULL) == -1)
  		err(1, "pledge");
-@@ -444,7 +453,7 @@ main(int argc, char **argv)
+@@ -448,7 +457,7 @@ main(int argc, char **argv)
  	if (pledge("stdio exec", NULL) == -1)
  		err(1, "pledge");
  
@@ -431,5 +431,5 @@ index 00000000000..41fa747458b
 +	return 0;
 +}
 -- 
-2.23.0
+2.26.2
 
diff --git a/pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch b/pkg/openbsd/patch/0029-Include-sys-sysmacros.h-if-necessary.patch
index 6b64a048..6b64a048 100644
--- a/pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch
+++ b/pkg/openbsd/patch/0029-Include-sys-sysmacros.h-if-necessary.patch
diff --git a/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch b/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch
deleted file mode 100644
index 8c6d53d3..00000000
--- a/pkg/openbsd/patch/0029-acme-client-Prevent-duplicate-definitions-of-global-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e4144832450feeb8cdf4baa310f0540b9b6d4f7c Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 15 Jun 2019 20:20:36 -0700
-Subject: [PATCH] acme-client: Prevent duplicate definitions of global
- variables
-
----
- usr.sbin/acme-client/extern.h | 4 ++--
- usr.sbin/acme-client/main.c   | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/usr.sbin/acme-client/extern.h b/usr.sbin/acme-client/extern.h
-index 85a844f77f3..9ec48a08c4c 100644
---- a/usr.sbin/acme-client/extern.h
-+++ b/usr.sbin/acme-client/extern.h
-@@ -279,12 +279,12 @@ char		*json_fmt_signed(const char *, const char *, const char *);
- /*
-  * Should we print debugging messages?
-  */
--int		 verbose;
-+extern int	 verbose;
- 
- /*
-  * What component is the process within (COMP__MAX for none)?
-  */
--enum comp	 proccomp;
-+extern enum comp proccomp;
- 
- __END_DECLS
- 
-diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c
-index 7cbeeb7de03..1f59e6c755d 100644
---- a/usr.sbin/acme-client/main.c
-+++ b/usr.sbin/acme-client/main.c
-@@ -32,6 +32,9 @@
- #define WWW_DIR "/var/www/acme"
- #define CONF_FILE "/etc/acme-client.conf"
- 
-+int		 verbose;
-+enum comp 	 proccomp;
-+
- int
- main(int argc, char *argv[])
- {
-@@ -46,8 +49,6 @@ main(int argc, char *argv[])
- 	int		  c, rc, revocate = 0;
- 	int		  popts = 0;
- 	pid_t		  pids[COMP__MAX];
--	extern int	  verbose;
--	extern enum comp  proccomp;
- 	size_t		  i, altsz, ne;
- 
- 	struct acme_conf	*conf = NULL;
--- 
-2.23.0
-
diff --git a/pkg/openbsd/patch/0031-nc-Portability-fixes-from-libressl-portable.patch b/pkg/openbsd/patch/0030-nc-Portability-fixes-from-libressl-portable.patch
index 45d2e4af..2c3cb23d 100644
--- a/pkg/openbsd/patch/0031-nc-Portability-fixes-from-libressl-portable.patch
+++ b/pkg/openbsd/patch/0030-nc-Portability-fixes-from-libressl-portable.patch
@@ -1,4 +1,4 @@
-From b1277303a902a8fffe4adb9bff8807800353280c Mon Sep 17 00:00:00 2001
+From 074f2b35512b16c9644c8bd878fa9ace208c17a6 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 2 Dec 2019 21:11:04 -0800
 Subject: [PATCH] nc: Portability fixes from libressl-portable
@@ -8,7 +8,7 @@ Subject: [PATCH] nc: Portability fixes from libressl-portable
  1 file changed, 48 insertions(+), 7 deletions(-)
 
 diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
-index c04298f64c3..2509421093b 100644
+index 503095584ad..f052766213e 100644
 --- a/usr.bin/nc/netcat.c
 +++ b/usr.bin/nc/netcat.c
 @@ -93,9 +93,13 @@ int	zflag;					/* Port Scan Flag */
@@ -25,7 +25,7 @@ index c04298f64c3..2509421093b 100644
  
  int	usetls;					/* use TLS */
  const char    *Cflag;				/* Public cert file */
-@@ -268,12 +272,14 @@ main(int argc, char *argv[])
+@@ -269,12 +273,14 @@ main(int argc, char *argv[])
  		case 'u':
  			uflag = 1;
  			break;
@@ -40,7 +40,7 @@ index c04298f64c3..2509421093b 100644
  		case 'v':
  			vflag = 1;
  			break;
-@@ -320,9 +326,11 @@ main(int argc, char *argv[])
+@@ -321,9 +327,11 @@ main(int argc, char *argv[])
  		case 'o':
  			oflag = optarg;
  			break;
@@ -52,7 +52,7 @@ index c04298f64c3..2509421093b 100644
  		case 'T':
  			errstr = NULL;
  			errno = 0;
-@@ -346,9 +354,11 @@ main(int argc, char *argv[])
+@@ -347,9 +355,11 @@ main(int argc, char *argv[])
  	argc -= optind;
  	argv += optind;
  
@@ -63,20 +63,20 @@ index c04298f64c3..2509421093b 100644
 +#endif
  
  	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-@@ -919,7 +929,10 @@ int
- remote_connect(const char *host, const char *port, struct addrinfo hints)
+ 	if (argc == 1 && family == AF_UNIX) {
+@@ -947,7 +957,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
+     char *ipaddr)
  {
  	struct addrinfo *res, *res0;
--	int s = -1, error, on = 1, save_errno;
-+	int s = -1, error, save_errno;
+-	int s = -1, error, herr, on = 1, save_errno;
++	int s = -1, error, herr, save_errno;
 +#ifdef SO_BINDANY
 +	int on = 1;
 +#endif
  
  	if ((error = getaddrinfo(host, port, &hints, &res0)))
  		errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
-@@ -934,8 +947,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
+@@ -962,8 +975,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
  		if (sflag || pflag) {
  			struct addrinfo ahints, *ares;
  
@@ -87,7 +87,7 @@ index c04298f64c3..2509421093b 100644
  			memset(&ahints, 0, sizeof(struct addrinfo));
  			ahints.ai_family = res->ai_family;
  			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1006,8 +1021,11 @@ int
+@@ -1055,8 +1070,11 @@ int
  local_listen(const char *host, const char *port, struct addrinfo hints)
  {
  	struct addrinfo *res, *res0;
@@ -100,7 +100,7 @@ index c04298f64c3..2509421093b 100644
  
  	/* Allow nodename to be null. */
  	hints.ai_flags |= AI_PASSIVE;
-@@ -1027,9 +1045,11 @@ local_listen(const char *host, const char *port, struct addrinfo hints)
+@@ -1076,9 +1094,11 @@ local_listen(const char *host, const char *port, struct addrinfo hints)
  		    res->ai_protocol)) == -1)
  			continue;
  
@@ -112,7 +112,7 @@ index c04298f64c3..2509421093b 100644
  
  		set_common_sockopts(s, res->ai_family);
  
-@@ -1499,11 +1519,13 @@ set_common_sockopts(int s, int af)
+@@ -1548,11 +1568,13 @@ set_common_sockopts(int s, int af)
  {
  	int x = 1;
  
@@ -126,7 +126,7 @@ index c04298f64c3..2509421093b 100644
  	if (Dflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
  			&x, sizeof(x)) == -1)
-@@ -1514,9 +1536,16 @@ set_common_sockopts(int s, int af)
+@@ -1563,9 +1585,16 @@ set_common_sockopts(int s, int af)
  		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
  			err(1, "set IP ToS");
  
@@ -143,7 +143,7 @@ index c04298f64c3..2509421093b 100644
  	}
  	if (Iflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1540,13 +1569,17 @@ set_common_sockopts(int s, int af)
+@@ -1589,13 +1618,17 @@ set_common_sockopts(int s, int af)
  	}
  
  	if (minttl != -1) {
@@ -162,7 +162,7 @@ index c04298f64c3..2509421093b 100644
  	}
  }
  
-@@ -1768,14 +1801,22 @@ help(void)
+@@ -1820,14 +1853,22 @@ help(void)
  	\t-P proxyuser\tUsername for proxy authentication\n\
  	\t-p port\t	Specify local port for remote connects\n\
  	\t-R CAfile	CA bundle\n\
@@ -174,7 +174,7 @@ index c04298f64c3..2509421093b 100644
 +	\t-S		Enable the TCP MD5 signature option\n"
 +#endif
 +	"\
- 	\t-s source	Local source address\n\
+ 	\t-s sourceaddr	Local source address\n\
  	\t-T keyword	TOS value or TLS options\n\
  	\t-t		Answer TELNET negotiation\n\
  	\t-U		Use UNIX domain socket\n\
@@ -190,5 +190,5 @@ index c04298f64c3..2509421093b 100644
  	\t-W recvlimit	Terminate after receiving a number of packets\n\
  	\t-w timeout	Timeout for connects and final net reads\n\
 -- 
-2.24.0
+2.26.2
 
diff --git a/pkg/openbsd/patch/0032-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch b/pkg/openbsd/patch/0031-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
index 3a800a9a..2b0a5f22 100644
--- a/pkg/openbsd/patch/0032-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
+++ b/pkg/openbsd/patch/0031-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
@@ -1,4 +1,4 @@
-From afcab21e3980789807c930d417535e883533ef05 Mon Sep 17 00:00:00 2001
+From 0f49ae38698a163f7954d28bbaba473b6bf28239 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 10 Jan 2020 21:40:03 -0800
 Subject: [PATCH] pax: Ignore EOPNOTSUPP from fchmodat
@@ -9,10 +9,10 @@ Linux does not support changing the mode of symlinks.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
-index cfe56baa5a6..a66c0dd1f9d 100644
+index 8aa3d249923..2c0994feca6 100644
 --- a/bin/pax/file_subs.c
 +++ b/bin/pax/file_subs.c
-@@ -793,7 +793,7 @@ void
+@@ -795,7 +795,7 @@ void
  set_pmode(char *fnm, mode_t mode)
  {
  	mode &= ABITS;
@@ -22,5 +22,5 @@ index cfe56baa5a6..a66c0dd1f9d 100644
  }
  
 -- 
-2.24.1
+2.26.2
 
diff --git a/pkg/openbsd/patch/0033-acme-client-Fix-build-with-old-bison-versions.patch b/pkg/openbsd/patch/0032-acme-client-Fix-build-with-old-bison-versions.patch
index 50639203..50639203 100644
--- a/pkg/openbsd/patch/0033-acme-client-Fix-build-with-old-bison-versions.patch
+++ b/pkg/openbsd/patch/0032-acme-client-Fix-build-with-old-bison-versions.patch
diff --git a/pkg/openbsd/patch/0034-rsync-Add-implementation-of-MD4.patch b/pkg/openbsd/patch/0033-rsync-Add-implementation-of-MD4.patch
index fc02ee8a..fc02ee8a 100644
--- a/pkg/openbsd/patch/0034-rsync-Add-implementation-of-MD4.patch
+++ b/pkg/openbsd/patch/0033-rsync-Add-implementation-of-MD4.patch