44 files changed, 329 insertions, 349 deletions

diff --git a/pkg/openbsd/include/string.h b/pkg/openbsd/include/string.h
index 9cf9ac92..698b5fbe 100644
--- a/pkg/openbsd/include/string.h
+++ b/pkg/openbsd/include/string.h
@@ -1,5 +1,6 @@
+#define __NEED_mode_t
 #include_next <string.h>
 char *strcasestr(const char *, const char *);
-void strmode(int, char *);
+void strmode(mode_t, char *);
 int timingsafe_memcmp(const void *, const void *, size_t);
 int timingsafe_bcmp(const void *, const void *, size_t);
diff --git a/pkg/openbsd/patch/0004-pax-Add-some-includes.patch b/pkg/openbsd/patch/0003-pax-Add-some-includes.patch
index cc029d57..cc029d57 100644
--- a/pkg/openbsd/patch/0004-pax-Add-some-includes.patch
+++ b/pkg/openbsd/patch/0003-pax-Add-some-includes.patch
diff --git a/pkg/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch b/pkg/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
deleted file mode 100644
index 7a8ec257..00000000
--- a/pkg/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2ca2e2a530e61e8af65dca829aa1fcad5c59a7d Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 00:13:51 -0700
-Subject: [PATCH] pax: Set listf to stderr in main
-
----
- bin/pax/pax.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/bin/pax/pax.c b/bin/pax/pax.c
-index f6b3634369a..3d50e051075 100644
---- a/bin/pax/pax.c
-+++ b/bin/pax/pax.c
-@@ -93,7 +93,7 @@ char	*dirptr;		/* destination dir in a copy */
- char	*argv0;			/* root of argv[0] */
- enum op_mode op_mode;		/* what program are we acting as? */
- sigset_t s_mask;		/* signal mask for cleanup critical sect */
--FILE	*listf = stderr;	/* file pointer to print file list to */
-+FILE	*listf;			/* file pointer to print file list to */
- int	listfd = STDERR_FILENO;	/* fd matching listf, for sighandler output */
- char	*tempfile;		/* tempfile to use for mkstemp(3) */
- char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
-@@ -224,6 +224,8 @@ main(int argc, char **argv)
- 	char *tmpdir;
- 	size_t tdlen;
- 
-+	listf = stderr;
-+
- 	/*
- 	 * Keep a reference to cwd, so we can always come back home.
- 	 */
--- 
-2.19.0
-
diff --git a/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch b/pkg/openbsd/patch/0004-tar-Default-to-stdin.patch
index 6c4e9461..c1aaab7f 100644
--- a/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch
+++ b/pkg/openbsd/patch/0004-tar-Default-to-stdin.patch
@@ -1,4 +1,4 @@
-From 901940cdf7fc13516ff55e81df0b546eb7c74595 Mon Sep 17 00:00:00 2001
+From 7f16d268831910c1d219b8a4f38b364bba34c710 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 18 Apr 2016 01:16:12 -0700
 Subject: [PATCH] tar: Default to stdin
@@ -8,10 +8,10 @@ Subject: [PATCH] tar: Default to stdin
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bin/pax/options.c b/bin/pax/options.c
-index 5db0948858c..dbb4b816c37 100644
+index cd3f5f6285c..9dd2ea0ce25 100644
 --- a/bin/pax/options.c
 +++ b/bin/pax/options.c
