Regen patches

patches/0001-Allow-overriding-default-user-and-file-locations.patch

@@ -1,4 +1,4 @@
-From 894d81f3775e8ecfb56b93c9202aa0d790069e51 Mon Sep 17 00:00:00 2001
+From 5724a9fbdabd0a8fd0b99cc9cb46c4567a16048c Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <[email protected]>
 Date: Tue, 14 Apr 2020 22:43:56 +0200
 Subject: [PATCH 1/4] Allow overriding default user and file locations
@@ -10,10 +10,10 @@ Adjust version string for -portable
  2 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/extern.h src/usr.sbin/rpki-client/extern.h
-index ab86f44fa..dd7393488 100644
+index e9afc703a..77c10bc78 100644
 --- src/usr.sbin/rpki-client/extern.h
 +++ src/usr.sbin/rpki-client/extern.h
-@@ -989,10 +989,27 @@ time_t		 get_current_time(void);
+@@ -986,10 +986,27 @@ time_t		 get_current_time(void);
  int	mkpath(const char *);
  int	mkpathat(int, const char *);
 
@@ -43,10 +43,10 @@ index ab86f44fa..dd7393488 100644
  /* Interval in which random reinitialization to an RRDP snapshot happens. */
  #define RRDP_RANDOM_REINIT_MAX	12 /* weeks */
 diff --git src/usr.sbin/rpki-client/main.c src/usr.sbin/rpki-client/main.c
-index 3dd01dad3..da1237e10 100644
+index 9d977dc34..8b2ae0287 100644
 --- src/usr.sbin/rpki-client/main.c
 +++ src/usr.sbin/rpki-client/main.c
