From 68b465b42dfb0a46b3461500c8d8870336cd589c Mon Sep 17 00:00:00 2001
From: Claudio Jeker <claudio@openbsd.org>
Date: Fri, 20 Jan 2023 11:22:57 +0100
Subject: [PATCH] Update patches

---
 ...iding-default-user-and-file-locations.patch |  2 +-
 ...ply-placeholders-for-portability-shim.patch |  6 +++---
 ...output-formats-on-non-OpenBSD-systems.patch | 18 +++++++-----------
 ...config_set_ca_mem-when-pledge-is-used.patch |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/patches/0001-Allow-overriding-default-user-and-file-locations.patch b/patches/0001-Allow-overriding-default-user-and-file-locations.patch
index 8b56287..7642aa7 100644
--- a/patches/0001-Allow-overriding-default-user-and-file-locations.patch
+++ b/patches/0001-Allow-overriding-default-user-and-file-locations.patch
@@ -1,4 +1,4 @@
-From d731f24db58307a139c74061166a05c49b5e0bf5 Mon Sep 17 00:00:00 2001
+From 80d413a7217f47adc9e54ac6985bb4368c933fab Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <claudio@openbsd.org>
 Date: Tue, 14 Apr 2020 22:43:56 +0200
 Subject: [PATCH 1/4] Allow overriding default user and file locations
diff --git a/patches/0002-Apply-placeholders-for-portability-shim.patch b/patches/0002-Apply-placeholders-for-portability-shim.patch
index b94d586..21792fd 100644
--- a/patches/0002-Apply-placeholders-for-portability-shim.patch
+++ b/patches/0002-Apply-placeholders-for-portability-shim.patch
@@ -1,4 +1,4 @@
-From 289af17e71e65c571abdce4518cffa18bed9bc19 Mon Sep 17 00:00:00 2001
+From 561e4838fc9072b74834535a15edb1e7b8155190 Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <claudio@openbsd.org>
 Date: Mon, 20 Apr 2020 12:16:46 +0200
 Subject: [PATCH 2/4] Apply placeholders for portability shim
@@ -9,7 +9,7 @@ From Robert Scheck
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8
-index e5431a953..7d83d2401 100644
+index 85f617d4c..015891664 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
 @@ -44,7 +44,7 @@ The
@@ -54,7 +54,7 @@ index e5431a953..7d83d2401 100644
  .El
  .Pp
  By default
-@@ -254,24 +254,24 @@ utilizes the following environment variables:
+@@ -252,24 +252,24 @@ utilizes the following environment variables:
  URL of HTTP proxy to use.
  .El
  .Sh FILES
diff --git a/patches/0003-Emit-all-output-formats-on-non-OpenBSD-systems.patch b/patches/0003-Emit-all-output-formats-on-non-OpenBSD-systems.patch
index d60a04b..38382a7 100644
--- a/patches/0003-Emit-all-output-formats-on-non-OpenBSD-systems.patch
+++ b/patches/0003-Emit-all-output-formats-on-non-OpenBSD-systems.patch
@@ -1,12 +1,12 @@
-From 3b0845b47977908a5dc3314449319ce403933a33 Mon Sep 17 00:00:00 2001
+From 7ee2fea3795b7512a748a30728a2a5df42fcdfd4 Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <claudio@openbsd.org>
 Date: Fri, 6 Nov 2020 13:19:45 +0100
 Subject: [PATCH 3/4] Emit all output formats on non-OpenBSD systems
 
 ---
  src/usr.sbin/rpki-client/main.c        | 3 ++-
- src/usr.sbin/rpki-client/rpki-client.8 | 8 +++-----
- 2 files changed, 5 insertions(+), 6 deletions(-)
+ src/usr.sbin/rpki-client/rpki-client.8 | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/main.c src/usr.sbin/rpki-client/main.c
 index 1332c1564..26e4154c7 100644
@@ -23,19 +23,15 @@ index 1332c1564..26e4154c7 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 7d83d2401..9d7a7d8bc 100644
+index 015891664..6f458eb37 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
-@@ -234,11 +234,9 @@ Defaults to
- .Pp
+@@ -235,8 +235,8 @@ Defaults to
  By default
  .Nm
--produces a list of unique
--.Li roa-set
--statements in
+ outputs validated payloads in
 -.Fl o
--(OpenBGPD compatible) output.
-+outputs validated payloads in
+-(OpenBGPD compatible) format.
 +.Fl joBcm
 +(JSON, OpenBGPD, BIRD, CSV and OpenMetric) formats.
  .Pp
diff --git a/patches/0004-Only-call-tls_config_set_ca_mem-when-pledge-is-used.patch b/patches/0004-Only-call-tls_config_set_ca_mem-when-pledge-is-used.patch
index fae2cd6..83ba101 100644
--- a/patches/0004-Only-call-tls_config_set_ca_mem-when-pledge-is-used.patch
+++ b/patches/0004-Only-call-tls_config_set_ca_mem-when-pledge-is-used.patch
@@ -1,4 +1,4 @@
-From 55ed01f210650d2146156a07635658970f648d35 Mon Sep 17 00:00:00 2001
+From c6656c07d8d24f1d2861c3a46d2738630a4cfdf3 Mon Sep 17 00:00:00 2001
 From: Claudio Jeker <claudio@openbsd.org>
 Date: Wed, 1 Sep 2021 16:23:36 +0200
 Subject: [PATCH 4/4] Only call tls_config_set_ca_mem() when pledge() is used.