-@@ -937,7 +937,7 @@ tar_options(int argc, char **argv)
+@@ -968,7 +968,7 @@ tar_options(int argc, char **argv)
  	if ((arcname == NULL) || (*arcname == '\0')) {
  		arcname = getenv("TAPE");
  		if ((arcname == NULL) || (*arcname == '\0'))
@@ -21,5 +21,5 @@ index 5db0948858c..dbb4b816c37 100644
  	if ((arcname[0] == '-') && (arcname[1]== '\0'))
  		arcname = NULL;
 -- 
-2.25.0
+2.49.0
 
diff --git a/pkg/openbsd/patch/0006-yacc-Add-some-includes.patch b/pkg/openbsd/patch/0005-yacc-Add-some-includes.patch
index d4498745..d4498745 100644
--- a/pkg/openbsd/patch/0006-yacc-Add-some-includes.patch
+++ b/pkg/openbsd/patch/0005-yacc-Add-some-includes.patch
diff --git a/pkg/openbsd/patch/0007-diff-Add-missing-includes.patch b/pkg/openbsd/patch/0006-diff-Add-missing-includes.patch
index 643a6daf..643a6daf 100644
--- a/pkg/openbsd/patch/0007-diff-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0006-diff-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0008-patch-Add-missing-includes.patch b/pkg/openbsd/patch/0007-patch-Add-missing-includes.patch
index ec6f2d98..ec6f2d98 100644
--- a/pkg/openbsd/patch/0008-patch-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0007-patch-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch b/pkg/openbsd/patch/0008-patch-Avoid-d_namlen.patch
index 2c934216..2c934216 100644
--- a/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
+++ b/pkg/openbsd/patch/0008-patch-Avoid-d_namlen.patch
diff --git a/pkg/openbsd/patch/0010-pax-Fix-GNU-long-name-handling-with-short-read.patch b/pkg/openbsd/patch/0009-pax-Fix-GNU-long-name-handling-with-short-read.patch
index b88aa2b8..4ebd86c6 100644
--- a/pkg/openbsd/patch/0010-pax-Fix-GNU-long-name-handling-with-short-read.patch
+++ b/pkg/openbsd/patch/0009-pax-Fix-GNU-long-name-handling-with-short-read.patch
@@ -1,4 +1,4 @@
-From ec3fd37495e977af375a98a472d19ae0ccbcd874 Mon Sep 17 00:00:00 2001
+From f88fb1145beac6cce7012b506579d23e0b9826a2 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
@@ -10,7 +10,7 @@ Subject: [PATCH] pax: Fix GNU long name handling with short read
  3 files changed, 51 insertions(+), 44 deletions(-)
 
 diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
-index e5b0a4ee5d1..f0a55abe2f7 100644
+index f018108af59..4c49efa1362 100644
 --- a/bin/pax/ar_subs.c
 +++ b/bin/pax/ar_subs.c
 @@ -37,6 +37,7 @@
@@ -47,7 +47,7 @@ index e5b0a4ee5d1..f0a55abe2f7 100644
  
  		/*
  		 * check for pattern, and user specified options match.
-@@ -208,15 +202,8 @@ extract(void)
+@@ -245,15 +239,8 @@ extract(void)
  	 * says it is done
  	 */
  	while (next_head(arcn) == 0) {
@@ -64,7 +64,7 @@ index e5b0a4ee5d1..f0a55abe2f7 100644
  
  		/*
  		 * check for pattern, and user specified options match. When
-@@ -1243,3 +1230,48 @@ get_arc(void)
+@@ -1282,3 +1269,48 @@ get_arc(void)
  	paxwarn(1, "Sorry, unable to determine archive format.");
  	return(-1);
  }
@@ -114,10 +114,10 @@ index e5b0a4ee5d1..f0a55abe2f7 100644
 +	return 1;
 +}
 diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
-index 68534dcbe25..e84f9e0d3d6 100644
+index 25dfed5b69b..e3e22a09cc6 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)
+@@ -676,9 +676,7 @@ rd_wrfile(ARCHD *arcn, int ofd, off_t *left)
  	 * pass the blocksize of the file being written to the write routine,
  	 * if the size is zero, use the default MINFBSZ
  	 */
@@ -129,10 +129,10 @@ index 68534dcbe25..e84f9e0d3d6 100644
  			sz = (int)sb.st_blksize;
  	} else
 diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
-index 89b4872988b..8aa3d249923 100644
+index 9f482480a3b..ae0caf29f6c 100644
 --- a/bin/pax/file_subs.c
 +++ b/bin/pax/file_subs.c
-@@ -919,7 +919,6 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
+@@ -924,7 +924,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 89b4872988b..8aa3d249923 100644
  
  	/*
  	 * while we have data to process
-@@ -978,29 +977,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
+@@ -983,29 +982,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 89b4872988b..8aa3d249923 100644
  			return(-1);
  		}
 -- 
-2.26.2
+2.49.0
 
diff --git a/pkg/openbsd/patch/0011-pax-Support-xz-compression-with-J-flag.patch b/pkg/openbsd/patch/0010-pax-Support-xz-compression-with-J-flag.patch
index 1ec9d0bb..8c3755a3 100644
--- a/pkg/openbsd/patch/0011-pax-Support-xz-compression-with-J-flag.patch
+++ b/pkg/openbsd/patch/0010-pax-Support-xz-compression-with-J-flag.patch
@@ -1,4 +1,4 @@
-From 86ce82bfd12c6db2468e3db4afd843cf081f71b2 Mon Sep 17 00:00:00 2001
+From c0b84520a7c92b67b195c6ec9ed9185438810380 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,10 +8,10 @@ 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 560478f2681..27de25d655b 100644
+index 9dd2ea0ce25..63f17f2c1c7 100644
 --- a/bin/pax/options.c
 +++ b/bin/pax/options.c
-@@ -154,6 +154,7 @@ static int xz_id(char *_blk, int _size);
+@@ -156,6 +156,7 @@ static int xz_id(char *_blk, int _size);
  #define GZIP_CMD	"gzip"		/* command to run as gzip */
  #define COMPRESS_CMD	"compress"	/* command to run as compress */
  #define BZIP2_CMD	"bzip2"		/* command to run as bzip2 */
@@ -19,7 +19,7 @@ index 560478f2681..27de25d655b 100644
  
  /*
   *	Format specific routine table
-@@ -300,7 +301,7 @@ pax_options(int argc, char **argv)
+@@ -312,7 +313,7 @@ pax_options(int argc, char **argv)
  	/*
  	 * process option flags
  	 */
@@ -28,7 +28,7 @@ index 560478f2681..27de25d655b 100644
  	    != -1) {
  		switch (c) {
  		case 'a':
-@@ -556,6 +557,12 @@ pax_options(int argc, char **argv)
+@@ -568,6 +569,12 @@ pax_options(int argc, char **argv)
  			Hflag = 1;
  			flg |= CHF;
  			break;
@@ -41,16 +41,16 @@ index 560478f2681..27de25d655b 100644
  		case 'L':
  			/*
  			 * follow symlinks
-@@ -731,7 +738,7 @@ tar_options(int argc, char **argv)
+@@ -744,7 +751,7 @@ tar_options(int argc, char **argv)
  	 * process option flags
  	 */
  	while ((c = getoldopt(argc, argv,
--	    "b:cef:hjmopqruts:vwxzBC:HI:LNOPXZ014578")) != -1) {
-+	    "b:cef:hjmopqruts:vwxzBC:HI:JLNOPXZ014578")) != -1) {
+-	    "b:cef:hjmopqruts:vwxzBC:F:HI:LNOPXZ014578")) != -1) {
++	    "b:cef:hjmopqruts:vwxzBC:F:HI:JLNOPXZ014578")) != -1) {
  		switch (c) {
  		case 'b':
  			/*
-@@ -880,6 +887,12 @@ tar_options(int argc, char **argv)
+@@ -911,6 +918,12 @@ tar_options(int argc, char **argv)
  			incfiles[nincfiles - 1].file = optarg;
  			incfiles[nincfiles - 1].dir = chdname;
  			break;
@@ -63,7 +63,7 @@ index 560478f2681..27de25d655b 100644
  		case 'L':
  			/*
  			 * follow symlinks
-@@ -1163,7 +1176,7 @@ cpio_options(int argc, char **argv)
+@@ -1194,7 +1207,7 @@ cpio_options(int argc, char **argv)
  	dflag = 1;
  	act = -1;
  	nodirs = 1;
@@ -72,7 +72,7 @@ index 560478f2681..27de25d655b 100644
  		switch (c) {
  			case 'a':
  				/*
-@@ -1347,6 +1360,12 @@ cpio_options(int argc, char **argv)
+@@ -1378,6 +1391,12 @@ cpio_options(int argc, char **argv)
  				(void)fputs("\n\n", stderr);
  				cpio_usage();
  				break;
@@ -86,5 +86,5 @@ index 560478f2681..27de25d655b 100644
  				/*
  				 * follow symbolic links
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0012-setprogname-Explicitly-discard-const-qualifier.patch b/pkg/openbsd/patch/0011-setprogname-Explicitly-discard-const-qualifier.patch
index a645a9e4..a645a9e4 100644
--- a/pkg/openbsd/patch/0012-setprogname-Explicitly-discard-const-qualifier.patch
+++ b/pkg/openbsd/patch/0011-setprogname-Explicitly-discard-const-qualifier.patch
diff --git a/pkg/openbsd/patch/0013-readpassphrase-Support-systems-without-VSTATUS-and-T.patch b/pkg/openbsd/patch/0012-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
index 78660907..78660907 100644
--- a/pkg/openbsd/patch/0013-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
+++ b/pkg/openbsd/patch/0012-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
diff --git a/pkg/openbsd/patch/0014-Remove-getpass-definition.patch b/pkg/openbsd/patch/0013-Remove-getpass-definition.patch
index f2adafda..f2adafda 100644
--- a/pkg/openbsd/patch/0014-Remove-getpass-definition.patch
+++ b/pkg/openbsd/patch/0013-Remove-getpass-definition.patch
diff --git a/pkg/openbsd/patch/0015-doas-Port-to-linux-musl.patch b/pkg/openbsd/patch/0014-doas-Port-to-linux-musl.patch
index 01e8e458..853345af 100644
--- a/pkg/openbsd/patch/0015-doas-Port-to-linux-musl.patch
+++ b/pkg/openbsd/patch/0014-doas-Port-to-linux-musl.patch
@@ -1,4 +1,4 @@
-From 8fa1e97f6927bf1afddb5923fff3d29c3389817d Mon Sep 17 00:00:00 2001
+From cca6c84b472255c4d015d7d97225791796f61392 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
@@ -63,7 +63,7 @@ index 25827cc7104..3542680faf5 100644
  Parse and check the configuration file
  .Ar config ,
 diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
-index 8b684d6006c..27d7b01014e 100644
+index 3999b2e2f64..32532359267 100644
 --- a/usr.bin/doas/doas.c
 +++ b/usr.bin/doas/doas.c
 @@ -20,8 +20,6 @@
@@ -99,7 +99,7 @@ index 8b684d6006c..27d7b01014e 100644
  	    " command [arg ...]\n");
  	exit(1);
  }
-@@ -200,16 +207,28 @@ checkconfig(const char *confpath, int argc, char **argv,
+@@ -203,16 +210,28 @@ checkconfig(const char *confpath, int argc, char **argv,
  }
  
  static int
@@ -135,7 +135,7 @@ index 8b684d6006c..27d7b01014e 100644
  	if (!challenge) {
  		char host[HOST_NAME_MAX + 1];
  
-@@ -222,14 +241,12 @@ authuser_checkpass(char *myname, char *login_style)
+@@ -225,14 +244,12 @@ authuser_checkpass(char *myname, char *login_style)
  	response = readpassphrase(challenge, rbuf, sizeof(rbuf),
  	    RPP_REQUIRE_TTY);
  	if (response == NULL && errno == ENOTTY) {
@@ -153,7 +153,7 @@ index 8b684d6006c..27d7b01014e 100644
  		warnx("Authentication failed");
  		return AUTH_FAILED;
  	}
-@@ -238,79 +255,36 @@ authuser_checkpass(char *myname, char *login_style)
+@@ -241,79 +258,36 @@ authuser_checkpass(char *myname, char *login_style)
  }
  
  static void
@@ -241,7 +241,7 @@ index 8b684d6006c..27d7b01014e 100644
  	struct passwd mypwstore, targpwstore;
  	struct passwd *mypw, *targpw;
  	const struct rule *rule;
-@@ -323,28 +297,20 @@ main(int argc, char **argv)
+@@ -326,28 +300,20 @@ main(int argc, char **argv)
  	int nflag = 0;
  	char cwdpath[PATH_MAX];
  	const char *cwd;
@@ -273,10 +273,10 @@ index 8b684d6006c..27d7b01014e 100644
  		case 'u':
  			if (parseuid(optarg, &target) != 0)
  				errx(1, "unknown user");
-@@ -414,50 +380,30 @@ main(int argc, char **argv)
- 	cmd = argv[0];
- 	if (!permit(uid, groups, ngroups, &rule, target, cmd,
- 	    (const char **)argv + 1)) {
+@@ -418,50 +384,30 @@ main(int argc, char **argv)
+ 	rv = permit(uid, groups, ngroups, &rule, target, cmd,
+ 	    (const char **)argv + 1);
+ 	if (rv != 0) {
 -		syslog(LOG_AUTHPRIV | LOG_NOTICE,
 -		    "command not permitted for %s: %s", mypw->pw_name, cmdline);
 -		errc(1, EPERM, NULL);
@@ -334,7 +334,7 @@ index 8b684d6006c..27d7b01014e 100644
  
  	if (pledge("stdio rpath exec", NULL) == -1)
  		err(1, "pledge");
-@@ -471,23 +417,17 @@ main(int argc, char **argv)
+@@ -475,23 +421,17 @@ main(int argc, char **argv)
  		err(1, "pledge");
  
  	if (!(rule->options & NOLOG)) {
@@ -360,7 +360,7 @@ index 8b684d6006c..27d7b01014e 100644
  		errx(1, "%s: command not found", cmd);
  	err(1, "%s", cmd);
 diff --git a/usr.bin/doas/doas.h b/usr.bin/doas/doas.h
-index b98fe353b18..6567625c471 100644
+index ce6a03618ac..363e2626c23 100644
 --- a/usr.bin/doas/doas.h
 +++ b/usr.bin/doas/doas.h
 @@ -29,13 +29,17 @@ extern struct rule **rules;
@@ -379,7 +379,7 @@ index b98fe353b18..6567625c471 100644
 +int setpersist(int fd);
 +int clearpersist(void);
 +
- #define PERMIT	1
+ #define PERMIT	-1
  #define DENY	2
  
 diff --git a/usr.bin/doas/env.c b/usr.bin/doas/env.c
@@ -577,5 +577,5 @@ index 00000000000..4ad1bf1efbf
 +	return 0;
 +}
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0016-pwcache-Don-t-use-fixed-buffer-sizes.patch b/pkg/openbsd/patch/0015-pwcache-Don-t-use-fixed-buffer-sizes.patch
index 3b7896ba..3b7896ba 100644
--- a/pkg/openbsd/patch/0016-pwcache-Don-t-use-fixed-buffer-sizes.patch
+++ b/pkg/openbsd/patch/0015-pwcache-Don-t-use-fixed-buffer-sizes.patch
diff --git a/pkg/openbsd/patch/0017-Add-standalone-freezero.patch b/pkg/openbsd/patch/0016-Add-standalone-freezero.patch
index 249a3e4d..249a3e4d 100644
--- a/pkg/openbsd/patch/0017-Add-standalone-freezero.patch
+++ b/pkg/openbsd/patch/0016-Add-standalone-freezero.patch
diff --git a/pkg/openbsd/patch/0018-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch b/pkg/openbsd/patch/0017-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
index f58f366f..f58f366f 100644
--- a/pkg/openbsd/patch/0018-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
+++ b/pkg/openbsd/patch/0017-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
diff --git a/pkg/openbsd/patch/0019-m4-Use-_Noreturn-instead-of-__dead.patch b/pkg/openbsd/patch/0018-m4-Use-_Noreturn-instead-of-__dead.patch
index c78d504e..b91a92c8 100644
--- a/pkg/openbsd/patch/0019-m4-Use-_Noreturn-instead-of-__dead.patch
+++ b/pkg/openbsd/patch/0018-m4-Use-_Noreturn-instead-of-__dead.patch
@@ -1,4 +1,4 @@
-From 0f0eb43f3d6fb749fac229e3d6c8f74b2c40ece2 Mon Sep 17 00:00:00 2001
+From eb6d8858f8dd92400efaa08680d28515270d4c35 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 10 Apr 2018 16:03:44 -0700
 Subject: [PATCH] m4: Use _Noreturn instead of __dead
@@ -8,10 +8,10 @@ Subject: [PATCH] m4: Use _Noreturn instead of __dead
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
-index ea8406b8540..0c07599777d 100644
+index c7defe46c2c..de03e51995e 100644
 --- a/usr.bin/m4/extern.h
 +++ b/usr.bin/m4/extern.h
-@@ -113,7 +113,7 @@ extern void	usage(void);
+@@ -112,7 +112,7 @@ extern void	usage(void);
  extern void	resizedivs(int);
  extern size_t	buffer_mark(void);
  extern void	dump_buffer(FILE *, size_t);
@@ -21,5 +21,5 @@ index ea8406b8540..0c07599777d 100644
  extern int	obtain_char(struct input_file *);
  extern void	set_input(struct input_file *, FILE *, const char *);
 -- 
-2.17.0
+2.49.0
 
diff --git a/pkg/openbsd/patch/0020-m4-Add-missing-includes.patch b/pkg/openbsd/patch/0019-m4-Add-missing-includes.patch
index d647009b..d647009b 100644
--- a/pkg/openbsd/patch/0020-m4-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0019-m4-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0021-libutil-Add-missing-includes.patch b/pkg/openbsd/patch/0020-libutil-Add-missing-includes.patch
index c441c199..c441c199 100644
--- a/pkg/openbsd/patch/0021-libutil-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0020-libutil-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0022-acme-client-Add-missing-includes.patch b/pkg/openbsd/patch/0021-acme-client-Add-missing-includes.patch
index 31f034c6..31f034c6 100644
--- a/pkg/openbsd/patch/0022-acme-client-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0021-acme-client-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0023-rsync-Add-missing-includes.patch b/pkg/openbsd/patch/0022-rsync-Add-missing-includes.patch
index a63a55b2..821cf10d 100644
--- a/pkg/openbsd/patch/0023-rsync-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0022-rsync-Add-missing-includes.patch
@@ -1,4 +1,4 @@
-From d423093f8dec64533733deb0762353f68b0adeb2 Mon Sep 17 00:00:00 2001
+From 9320adbea46f051b32c93a171dc0d52de8f845c3 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 14 Jun 2019 12:40:56 -0700
 Subject: [PATCH] rsync: Add missing includes
@@ -7,26 +7,25 @@ Subject: [PATCH] rsync: Add missing includes
 - stdint.h in extern.h for fixed-width integer types
 - sys/types.h in extern.h for various type definitions
 ---
- usr.bin/rsync/extern.h | 3 +++
+ usr.bin/rsync/extern.h | 2 ++
  usr.bin/rsync/socket.c | 1 +
- 2 files changed, 4 insertions(+)
+ 2 files changed, 3 insertions(+)
 
 diff --git a/usr.bin/rsync/extern.h b/usr.bin/rsync/extern.h
-index 2815f82cf89..a3f2a15b959 100644
+index 5bb23aaa486..55d7bc26ae2 100644
 --- a/usr.bin/rsync/extern.h
 +++ b/usr.bin/rsync/extern.h
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,8 @@
  #ifndef EXTERN_H
  #define EXTERN_H
  
 +#include <stdint.h>
 +#include <sys/types.h>
-+
+ #include <openssl/md4.h>
+ 
  /*
-  * This is the rsync protocol version that we support.
-  */
 diff --git a/usr.bin/rsync/socket.c b/usr.bin/rsync/socket.c
-index 953b229afbc..aa95cce9369 100644
+index d723d9e7df4..adc4a22cf40 100644
 --- a/usr.bin/rsync/socket.c
 +++ b/usr.bin/rsync/socket.c
 @@ -28,6 +28,7 @@
@@ -38,5 +37,5 @@ index 953b229afbc..aa95cce9369 100644
  #include <unistd.h>
  #include <err.h>
 -- 
-2.34.1
+2.49.0
 
diff --git a/pkg/openbsd/patch/0024-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch b/pkg/openbsd/patch/0023-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
index 31e7b7bd..29cecea4 100644
--- a/pkg/openbsd/patch/0024-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
+++ b/pkg/openbsd/patch/0023-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
@@ -1,4 +1,4 @@
-From d5670219baefe6769a42984abb93e19d8a43dada Mon Sep 17 00:00:00 2001
+From 6e087cd1f746eb636de0ec1769db6b4aac65e666 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 14 Jun 2019 12:42:15 -0700
 Subject: [PATCH] rsync: Use standard S_ISVTX instead of S_ISTXT
@@ -8,7 +8,7 @@ Subject: [PATCH] rsync: Use standard S_ISVTX instead of S_ISTXT
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/usr.bin/rsync/receiver.c b/usr.bin/rsync/receiver.c
-index 6e5b01670cd..67510b3e932 100644
+index 256a788b4f0..5dcc33b20fd 100644
 --- a/usr.bin/rsync/receiver.c
 +++ b/usr.bin/rsync/receiver.c
 @@ -87,7 +87,7 @@ rsync_set_metadata(struct sess *sess, int newfile,
@@ -20,7 +20,7 @@ index 6e5b01670cd..67510b3e932 100644
  	}
  
  	/* Conditionally adjust file permissions. */
-@@ -148,7 +148,7 @@ rsync_set_metadata_at(struct sess *sess, int newfile, int rootfd,
+@@ -149,7 +149,7 @@ rsync_set_metadata_at(struct sess *sess, int newfile, int rootfd,
  				    "to user.group: %u.%u", f->path, uid, gid);
  		} else
  			LOG4("%s: updated uid and/or gid", f->path);
@@ -30,5 +30,5 @@ index 6e5b01670cd..67510b3e932 100644
  
  	/* Conditionally adjust file permissions. */
 -- 
-2.34.1
+2.49.0
 
diff --git a/pkg/openbsd/patch/0025-rsync-Avoid-pointer-arithmetic-on-void.patch b/pkg/openbsd/patch/0024-rsync-Avoid-pointer-arithmetic-on-void.patch
index 7d89e416..d925f7ed 100644
--- a/pkg/openbsd/patch/0025-rsync-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/openbsd/patch/0024-rsync-Avoid-pointer-arithmetic-on-void.patch
@@ -1,4 +1,4 @@
-From b93dee95670eccc6a5c34f1f8a3b828998d0da7b Mon Sep 17 00:00:00 2001
+From 3823d88a12d7c95de2d4b68796b5faa7f550caed Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 15 Jun 2019 20:06:13 -0700
 Subject: [PATCH] rsync: Avoid pointer arithmetic on `void *`
@@ -11,10 +11,10 @@ Subject: [PATCH] rsync: Avoid pointer arithmetic on `void *`
  4 files changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/usr.bin/rsync/blocks.c b/usr.bin/rsync/blocks.c
-index 56790729f27..906733c968e 100644
+index d1d9b19c31e..8f4bcb532e1 100644
 --- a/usr.bin/rsync/blocks.c
 +++ b/usr.bin/rsync/blocks.c
-@@ -157,7 +157,7 @@ blk_find(struct sess *sess, struct blkstat *st,
+@@ -163,7 +163,7 @@ blk_find(struct sess *sess, struct blkstat *st,
  	if (!recomp) {
  		fhash = (st->s1 & 0xFFFF) | (st->s2 << 16);
  	} else {
@@ -23,7 +23,7 @@ index 56790729f27..906733c968e 100644
  		st->s1 = fhash & 0xFFFF;
  		st->s2 = fhash >> 16;
  	}
-@@ -170,7 +170,7 @@ blk_find(struct sess *sess, struct blkstat *st,
+@@ -176,7 +176,7 @@ blk_find(struct sess *sess, struct blkstat *st,
  	if (st->hint < blks->blksz &&
  	    fhash == blks->blks[st->hint].chksum_short &&
  	    (size_t)osz == blks->blks[st->hint].len) {
@@ -32,7 +32,7 @@ index 56790729f27..906733c968e 100644
  		have_md = 1;
  		if (memcmp(md, blks->blks[st->hint].chksum_long, blks->csum) == 0) {
  			LOG4("%s: found matching hinted match: "
-@@ -203,7 +203,7 @@ blk_find(struct sess *sess, struct blkstat *st,
+@@ -209,7 +209,7 @@ blk_find(struct sess *sess, struct blkstat *st,
  		    (intmax_t)ent->blk->offs, ent->blk->len);
  
  		if (have_md == 0) {
@@ -41,7 +41,7 @@ index 56790729f27..906733c968e 100644
  			have_md = 1;
  		}
  
-@@ -221,7 +221,7 @@ blk_find(struct sess *sess, struct blkstat *st,
+@@ -227,7 +227,7 @@ blk_find(struct sess *sess, struct blkstat *st,
  	 * block in the sequence.
  	 */
  
@@ -122,7 +122,7 @@ index dc224ae8aed..fcf9e92dbaa 100644
  }
  
 diff --git a/usr.bin/rsync/sender.c b/usr.bin/rsync/sender.c
-index e2999aa2589..9dd008def01 100644
+index c54fbc2dae0..6469e7f27e5 100644
 --- a/usr.bin/rsync/sender.c
 +++ b/usr.bin/rsync/sender.c
 @@ -128,7 +128,7 @@ send_up_fsm(struct sess *sess, size_t *phase,
@@ -134,7 +134,7 @@ index e2999aa2589..9dd008def01 100644
  
  		up->stat.curpos += sz;
  		if (up->stat.curpos == up->stat.curlen)
-@@ -557,7 +557,8 @@ rsync_sender(struct sess *sess, int fdin,
+@@ -561,7 +561,8 @@ rsync_sender(struct sess *sess, int fdin,
  		if ((pfd[1].revents & POLLOUT) && wbufsz > 0) {
  			assert(pfd[2].fd == -1);
  			assert(wbufsz - wbufpos);
@@ -145,5 +145,5 @@ index e2999aa2589..9dd008def01 100644
  				ERR("write");
  				goto out;
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0026-Include-sys-sysmacros.h-if-necessary.patch b/pkg/openbsd/patch/0025-Include-sys-sysmacros.h-if-necessary.patch
index 306b7886..859aff69 100644
--- a/pkg/openbsd/patch/0026-Include-sys-sysmacros.h-if-necessary.patch
+++ b/pkg/openbsd/patch/0025-Include-sys-sysmacros.h-if-necessary.patch
@@ -1,4 +1,4 @@
-From 0d3a091280d0874fb561c83431803eb2489876cb Mon Sep 17 00:00:00 2001
+From bf938d0fd70582d8d7942c2f04c2d4209b9b8633 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 5 Aug 2019 21:42:54 -0700
 Subject: [PATCH] Include sys/sysmacros.h if necessary
@@ -11,7 +11,7 @@ Subject: [PATCH] Include sys/sysmacros.h if necessary
  4 files changed, 14 insertions(+)
 
 diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
-index 92fe965163a..3832b1e87aa 100644
+index be0316d8dd9..fbcf032e091 100644
 --- a/bin/pax/cpio.c
 +++ b/bin/pax/cpio.c
 @@ -41,6 +41,10 @@
@@ -26,7 +26,7 @@ index 92fe965163a..3832b1e87aa 100644
  #include "cpio.h"
  #include "extern.h"
 diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
-index 42c70804fb7..405dd2c24ed 100644
+index fcda4d37391..928cfcd3657 100644
 --- a/bin/pax/gen_subs.c
 +++ b/bin/pax/gen_subs.c
 @@ -45,6 +45,9 @@
@@ -40,10 +40,10 @@ index 42c70804fb7..405dd2c24ed 100644
  #include "pax.h"
  #include "extern.h"
 diff --git a/bin/pax/tar.c b/bin/pax/tar.c
-index 9d8a92d9d13..e84a9c69a09 100644
+index ef22a9fd2d8..a0cbb31b547 100644
 --- a/bin/pax/tar.c
 +++ b/bin/pax/tar.c
-@@ -45,6 +45,9 @@
+@@ -47,6 +47,9 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
@@ -54,7 +54,7 @@ index 9d8a92d9d13..e84a9c69a09 100644
  #include "pax.h"
  #include "extern.h"
 diff --git a/usr.bin/rsync/flist.c b/usr.bin/rsync/flist.c
-index 392ba494423..5f15487623a 100644
+index cdc9f1da1dd..8832420cce0 100644
 --- a/usr.bin/rsync/flist.c
 +++ b/usr.bin/rsync/flist.c
 @@ -16,6 +16,10 @@
@@ -69,5 +69,5 @@ index 392ba494423..5f15487623a 100644
  #include <assert.h>
  #include <errno.h>
 -- 
-2.34.1
+2.49.0
 
diff --git a/pkg/openbsd/patch/0027-nc-Portability-fixes-from-libressl-portable.patch b/pkg/openbsd/patch/0026-nc-Portability-fixes-from-libressl-portable.patch
index 64bf02ed..d2be492e 100644
--- a/pkg/openbsd/patch/0027-nc-Portability-fixes-from-libressl-portable.patch
+++ b/pkg/openbsd/patch/0026-nc-Portability-fixes-from-libressl-portable.patch
@@ -1,4 +1,4 @@
-From 6c278af8cc6a9fcb94b9bbe572b0bd3f7dd492c1 Mon Sep 17 00:00:00 2001
+From 05fd24cc7b3f1b73a58d41d70ef725925007165c 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 c8f1cdd9f75..7369ed85619 100644
+index 8c60fd18826..b5129c2204d 100644
 --- a/usr.bin/nc/netcat.c
 +++ b/usr.bin/nc/netcat.c
 @@ -93,9 +93,13 @@ int	zflag;					/* Port Scan Flag */
@@ -64,7 +64,7 @@ index c8f1cdd9f75..7369ed85619 100644
  
  	/* Cruft to make sure options are clean, and used properly. */
  	if (argc == 1 && family == AF_UNIX) {
-@@ -927,7 +937,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
+@@ -923,7 +933,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
      char *ipaddr)
  {
  	struct addrinfo *res, *res0;
@@ -76,7 +76,7 @@ index c8f1cdd9f75..7369ed85619 100644
  
  	if ((error = getaddrinfo(host, port, &hints, &res0)))
  		errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
-@@ -942,8 +955,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
+@@ -938,8 +951,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints,
  		if (sflag || pflag) {
  			struct addrinfo ahints, *ares;
  
@@ -87,7 +87,7 @@ index c8f1cdd9f75..7369ed85619 100644
  			memset(&ahints, 0, sizeof(struct addrinfo));
  			ahints.ai_family = res->ai_family;
  			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1035,8 +1050,11 @@ int
+@@ -1031,8 +1046,11 @@ int
  local_listen(const char *host, const char *port, struct addrinfo hints)
  {
  	struct addrinfo *res, *res0;
@@ -100,7 +100,7 @@ index c8f1cdd9f75..7369ed85619 100644
  
  	/* Allow nodename to be null. */
  	hints.ai_flags |= AI_PASSIVE;
-@@ -1056,9 +1074,11 @@ local_listen(const char *host, const char *port, struct addrinfo hints)
+@@ -1052,9 +1070,11 @@ local_listen(const char *host, const char *port, struct addrinfo hints)
  		    res->ai_protocol)) == -1)
  			continue;
  
@@ -112,7 +112,7 @@ index c8f1cdd9f75..7369ed85619 100644
  
  		set_common_sockopts(s, res->ai_family);
  
-@@ -1557,11 +1577,13 @@ set_common_sockopts(int s, int af)
+@@ -1559,11 +1579,13 @@ set_common_sockopts(int s, int af)
  {
  	int x = 1;
  
@@ -126,7 +126,7 @@ index c8f1cdd9f75..7369ed85619 100644
  	if (Dflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
  		    &x, sizeof(x)) == -1)
-@@ -1572,9 +1594,16 @@ set_common_sockopts(int s, int af)
+@@ -1574,9 +1596,16 @@ set_common_sockopts(int s, int af)
  		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
  			err(1, "set IP ToS");
  
@@ -143,7 +143,7 @@ index c8f1cdd9f75..7369ed85619 100644
  	}
  	if (Iflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1598,13 +1627,17 @@ set_common_sockopts(int s, int af)
+@@ -1600,13 +1629,17 @@ set_common_sockopts(int s, int af)
  	}
  
  	if (minttl != -1) {
@@ -162,7 +162,7 @@ index c8f1cdd9f75..7369ed85619 100644
  	}
  }
  
-@@ -1829,14 +1862,22 @@ help(void)
+@@ -1831,14 +1864,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\
@@ -190,5 +190,5 @@ index c8f1cdd9f75..7369ed85619 100644
  	\t-W recvlimit	Terminate after receiving a number of packets\n\
  	\t-w timeout	Timeout for connects and final net reads\n\
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0028-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch b/pkg/openbsd/patch/0027-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
index 2b0a5f22..bdebbccb 100644
--- a/pkg/openbsd/patch/0028-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
+++ b/pkg/openbsd/patch/0027-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
@@ -1,4 +1,4 @@
-From 0f49ae38698a163f7954d28bbaba473b6bf28239 Mon Sep 17 00:00:00 2001
+From 38b0c680777d5eb9cc69cd8fbc38fe3dc5a0927a 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 8aa3d249923..2c0994feca6 100644
+index ae0caf29f6c..429705976dc 100644
 --- a/bin/pax/file_subs.c
 +++ b/bin/pax/file_subs.c
-@@ -795,7 +795,7 @@ void
+@@ -800,7 +800,7 @@ void
  set_pmode(char *fnm, mode_t mode)
  {
  	mode &= ABITS;
@@ -22,5 +22,5 @@ index 8aa3d249923..2c0994feca6 100644
  }
  
 -- 
-2.26.2
+2.49.0
 
diff --git a/pkg/openbsd/patch/0029-acme-client-Fix-build-with-old-bison-versions.patch b/pkg/openbsd/patch/0028-acme-client-Fix-build-with-old-bison-versions.patch
index 50639203..50639203 100644
--- a/pkg/openbsd/patch/0029-acme-client-Fix-build-with-old-bison-versions.patch
+++ b/pkg/openbsd/patch/0028-acme-client-Fix-build-with-old-bison-versions.patch
diff --git a/pkg/openbsd/patch/0030-rsync-Add-implementation-of-MD4.patch b/pkg/openbsd/patch/0029-rsync-Add-implementation-of-MD4.patch
index b94579e5..ec4150b0 100644
--- a/pkg/openbsd/patch/0030-rsync-Add-implementation-of-MD4.patch
+++ b/pkg/openbsd/patch/0029-rsync-Add-implementation-of-MD4.patch
@@ -1,4 +1,4 @@
-From 01657f2c1445cf4874337a0966a76f24ba9c9536 Mon Sep 17 00:00:00 2001
+From f6b4408dd3b8ddfa1dca692e1c52643d857d8102 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Wed, 15 Apr 2020 22:10:06 -0700
 Subject: [PATCH] rsync: Add implementation of MD4
@@ -7,11 +7,12 @@ Subject: [PATCH] rsync: Add implementation of MD4
  usr.bin/rsync/Makefile     |   2 +-
  usr.bin/rsync/blocks.c     |   2 +-
  usr.bin/rsync/downloader.c |   2 +-
+ usr.bin/rsync/extern.h     |   3 +-
  usr.bin/rsync/hash.c       |   2 +-
  usr.bin/rsync/md4.c        | 266 +++++++++++++++++++++++++++++++++++++
  usr.bin/rsync/md4.h        |  47 +++++++
  usr.bin/rsync/sender.c     |   2 +-
- 7 files changed, 318 insertions(+), 5 deletions(-)
+ 8 files changed, 320 insertions(+), 6 deletions(-)
  create mode 100644 usr.bin/rsync/md4.c
  create mode 100644 usr.bin/rsync/md4.h
 
@@ -29,7 +30,7 @@ index 3c60f18e07f..172045ce7ac 100644
  LDADD+= -lcrypto -lm -lutil
  DPADD+= ${LIBCRYPTO} ${LIBM} ${LIBUTIL}
 diff --git a/usr.bin/rsync/blocks.c b/usr.bin/rsync/blocks.c
-index 906733c968e..0a8c3f485d1 100644
+index 8f4bcb532e1..f21c9178487 100644
 --- a/usr.bin/rsync/blocks.c
 +++ b/usr.bin/rsync/blocks.c
 @@ -26,7 +26,7 @@
@@ -54,8 +55,22 @@ index 07ec334f6b4..6543851fd2c 100644
  
  #include "extern.h"
  
+diff --git a/usr.bin/rsync/extern.h b/usr.bin/rsync/extern.h
+index 55d7bc26ae2..d6b02fd4ad4 100644
+--- a/usr.bin/rsync/extern.h
++++ b/usr.bin/rsync/extern.h
+@@ -19,7 +19,8 @@
+ 
+ #include <stdint.h>
+ #include <sys/types.h>
+-#include <openssl/md4.h>
++
++#include "md4.h"
+ 
+ /*
+  * This is the rsync protocol version that we support.
 diff --git a/usr.bin/rsync/hash.c b/usr.bin/rsync/hash.c
-index b87c56f527c..44ae0d26282 100644
+index 37529e951b4..e3f52047404 100644
 --- a/usr.bin/rsync/hash.c
 +++ b/usr.bin/rsync/hash.c
 @@ -21,7 +21,7 @@
@@ -393,7 +408,7 @@ index 00000000000..ebf5bb555a0
 +
 +#endif
 diff --git a/usr.bin/rsync/sender.c b/usr.bin/rsync/sender.c
-index 9dd008def01..2aeb99b64a0 100644
+index 6469e7f27e5..81b25b9ee78 100644
 --- a/usr.bin/rsync/sender.c
 +++ b/usr.bin/rsync/sender.c
 @@ -26,7 +26,7 @@
@@ -406,5 +421,5 @@ index 9dd008def01..2aeb99b64a0 100644
  #include "extern.h"
  
 -- 
-2.35.1
+2.49.0
 
diff --git a/pkg/openbsd/patch/0031-pax-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0030-pax-Fix-some-incorrect-format-specifiers.patch
index 05dd7d3a..05dd3957 100644
--- a/pkg/openbsd/patch/0031-pax-Fix-some-incorrect-format-specifiers.patch
+++ b/pkg/openbsd/patch/0030-pax-Fix-some-incorrect-format-specifiers.patch
@@ -1,4 +1,4 @@
-From f855b534ca2c34c3691a0c89d1be482a33a3610c Mon Sep 17 00:00:00 2001
+From e62d415fb66744cac915dc1873e09774a705d536 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 4 Jun 2020 21:36:11 -0700
 Subject: [PATCH] pax: Fix some incorrect format specifiers
@@ -9,7 +9,7 @@ Subject: [PATCH] pax: Fix some incorrect format specifiers
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
-index 3832b1e87aa..769a9dfb990 100644
+index fbcf032e091..1242ad0d8a7 100644
 --- a/bin/pax/cpio.c
 +++ b/bin/pax/cpio.c
 @@ -214,7 +214,7 @@ rd_ln_nm(ARCHD *arcn)
@@ -22,19 +22,19 @@ index 3832b1e87aa..769a9dfb990 100644
  		return(-1);
  	}
 diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
-index 405dd2c24ed..7eb82007e3b 100644
+index 928cfcd3657..897a688327e 100644
 --- a/bin/pax/gen_subs.c
 +++ b/bin/pax/gen_subs.c
-@@ -109,7 +109,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
- 	if (strftime(f_date, sizeof(f_date), TIMEFMT(sbp->st_mtime, now),
- 	    localtime(&(sbp->st_mtime))) == 0)
+@@ -112,7 +112,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
+ 	else if (strftime(f_date, sizeof(f_date), TIMEFMT(sbp->st_mtime, now),
+ 	    tm) == 0)
  		f_date[0] = '\0';
 -	(void)fprintf(fp, "%s%2u %-*.*s %-*.*s ", f_mode, sbp->st_nlink,
 +	(void)fprintf(fp, "%s%2u %-*.*s %-*.*s ", f_mode, (unsigned)sbp->st_nlink,
  		NAME_WIDTH, UT_NAMESIZE, user_from_uid(sbp->st_uid, 0),
  		NAME_WIDTH, UT_NAMESIZE, group_from_gid(sbp->st_gid, 0));
  
-@@ -121,7 +121,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
+@@ -124,7 +124,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
  		    (unsigned long)MAJOR(sbp->st_rdev),
  		    (unsigned long)MINOR(sbp->st_rdev));
  	else {
@@ -44,5 +44,5 @@ index 405dd2c24ed..7eb82007e3b 100644
  
  	/*
 -- 
-2.27.0
+2.49.0
 
diff --git a/pkg/openbsd/patch/0031-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch b/pkg/openbsd/patch/0031-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
new file mode 100644
index 00000000..380da6fb
--- /dev/null
+++ b/pkg/openbsd/patch/0031-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
@@ -0,0 +1,38 @@
+From dc49fca08adc0fd8cd9565f2aeca6dc2c8d1fbd2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Jun 2020 21:44:26 -0700
+Subject: [PATCH] pax: Use memcpy to set TMAGIC and TVERSION to avoid warning
+
+---
+ bin/pax/tar.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/pax/tar.c b/bin/pax/tar.c
+index a0cbb31b547..095eef85af0 100644
+--- a/bin/pax/tar.c
++++ b/bin/pax/tar.c
+@@ -1055,8 +1055,8 @@ wr_xheader(ARCHD *arcn, struct xheader *xhdr)
+ 	memset(hdblk, 0, sizeof(hdblk));
+ 	hd = (HD_USTAR *)hdblk;
+ 	hd->typeflag = XHDRTYPE;
+-	strncpy(hd->magic, TMAGIC, TMAGLEN);
+-	strncpy(hd->version, TVERSION, TVERSLEN);
++	memcpy(hd->magic, TMAGIC, TMAGLEN);
++	memcpy(hd->version, TVERSION, TVERSLEN);
+ 	if (ul_oct(size, hd->size, sizeof(hd->size), 3))
+ 		return -1;
+ 
+@@ -1263,8 +1263,8 @@ wr_ustar_or_pax(ARCHD *arcn, int ustar)
+ 		break;
+ 	}
+ 
+-	strncpy(hd->magic, TMAGIC, TMAGLEN);
+-	strncpy(hd->version, TVERSION, TVERSLEN);
++	memcpy(hd->magic, TMAGIC, TMAGLEN);
++	memcpy(hd->version, TVERSION, TVERSLEN);
+ 
+ 	/*
+ 	 * set the remaining fields. Some versions want all 16 bits of mode
+-- 
+2.49.0
+
diff --git a/pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch b/pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
deleted file mode 100644
index d343fd8d..00000000
--- a/pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e5c8e801a42459bf0c416f6751b687d61f46fcf1 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 4 Jun 2020 21:44:26 -0700
-Subject: [PATCH] pax: Use memcpy to set TMAGIC and TVERSION to avoid warning
-
----
- bin/pax/tar.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/pax/tar.c b/bin/pax/tar.c
-index 8d6b3f37012..1f4012123c3 100644
---- a/bin/pax/tar.c
-+++ b/bin/pax/tar.c
-@@ -1040,8 +1040,8 @@ ustar_wr(ARCHD *arcn)
- 		break;
- 	}
- 
--	strncpy(hd->magic, TMAGIC, TMAGLEN);
--	strncpy(hd->version, TVERSION, TVERSLEN);
-+	memcpy(hd->magic, TMAGIC, TMAGLEN);
-+	memcpy(hd->version, TVERSION, TVERSLEN);
- 
- 	/*
- 	 * set the remaining fields. Some versions want all 16 bits of mode
--- 
-2.35.1
-
diff --git a/pkg/openbsd/patch/0033-rsync-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0032-rsync-Fix-some-incorrect-format-specifiers.patch
index 44763f22..cb04f3fc 100644
--- a/pkg/openbsd/patch/0033-rsync-Fix-some-incorrect-format-specifiers.patch
+++ b/pkg/openbsd/patch/0032-rsync-Fix-some-incorrect-format-specifiers.patch
@@ -1,4 +1,4 @@
-From 0a32d4f555441c1928547f8f08a6373a6c9d8bf1 Mon Sep 17 00:00:00 2001
+From e2bc701601abc23299d9a694cb3173bdb44fff83 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 4 Jun 2020 21:36:24 -0700
 Subject: [PATCH] rsync: Fix some incorrect format specifiers
@@ -9,10 +9,10 @@ Subject: [PATCH] rsync: Fix some incorrect format specifiers
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/usr.bin/rsync/fargs.c b/usr.bin/rsync/fargs.c
-index 7ccb5bff7d2..ef1aaf37c87 100644
+index cbc8537f38c..0b1c255550d 100644
 --- a/usr.bin/rsync/fargs.c
 +++ b/usr.bin/rsync/fargs.c
-@@ -132,9 +132,9 @@ fargs_cmdline(struct sess *sess, const struct fargs *f, size_t *skip)
+@@ -134,9 +134,9 @@ fargs_cmdline(struct sess *sess, const struct fargs *f, size_t *skip)
  		/* --devices is sent as -D --no-specials */
  		addargs(&args, "--no-specials");
  	if (sess->opts->max_size >= 0)
@@ -22,13 +22,13 @@ index 7ccb5bff7d2..ef1aaf37c87 100644
 -		addargs(&args, "--min-size=%lld", sess->opts->min_size);
 +		addargs(&args, "--min-size=%jd", (intmax_t)sess->opts->min_size);
  
- 	/* only add --compare-dest, etc if this is the sender */
- 	if (sess->opts->alt_base_mode != 0 &&
+ 	/* extra options for the receiver (local is sender) */
+ 	if (f->mode == FARGS_SENDER) {
 diff --git a/usr.bin/rsync/uploader.c b/usr.bin/rsync/uploader.c
-index 678b6c96218..951a5ee4133 100644
+index 6cb6d054da7..09fedfaadbc 100644
 --- a/usr.bin/rsync/uploader.c
 +++ b/usr.bin/rsync/uploader.c
-@@ -1010,7 +1010,7 @@ rsync_uploader(struct upload *u, int *fileinfd,
+@@ -1020,7 +1020,7 @@ rsync_uploader(struct upload *u, int *fileinfd,
  			init_blk(&blk.blks[i], &blk, offs, i, mbuf, sess);
  			offs += blk.len;
  			LOG3(
@@ -38,5 +38,5 @@ index 678b6c96218..951a5ee4133 100644
  			i++;
  		} while (i < blk.blksz);
 -- 
-2.35.1
+2.49.0
 
diff --git a/pkg/openbsd/patch/0034-m4-Declare-dopaste-only-when-it-s-used.patch b/pkg/openbsd/patch/0033-m4-Declare-dopaste-only-when-it-s-used.patch
index 3d3ccfd2..3d3ccfd2 100644
--- a/pkg/openbsd/patch/0034-m4-Declare-dopaste-only-when-it-s-used.patch
+++ b/pkg/openbsd/patch/0033-m4-Declare-dopaste-only-when-it-s-used.patch
diff --git a/pkg/openbsd/patch/0035-acme-client-Fix-signed-ness-of-base64buf_url-input.patch b/pkg/openbsd/patch/0034-acme-client-Fix-signed-ness-of-base64buf_url-input.patch
index 8b20dba2..dfc1364e 100644
--- a/pkg/openbsd/patch/0035-acme-client-Fix-signed-ness-of-base64buf_url-input.patch
+++ b/pkg/openbsd/patch/0034-acme-client-Fix-signed-ness-of-base64buf_url-input.patch
@@ -1,4 +1,4 @@
-From cc94758cade79724cc820e654ae12bee639c2692 Mon Sep 17 00:00:00 2001
+From 67ffb8812ee7ac5fe23a5149ff643d1f392fb1f5 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 23 Apr 2021 20:10:05 -0700
 Subject: [PATCH] acme-client: Fix signed-ness of base64buf_url input
@@ -13,10 +13,10 @@ This make most of the pointer casts unnecessary.
  5 files changed, 18 insertions(+), 14 deletions(-)
 
 diff --git a/usr.sbin/acme-client/acctproc.c b/usr.sbin/acme-client/acctproc.c
-index e3a0eb64dec..23d8a1c3a33 100644
+index da3d49107ae..9e97a8bb760 100644
 --- a/usr.sbin/acme-client/acctproc.c
 +++ b/usr.sbin/acme-client/acctproc.c
-@@ -43,8 +43,9 @@
+@@ -42,8 +42,9 @@
  static char *
  bn2string(const BIGNUM *bn)
  {
@@ -28,7 +28,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  
  	/* Extract big-endian representation of BIGNUM. */
  
-@@ -52,7 +53,7 @@ bn2string(const BIGNUM *bn)
+@@ -51,7 +52,7 @@ bn2string(const BIGNUM *bn)
  	if ((buf = malloc(len)) == NULL) {
  		warn("malloc");
  		return NULL;
@@ -37,7 +37,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  		warnx("BN_bn2bin");
  		free(buf);
  		return NULL;
-@@ -168,7 +169,7 @@ op_thumbprint(int fd, EVP_PKEY *pkey)
+@@ -167,7 +168,7 @@ op_thumbprint(int fd, EVP_PKEY *pkey)
  		warnx("EVP_Digest");
  		goto out;
  	}
@@ -46,7 +46,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  		warnx("base64buf_url");
  		goto out;
  	}
-@@ -282,7 +283,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -281,7 +282,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	/* Base64-encode the payload. */
  
@@ -55,7 +55,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  		warnx("base64buf_url");
  		goto out;
  	}
-@@ -325,7 +326,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -324,7 +325,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	/* The header combined with the nonce, base64. */
  
@@ -64,7 +64,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  		warnx("base64buf_url");
  		goto out;
  	}
-@@ -364,7 +365,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -363,7 +364,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	switch (EVP_PKEY_base_id(pkey)) {
  	case EVP_PKEY_RSA:
@@ -73,7 +73,7 @@ index e3a0eb64dec..23d8a1c3a33 100644
  			warnx("base64buf_url");
  			goto out;
  		}
-@@ -403,7 +404,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -402,7 +403,7 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  			goto out;
  		}
  
@@ -96,12 +96,12 @@ index 2b6377f0d81..0d84ad4b458 100644
  	size_t	 i, sz;
  	char	*buf;
 diff --git a/usr.sbin/acme-client/extern.h b/usr.sbin/acme-client/extern.h
-index 32d4b4b3d85..701733df786 100644
+index 915f80e3992..5b0950b0693 100644
 --- a/usr.sbin/acme-client/extern.h
 +++ b/usr.sbin/acme-client/extern.h
-@@ -245,7 +245,7 @@ int		 checkexit_ext(int *, pid_t, enum comp);
+@@ -244,7 +244,7 @@ int		 checkexit_ext(int *, pid_t, enum comp);
+  * Returns a buffer or NULL on allocation error.
   */
- size_t		 base64buf(char *, const char *, size_t);
  size_t		 base64len(size_t);
 -char		*base64buf_url(const char *, size_t);
 +char		*base64buf_url(const unsigned char *, size_t);
@@ -156,5 +156,5 @@ index 0f1bf32678b..58e81233f1a 100644
  			goto out;
  		} else if ((der64 = base64buf_url(der, len)) == NULL) {
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0036-acme-client-Port-to-BearSSL.patch b/pkg/openbsd/patch/0035-acme-client-Port-to-BearSSL.patch
index 81081fdb..dbf9a60a 100644
--- a/pkg/openbsd/patch/0036-acme-client-Port-to-BearSSL.patch
+++ b/pkg/openbsd/patch/0035-acme-client-Port-to-BearSSL.patch
@@ -1,22 +1,22 @@
-From f34464dc0940837a48e071392a84455df2138c0b Mon Sep 17 00:00:00 2001
+From 1ab0f94943e02c49d88a358351914f9032a5bca3 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 23 Apr 2021 23:14:16 -0700
 Subject: [PATCH] acme-client: Port to BearSSL
 
 ---
- usr.sbin/acme-client/acctproc.c   | 299 +++++++++------------------
+ usr.sbin/acme-client/acctproc.c   | 298 +++++++++------------------
  usr.sbin/acme-client/certproc.c   |   5 -
- usr.sbin/acme-client/key.c        | 333 ++++++++++++++++++++++++------
+ usr.sbin/acme-client/key.c        | 329 ++++++++++++++++++++++++------
  usr.sbin/acme-client/key.h        |  22 +-
  usr.sbin/acme-client/keyproc.c    | 198 ++++++------------
  usr.sbin/acme-client/revokeproc.c | 237 ++++++++++-----------
- 6 files changed, 560 insertions(+), 534 deletions(-)
+ 6 files changed, 564 insertions(+), 525 deletions(-)
 
 diff --git a/usr.sbin/acme-client/acctproc.c b/usr.sbin/acme-client/acctproc.c
-index 23d8a1c3a33..3d3e32c1a57 100644
+index 9e97a8bb760..8d66dac49d9 100644
 --- a/usr.sbin/acme-client/acctproc.c
 +++ b/usr.sbin/acme-client/acctproc.c
-@@ -19,74 +19,29 @@
+@@ -19,73 +19,29 @@
  
  #include <err.h>
  #include <errno.h>
@@ -28,7 +28,6 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  
 -#include <openssl/bn.h>
 -#include <openssl/ec.h>
--#include <openssl/ecdsa.h>
 -#include <openssl/evp.h>
 -#include <openssl/rsa.h>
 -#include <openssl/err.h>
@@ -98,7 +97,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	else if ((json = json_fmt_thumb_rsa(exp, mod)) == NULL)
  		warnx("json_fmt_thumb_rsa");
  
-@@ -100,31 +55,23 @@ op_thumb_rsa(EVP_PKEY *pkey)
+@@ -99,31 +55,23 @@ op_thumb_rsa(EVP_PKEY *pkey)
   * thumbprint from them.
   */
  static char *
@@ -140,7 +139,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	free(x);
  	free(y);
  	return json;
-@@ -134,26 +81,26 @@ op_thumb_ec(EVP_PKEY *pkey)
+@@ -133,26 +81,26 @@ op_thumb_ec(EVP_PKEY *pkey)
   * The thumbprint operation is used for the challenge sequence.
   */
  static int
@@ -176,7 +175,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  		goto out;
  	}
  
-@@ -164,12 +111,10 @@ op_thumbprint(int fd, EVP_PKEY *pkey)
+@@ -163,12 +111,10 @@ op_thumbprint(int fd, EVP_PKEY *pkey)
  	 * it up in the read loop).
  	 */
  
@@ -193,7 +192,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  		warnx("base64buf_url");
  		goto out;
  	}
-@@ -184,11 +129,10 @@ out:
+@@ -183,11 +129,10 @@ out:
  }
  
  static int
@@ -206,7 +205,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  
  	*prot = NULL;
  
-@@ -197,12 +141,10 @@ op_sign_rsa(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
+@@ -196,12 +141,10 @@ op_sign_rsa(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
  	 * Finally, format the header combined with the nonce.
  	 */
  
@@ -223,7 +222,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	else if ((*prot = json_fmt_protected_rsa(exp, mod, nonce, url)) == NULL)
  		warnx("json_fmt_protected_rsa");
  	else
-@@ -214,35 +156,27 @@ op_sign_rsa(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
+@@ -213,35 +156,27 @@ op_sign_rsa(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
  }
  
  static int
@@ -269,7 +268,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	free(x);
  	free(y);
  	return rc;
-@@ -253,20 +187,18 @@ op_sign_ec(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
+@@ -252,20 +187,18 @@ op_sign_ec(char **prot, EVP_PKEY *pkey, const char *nonce, const char *url)
   * This requires the sender ("fd") to provide the payload and a nonce.
   */
  static int
@@ -298,7 +297,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  
  	/* Read our payload and nonce from the requestor. */
  
-@@ -283,19 +215,22 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -282,19 +215,22 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	/* Base64-encode the payload. */
  
@@ -327,7 +326,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  		break;
  	default:
  		warnx("unknown account key type");
-@@ -309,17 +244,17 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -308,17 +244,17 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  			goto out;
  		}
  	} else {
@@ -351,7 +350,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  			goto out;
  		}
  	}
-@@ -342,76 +277,34 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -341,76 +277,34 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	/* Sign the message. */
  
@@ -445,7 +444,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  		goto out;
  	}
  
-@@ -421,7 +314,11 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -420,7 +314,11 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  	 * when we next enter the read loop).
  	 */
  
@@ -458,7 +457,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  		warnx("json_fmt_signed");
  		goto out;
  	} else if (writestr(fd, COMM_REQ, fin) < 0)
-@@ -429,8 +326,6 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
+@@ -428,8 +326,6 @@ op_sign(int fd, EVP_PKEY *pkey, enum acctop op)
  
  	rc = 1;
  out:
@@ -467,7 +466,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	free(pay);
  	free(sign);
  	free(pay64);
-@@ -439,10 +334,9 @@ out:
+@@ -438,10 +334,9 @@ out:
  	free(kid);
  	free(prot);
  	free(prot64);
@@ -480,7 +479,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	return rc;
  }
  
-@@ -450,7 +344,7 @@ int
+@@ -449,7 +344,7 @@ int
  acctproc(int netsock, const char *acctkey, enum keytype keytype)
  {
  	FILE		*f = NULL;
@@ -489,7 +488,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	long		 lval;
  	enum acctop	 op;
  	int		 rc = 0, cc, newacct = 0;
-@@ -476,8 +370,6 @@ acctproc(int netsock, const char *acctkey, enum keytype keytype)
+@@ -475,8 +370,6 @@ acctproc(int netsock, const char *acctkey, enum keytype keytype)
  
  	/* File-system, user, and sandbox jailing. */
  
@@ -498,7 +497,7 @@ index 23d8a1c3a33..3d3e32c1a57 100644
  	if (pledge("stdio", NULL) == -1) {
  		warn("pledge");
  		goto out;
-@@ -555,8 +447,7 @@ out:
+@@ -554,8 +447,7 @@ out:
  	close(netsock);
  	if (f != NULL)
  		fclose(f);
@@ -526,10 +525,10 @@ index f443d573675..85c3897a4b8 100644
  
  #define BEGIN_MARKER "-----BEGIN CERTIFICATE-----"
 diff --git a/usr.sbin/acme-client/key.c b/usr.sbin/acme-client/key.c
-index a6fc437f863..c0e54b15742 100644
+index 9ece3059d4e..9599a7fdbd5 100644
 --- a/usr.sbin/acme-client/key.c
 +++ b/usr.sbin/acme-client/key.c
-@@ -17,15 +17,11 @@
+@@ -17,14 +17,11 @@
   */
  
  #include <err.h>
@@ -540,14 +539,13 @@ index a6fc437f863..c0e54b15742 100644
 -#include <openssl/evp.h>
 -#include <openssl/pem.h>
 -#include <openssl/rsa.h>
--#include <openssl/ecdsa.h>
 -#include <openssl/ec.h>
 -#include <openssl/obj_mac.h>
 +#include <bearssl.h>
  
  #include "key.h"
  
-@@ -34,111 +30,318 @@
+@@ -33,102 +30,320 @@
   */
  #define	KBITS 4096
  
@@ -587,22 +585,20 @@ index a6fc437f863..c0e54b15742 100644
 +	unsigned char	*der = NULL, *pem = NULL;
 +	size_t		 derlen, pemlen;
  
--	/* First, create the context and the key. */
-+	/* First, allocate and generate the key. */
- 
 -	if ((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL)) == NULL) {
 -		warnx("EVP_PKEY_CTX_new_id");
 -		goto err;
--	} else if (EVP_PKEY_keygen_init(ctx) <= 0) {
+-	}
+-	if (EVP_PKEY_keygen_init(ctx) <= 0) {
 -		warnx("EVP_PKEY_keygen_init");
 +	slen = BR_RSA_KBUF_PRIV_SIZE(KBITS);
 +	plen = BR_RSA_KBUF_PUB_SIZE(KBITS);
 +	if ((key = malloc(sizeof(*key) + slen + plen)) == NULL) {
 +		warnx("malloc");
  		goto err;
--	} else if (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, KBITS) <= 0) {
+ 	}
+-	if (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, KBITS) <= 0) {
 -		warnx("EVP_PKEY_set_rsa_keygen_bits");
-+	}
 +	key->type = BR_KEYTYPE_RSA;
 +	key->datasz = slen + plen;
 +	sbuf = key->data;
@@ -611,9 +607,9 @@ index a6fc437f863..c0e54b15742 100644
 +	    &key->rsa.pk, pbuf, KBITS, 0x10001)) {
 +		warnx("br_rsa_keygen");
  		goto err;
--	} else if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
+ 	}
+-	if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
 -		warnx("EVP_PKEY_keygen");
-+	}
 +
 +	/* Compute the private exponent. */
 +
@@ -625,7 +621,8 @@ index a6fc437f863..c0e54b15742 100644
 -	/* Serialise the key to the disc. */
 +	/* Serialise the key to the disk. */
  
--	if (PEM_write_PrivateKey(f, pkey, NULL, NULL, 0, NULL, NULL))
+-	if (!PEM_write_PrivateKey(f, pkey, NULL, NULL, 0, NULL, NULL)) {
+-		warnx("%s: PEM_write_PrivateKey", fname);
 +	derlen = br_encode_rsa_raw_der(NULL, &key->rsa.sk, &key->rsa.pk,
 +	    d, sizeof(d));
 +	if ((der = malloc(derlen)) == NULL) {
@@ -639,30 +636,31 @@ index a6fc437f863..c0e54b15742 100644
 +		goto err;
 +	}
 +	br_pem_encode(pem, der, derlen, BR_ENCODE_PEM_RSA_RAW, 0);
-+	if (fwrite(pem, 1, pemlen, f) == pemlen)
- 		goto out;
++	if (fwrite(pem, 1, pemlen, f) != pemlen) {
++		warn("write private key");
+ 		goto err;
+ 	}
  
--	warnx("%s: PEM_write_PrivateKey", fname);
-+	warn("write private key");
+-	EVP_PKEY_CTX_free(ctx);
+-	return pkey;
++	free(der);
++	free(pem);
++	return key;
  
  err:
 -	EVP_PKEY_free(pkey);
--	pkey = NULL;
-+	free(key);
-+	key = NULL;
- out:
 -	EVP_PKEY_CTX_free(ctx);
--	return pkey;
 +	free(der);
 +	free(pem);
-+	return key;
++	free(key);
+ 	return NULL;
  }
  
 -EVP_PKEY *
 +struct key *
  ec_key_create(FILE *f, const char *fname)
  {
--	EC_KEY		*eckey = NULL;
+-	EVP_PKEY_CTX	*ctx = NULL;
 -	EVP_PKEY	*pkey = NULL;
 +	struct key 		*key = NULL;
 +	const br_ec_impl	*ec;
@@ -671,45 +669,42 @@ index a6fc437f863..c0e54b15742 100644
 +	unsigned char		*der = NULL, *pem = NULL;
 +	size_t			 derlen, pemlen;
  
--	if ((eckey = EC_KEY_new_by_curve_name(NID_secp384r1)) == NULL ) {
--		warnx("EC_KEY_new_by_curve_name");
+-	if ((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL) {
+-		warnx("EVP_PKEY_CTX_new_id");
+-		goto err;
+-	}
+-	if (EVP_PKEY_keygen_init(ctx) <= 0) {
+-		warnx("EVP_PKEY_keygen_init");
 +	slen = BR_EC_KBUF_PRIV_MAX_SIZE;
 +	plen = BR_EC_KBUF_PUB_MAX_SIZE;
 +	if ((key = malloc(sizeof(*key) + slen + plen)) == NULL) {
 +		warn("malloc");
  		goto err;
  	}
+-	if (EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, NID_secp384r1) <= 0) {
+-		warnx("EVP_PKEY_CTX_set_ec_paramgen_curve_nid");
 +	key->type = BR_KEYTYPE_EC;
 +	key->datasz = slen + plen;
 +	sbuf = key->data;
 +	pbuf = key->data + slen;
- 
--	if (!EC_KEY_generate_key(eckey)) {
--		warnx("EC_KEY_generate_key");
++
 +	ec = br_ec_get_default();
 +	if (br_ec_keygen(&prng, ec, &key->ec.sk, sbuf, BR_EC_secp384r1) == 0) {
 +		warnx("br_ec_keygen");
  		goto err;
  	}
--
--	/* set OPENSSL_EC_NAMED_CURVE to be able to load the key */
--
--	EC_KEY_set_asn1_flag(eckey, OPENSSL_EC_NAMED_CURVE);
--
--	/* Serialise the key to the disc in EC format */
--
--	if (!PEM_write_ECPrivateKey(f, eckey, NULL, NULL, 0, NULL, NULL)) {
--		warnx("%s: PEM_write_ECPrivateKey", fname);
+-	if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
+-		warnx("EVP_PKEY_keygen");
 +	if (br_ec_compute_pub(ec, &key->ec.pk, pbuf, &key->ec.sk) == 0) {
 +		warnx("br_ec_compute_pub");
  		goto err;
  	}
  
--	/* Convert the EC key into a PKEY structure */
+-	/* Serialise the key to the disc. */
 +	/* Serialise the key to the disk in EC format */
  
--	if ((pkey = EVP_PKEY_new()) == NULL) {
--		warnx("EVP_PKEY_new");
+-	if (!PEM_write_PrivateKey(f, pkey, NULL, NULL, 0, NULL, NULL)) {
+-		warnx("%s: PEM_write_PrivateKey", fname);
 +	if ((derlen = br_encode_ec_raw_der(NULL, &key->ec.sk,
 +	    &key->ec.pk)) == 0) {
 +		warnx("br_encode_ec_raw_der");
@@ -717,44 +712,42 @@ index a6fc437f863..c0e54b15742 100644
 +	}
 +	if ((der = malloc(derlen)) == NULL) {
 +		warn("malloc");
- 		goto err;
- 	}
--	if (!EVP_PKEY_set1_EC_KEY(pkey, eckey)) {
--		warnx("EVP_PKEY_assign_EC_KEY");
++		goto err;
++	}
 +	br_encode_ec_raw_der(der, &key->ec.sk, &key->ec.pk);
 +	pemlen = br_pem_encode(NULL, der, derlen, BR_ENCODE_PEM_EC_RAW, 0);
 +	if ((pem = malloc(pemlen + 1)) == NULL) {
 +		warn("malloc");
++		goto err;
++	}
++	br_pem_encode(pem, der, derlen, BR_ENCODE_PEM_EC_RAW, 0);
++	if (fwrite(pem, 1, pemlen, f) != pemlen) {
++		warn("write private key");
  		goto err;
  	}
-+	br_pem_encode(pem, der, derlen, BR_ENCODE_PEM_EC_RAW, 0);
-+	if (fwrite(pem, 1, pemlen, f) == pemlen)
-+		goto out;
  
--	goto out;
-+	warn("write private key");
+-	EVP_PKEY_CTX_free(ctx);
+-	return pkey;
++	free(der);
++	free(pem);
++	return key;
  
  err:
 -	EVP_PKEY_free(pkey);
--	pkey = NULL;
-+	free(key);
-+	key = NULL;
- out:
--	EC_KEY_free(eckey);
--	return pkey;
+-	EVP_PKEY_CTX_free(ctx);
 +	free(der);
 +	free(pem);
-+	return key;
++	free(key);
+ 	return NULL;
  }
  
+-EVP_PKEY *
 +static void
 +append_skey(void *ctx, const void *src, size_t len)
 +{
 +	br_skey_decoder_push(ctx, src, len);
 +}
- 
--
--EVP_PKEY *
++
 +struct key *
  key_load(FILE *f, const char *fname)
  {
@@ -772,7 +765,11 @@ index a6fc437f863..c0e54b15742 100644
 +	const br_ec_private_key		*ec;
 +	const char			*name = NULL;
 +	uint32_t			 pubexp;
-+
+ 
+-	pkey = PEM_read_PrivateKey(f, NULL, NULL, NULL);
+-	if (pkey == NULL) {
+-		warnx("%s: PEM_read_PrivateKey", fname);
+-		return NULL;
 +	br_pem_decoder_init(&pemctx);
 +	br_skey_decoder_init(&keyctx);
 +	while (type == 0) {
@@ -817,8 +814,14 @@ index a6fc437f863..c0e54b15742 100644
 +			warnx("%s: PEM decoding failed", fname);
 +			goto err;
 +		}
-+	}
-+
+ 	}
+-	if (EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA ||
+-	    EVP_PKEY_base_id(pkey) == EVP_PKEY_EC)
+-		return pkey;
+ 
+-	warnx("%s: unsupported key type", fname);
+-	EVP_PKEY_free(pkey);
+-	return NULL;
 +	switch (type) {
 +	case BR_KEYTYPE_RSA:
 +		rsa = br_skey_decoder_get_rsa(&keyctx);
@@ -833,11 +836,7 @@ index a6fc437f863..c0e54b15742 100644
 +		}
 +		datasz += 4 + rsa->plen + rsa->qlen + rsa->dplen + rsa->dqlen +
 +		    rsa->iqlen;
- 
--	pkey = PEM_read_PrivateKey(f, NULL, NULL, NULL);
--	if (pkey == NULL) {
--		warnx("%s: PEM_read_PrivateKey", fname);
--		return NULL;
++
 +		if ((key = malloc(sizeof(*key) + datasz)) == NULL) {
 +			warn("malloc");
 +			goto err;
@@ -907,14 +906,8 @@ index a6fc437f863..c0e54b15742 100644
 +		br_ec_compute_pub(ecimpl, &key->ec.pk,
 +		    key->ec.sk.x + key->ec.sk.xlen, &key->ec.sk);
 +		goto out;
- 	}
--	if (EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA ||
--	    EVP_PKEY_base_id(pkey) == EVP_PKEY_EC)
--		return pkey;
- 
--	warnx("%s: unsupported key type", fname);
--	EVP_PKEY_free(pkey);
--	return NULL;
++	}
++
 +	warnx("%s: missing private key", fname);
 +
 +err:
@@ -1546,5 +1539,5 @@ index 58e81233f1a..378de35f662 100644
  	return rc;
  }
 -- 
-2.44.0
+2.49.0
 
diff --git a/pkg/openbsd/patch/0038-rsync-Pass-long-long-to-scan_scaled.patch b/pkg/openbsd/patch/0036-rsync-Pass-long-long-to-scan_scaled.patch
index 4807e83c..7e359c6a 100644
--- a/pkg/openbsd/patch/0038-rsync-Pass-long-long-to-scan_scaled.patch
+++ b/pkg/openbsd/patch/0036-rsync-Pass-long-long-to-scan_scaled.patch
@@ -1,4 +1,4 @@
-From 0e9ff28bc2e5bd4828b98b50333d12a6d24486fe Mon Sep 17 00:00:00 2001
+From 0b46c097e66f06fc7e5b4817e6cfdbb145bf4825 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Wed, 27 Apr 2022 20:03:45 -0700
 Subject: [PATCH] rsync: Pass long long * to scan_scaled
@@ -9,10 +9,10 @@ off_t might not be long long.
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/usr.bin/rsync/main.c b/usr.bin/rsync/main.c
-index dd175597914..5d7f055a9ae 100644
+index d59848f0214..477adbbba50 100644
 --- a/usr.bin/rsync/main.c
 +++ b/usr.bin/rsync/main.c
-@@ -353,6 +353,7 @@ main(int argc, char *argv[])
+@@ -361,6 +361,7 @@ main(int argc, char *argv[])
  	struct fargs	*fargs;
  	char		**args;
  	const char	*errstr;
@@ -20,7 +20,7 @@ index dd175597914..5d7f055a9ae 100644
  
  	/* Global pledge. */
  
-@@ -488,12 +489,14 @@ basedir:
+@@ -509,12 +510,14 @@ basedir:
  			opts.basedir[basedir_cnt++] = optarg;
  			break;
  		case OP_MAX_SIZE:
@@ -35,8 +35,8 @@ index dd175597914..5d7f055a9ae 100644
  				err(1, "bad min-size");
 +			opts.max_size = size;
  			break;
- 		case OP_VERSION:
- 			fprintf(stderr, "openrsync: protocol version %u\n",
+ 		case 'h':
+ 		default:
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0039-libutil-Include-util.h-instead-of-util.h.patch b/pkg/openbsd/patch/0037-libutil-Include-util.h-instead-of-util.h.patch
index 6ebdce8f..6ebdce8f 100644
--- a/pkg/openbsd/patch/0039-libutil-Include-util.h-instead-of-util.h.patch
+++ b/pkg/openbsd/patch/0037-libutil-Include-util.h-instead-of-util.h.patch
diff --git a/pkg/openbsd/patch/0037-pax-Use-POSIX-struct-stat-fields-for-high-resolution.patch b/pkg/openbsd/patch/0037-pax-Use-POSIX-struct-stat-fields-for-high-resolution.patch
deleted file mode 100644
index 18d2ca23..00000000
--- a/pkg/openbsd/patch/0037-pax-Use-POSIX-struct-stat-fields-for-high-resolution.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 82646d38665109ec5f0753ba384da94d529bbbe9 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 27 Apr 2022 19:57:54 -0700
-Subject: [PATCH] pax: Use POSIX struct stat fields for high resolution
- timestamps
-
----
- bin/pax/tar.c | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/bin/pax/tar.c b/bin/pax/tar.c
-index 1f4012123c3..7ede7938c3d 100644
---- a/bin/pax/tar.c
-+++ b/bin/pax/tar.c
-@@ -417,8 +417,7 @@ tar_rd(ARCHD *arcn, char *buf)
- 		arcn->sb.st_mtime = INT_MAX;                    /* XXX 2038 */
- 	else
- 		arcn->sb.st_mtime = val;
--	arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;
--	arcn->sb.st_ctimensec = arcn->sb.st_atimensec = arcn->sb.st_mtimensec;
-+	arcn->sb.st_ctim = arcn->sb.st_atim = arcn->sb.st_mtim;
- 
- 	/*
- 	 * have to look at the last character, it may be a '/' and that is used
-@@ -795,14 +794,10 @@ reset:
- 		else
- 			arcn->sb.st_mtime = val;
- 	}
--	if (arcn->sb.st_ctime == 0) {
--		arcn->sb.st_ctime = arcn->sb.st_mtime;
--		arcn->sb.st_ctimensec = arcn->sb.st_mtimensec;
--	}
--	if (arcn->sb.st_atime == 0) {
--		arcn->sb.st_atime = arcn->sb.st_mtime;
--		arcn->sb.st_atimensec = arcn->sb.st_mtimensec;
--	}
-+	if (arcn->sb.st_ctime == 0)
-+		arcn->sb.st_ctim = arcn->sb.st_mtim;
-+	if (arcn->sb.st_atime == 0)
-+		arcn->sb.st_atim = arcn->sb.st_mtim;
- 
- 	/*
- 	 * If we can find the ascii names for gname and uname in the password
--- 
-2.35.1
-
diff --git a/pkg/openbsd/patch/0040-nc-Add-option-to-disable-certificate-time-checking.patch b/pkg/openbsd/patch/0038-nc-Add-option-to-disable-certificate-time-checking.patch
index ca0fe511..4ae959d5 100644
--- a/pkg/openbsd/patch/0040-nc-Add-option-to-disable-certificate-time-checking.patch
+++ b/pkg/openbsd/patch/0038-nc-Add-option-to-disable-certificate-time-checking.patch
@@ -1,4 +1,4 @@
-From 506272f64ba252c562e3036d14713de780817d1a Mon Sep 17 00:00:00 2001
+From 5e993fe93c590d60b05948e22b51dfc34c3eac4b Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 20 May 2021 13:44:35 -0700
 Subject: [PATCH] nc: Add option to disable certificate time checking
@@ -9,7 +9,7 @@ Subject: [PATCH] nc: Add option to disable certificate time checking
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1
-index 0ef318e0e6f..5858ef763dc 100644
+index 76b6dc018ea..9e13b84acf7 100644
 --- a/usr.bin/nc/nc.1
 +++ b/usr.bin/nc/nc.1
 @@ -249,6 +249,8 @@ may be one of:
@@ -22,7 +22,7 @@ index 0ef318e0e6f..5858ef763dc 100644
  which requires a client certificate on incoming connections; or
  .Cm muststaple ,
 diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
-index 7369ed85619..29d2cb3bf29 100644
+index b5129c2204d..d1ed530eb2c 100644
 --- a/usr.bin/nc/netcat.c
 +++ b/usr.bin/nc/netcat.c
 @@ -70,8 +70,9 @@
@@ -46,7 +46,7 @@ index 7369ed85619..29d2cb3bf29 100644
  		if (TLSopt & TLS_NOVERIFY) {
  			if (tls_expecthash != NULL)
  				errx(1, "-H and -T noverify may not be used "
-@@ -1705,6 +1708,7 @@ process_tls_opt(char *s, int *flags)
+@@ -1707,6 +1710,7 @@ process_tls_opt(char *s, int *flags)
  		{ "muststaple",		TLS_MUSTSTAPLE,		NULL },
  		{ "noverify",		TLS_NOVERIFY,		NULL },
  		{ "noname",		TLS_NONAME,		NULL },
@@ -55,5 +55,5 @@ index 7369ed85619..29d2cb3bf29 100644
  		{ NULL,			-1,			NULL },
  	};
 -- 
-2.37.3
+2.49.0
 
diff --git a/pkg/openbsd/patch/0039-pax-Only-use-_PC_TIMESTAMP_RESOLUTION-if-it-is-defin.patch b/pkg/openbsd/patch/0039-pax-Only-use-_PC_TIMESTAMP_RESOLUTION-if-it-is-defin.patch
new file mode 100644
index 00000000..d10806a8
--- /dev/null
+++ b/pkg/openbsd/patch/0039-pax-Only-use-_PC_TIMESTAMP_RESOLUTION-if-it-is-defin.patch
@@ -0,0 +1,41 @@
+From 7977b9211356095517951e86fa53f64c6b27e16b Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Tue, 29 Apr 2025 16:50:16 -0700
+Subject: [PATCH] pax: Only use _PC_TIMESTAMP_RESOLUTION if it is defined
+
+---
+ bin/pax/ar_subs.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
+index 4c49efa1362..a0e4fdfdea5 100644
+--- a/bin/pax/ar_subs.c
++++ b/bin/pax/ar_subs.c
+@@ -167,12 +167,13 @@ cmp_file_times(int mtime_flag, int ctime_flag, ARCHD *arcn, const char *path)
+ 	else if (timespeccmp(&arcn->sb.st_mtim, &sb.st_mtim, <=))
+ 		return 1;
+ 
++#ifdef _PC_TIMESTAMP_RESOLUTION
+ 	/*
+ 	 * If we got here then the target arcn > sb for mtime *and* that's
+ 	 * the deciding factor.  Check whether they're equal after rounding
+ 	 * down the arcn mtime to the precision of the target path.
+ 	 */
+-	res = pathconfat(AT_FDCWD, path, _PC_TIMESTAMP_RESOLUTION,
++	res = pathconf(path, _PC_TIMESTAMP_RESOLUTION,
+ 	    AT_SYMLINK_NOFOLLOW);
+ 	if (res == -1)
+ 		return 0;
+@@ -195,6 +196,9 @@ cmp_file_times(int mtime_flag, int ctime_flag, ARCHD *arcn, const char *path)
+ 		return ((arcn->sb.st_mtime / res) * res) <= sb.st_mtime;
+ 		return arcn->sb.st_mtime <= ((sb.st_mtime / res) * res);
+ 	}
++#else
++	return 0;
++#endif
+ }
+ 
+ /*
+-- 
+2.49.0
+
diff --git a/pkg/openbsd/sha256 b/pkg/openbsd/sha256
index 00c8fe07..8fd94a28 100644
--- a/pkg/openbsd/sha256
+++ b/pkg/openbsd/sha256
@@ -1,2 +1,2 @@
-4d545e75c144848b06cb1ee661ab13b654683ae47fcd5f264a4520ab2bfe4c0f  src.tar.gz
-bb0dfa11584d68464b3f788e43655f6454bb3ecba8ad5500377630bcf23570ec  sys.tar.gz
+6239a7a906bec7c386a06e6fda5893d854a4a00b6702eb47cbed0353a6a0c4fb  src.tar.gz
+65b58e8432c8f678840fa58402daee8acf196770b748068e165664bd2d6cd85c  sys.tar.gz
diff --git a/pkg/openbsd/url b/pkg/openbsd/url
index 350b1314..8b57a89d 100644
--- a/pkg/openbsd/url
+++ b/pkg/openbsd/url
@@ -1,5 +1,5 @@
 remote-name
-url = "https://cdn.openbsd.org/pub/OpenBSD/7.3/src.tar.gz"
+url = "https://cdn.openbsd.org/pub/OpenBSD/7.7/src.tar.gz"
 
 remote-name
-url = "https://cdn.openbsd.org/pub/OpenBSD/7.3/sys.tar.gz"
+url = "https://cdn.openbsd.org/pub/OpenBSD/7.7/sys.tar.gz"
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
index 3e983329..4961aecf 100644
--- a/pkg/openbsd/ver
+++ b/pkg/openbsd/ver
@@ -1 +1 @@
-7.3 r1
+7.7 r0