-@@ -806,7 +806,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
+@@ -805,7 +805,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
  }
 
  /*
@@ -55,7 +55,7 @@ index 3dd01dad3..da1237e10 100644
   * returning the number of files found and filled-in.
   * This may be zero.
   * Don't exceed "max" filenames.
-@@ -814,7 +814,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
+@@ -813,7 +813,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
  static int
  tal_load_default(void)
  {
@@ -64,7 +64,7 @@ index 3dd01dad3..da1237e10 100644
  	int s = 0;
  	char *path;
  	DIR *dirp;
-@@ -979,7 +979,7 @@ main(int argc, char *argv[])
+@@ -978,7 +978,7 @@ main(int argc, char *argv[])
  	struct pollfd	 pfd[NPFD];
  	struct msgbuf	*queues[NPFD];
  	struct ibuf	*b;
@@ -73,7 +73,7 @@ index 3dd01dad3..da1237e10 100644
  	char		*bind_addr = NULL;
  	const char	*cachedir = NULL, *outputdir = NULL;
  	const char	*errs, *name;
-@@ -997,9 +997,9 @@ main(int argc, char *argv[])
+@@ -996,9 +996,9 @@ main(int argc, char *argv[])
  	if (getuid() == 0) {
  		struct passwd *pw;
 

patches/0002-Apply-placeholders-for-portability-shim.patch

@@ -1,4 +1,4 @@
-From fb829d43f086b6632bdfd7ccd519325aba6a7ae3 Mon Sep 17 00:00:00 2001
+From 0284ea1faae8e16a7589f3c42ce6481bb0a25757 Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <[email protected]>
 Date: Mon, 20 Apr 2020 12:16:46 +0200
 Subject: [PATCH 2/4] Apply placeholders for portability shim
@@ -9,10 +9,10 @@ From Robert Scheck
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8
-index aada53f8f..bbd3bc596 100644
+index 73bbf6a53..6dc23dc37 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
-@@ -45,7 +45,7 @@ The
+@@ -44,7 +44,7 @@ The
  utility queries the
  .Em Resource Public Key Infrastructure Pq RPKI
  repository system with a built-in HTTPS client and
@@ -21,7 +21,7 @@ index aada53f8f..bbd3bc596 100644
  to fetch all X.509 certificates, manifests, and revocation lists under a given
  .Em Trust Anchor .
  .Nm
-@@ -94,12 +94,12 @@ The directory where
+@@ -101,12 +101,12 @@ The directory where
  .Nm
  will store the cached repository data.
  Defaults to
@@ -36,7 +36,7 @@ index aada53f8f..bbd3bc596 100644
  to fetch repositories.
  It must accept the
  .Fl rt
-@@ -188,7 +188,7 @@ The skip filter is enforced during processing of the
+@@ -195,7 +195,7 @@ The skip filter is enforced during processing of the
  .Em Subject Information Access Pq SIA
  extension in CA certificates, thus applies to both RSYNC and RRDP connections.
  By default load entries from
@@ -45,7 +45,7 @@ index aada53f8f..bbd3bc596 100644
  .It Fl s Ar timeout
  Terminate after
  .Ar timeout
-@@ -214,7 +214,7 @@ This option can be used multiple times to load multiple TALs.
+@@ -215,7 +215,7 @@ This option can be used multiple times to load multiple TALs.
  By default
  .Nm
  will load all TAL files in
@@ -54,7 +54,7 @@ index aada53f8f..bbd3bc596 100644
  TAL are small files containing a public key and URL endpoint address.
  .It Fl V
  Show the version and exit.
-@@ -235,7 +235,7 @@ The directory where
+@@ -236,7 +236,7 @@ The directory where
  .Nm
  will write the output files.
  Defaults to
@@ -63,7 +63,7 @@ index aada53f8f..bbd3bc596 100644
  .El
  .Pp
  By default
-@@ -297,22 +297,22 @@ utilizes the following environment variables:
+@@ -298,29 +298,29 @@ utilizes the following environment variables:
  URL of HTTP proxy to use.
  .El
  .Sh FILES
@@ -74,6 +74,7 @@ index aada53f8f..bbd3bc596 100644
  default TAL files used unless
  .Fl t Ar tal
  is specified.
+ The TAL files of the five Regional Internet Registries are included.
 -.It Pa /etc/rpki/*.constraints
 +.It Pa @RPKI_TAL_DIR@/*.constraints
  files containing registry-specific constraints to restrict what IP addresses
@@ -91,8 +92,6 @@ index aada53f8f..bbd3bc596 100644
 +.It Pa @RPKI_OUT_DIR@/openbgpd
  default roa-set output file.
  .El
- .Pp
-@@ -323,7 +323,7 @@ agreement regarding ARIN service restrictions.
  .Sh EXIT STATUS
  .Ex -std
  .Sh SEE ALSO

patches/0003-Emit-all-output-formats-on-non-OpenBSD-systems.patch

@@ -1,4 +1,4 @@
-From bdb8539cf5f5b234d120af618c07af3bd55bfd02 Mon Sep 17 00:00:00 2001
+From a67b53ef9cec0be7d4652f022ec6e9e1fa89ccca Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <[email protected]>
 Date: Fri, 6 Nov 2020 13:19:45 +0100
 Subject: [PATCH 3/4] Emit all output formats on non-OpenBSD systems
@@ -9,7 +9,7 @@ Subject: [PATCH 3/4] Emit all output formats on non-OpenBSD systems
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/main.c src/usr.sbin/rpki-client/main.c
-index da1237e10..52d4b3250 100644
+index 8b2ae0287..be23b6860 100644
 --- src/usr.sbin/rpki-client/main.c
 +++ src/usr.sbin/rpki-client/main.c
 @@ -1129,7 +1129,8 @@ main(int argc, char *argv[])
@@ -23,10 +23,10 @@ index da1237e10..52d4b3250 100644
 
  	check_fs_size(cachefd, cachedir);
 diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8
-index bbd3bc596..1bf43f173 100644
+index 6dc23dc37..9f78dffdb 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
-@@ -241,8 +241,8 @@ Defaults to
+@@ -242,8 +242,8 @@ Defaults to
  By default
  .Nm
  outputs validated payloads in

patches/0004-Only-call-tls_config_set_ca_mem-when-pledge-is-used.patch

@@ -1,4 +1,4 @@
-From b3c3247146438fcd79224555e1afee459ef63f82 Mon Sep 17 00:00:00 2001
+From a49615767915c1c65ff548465de752faeb2b3b7e Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <[email protected]>
 Date: Wed, 1 Sep 2021 16:23:36 +0200
 Subject: [PATCH 4/4] Only call tls_config_set_ca_mem() when pledge() is used.