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 b505754..2b1f8b6 100644 --- a/patches/0001-Allow-overriding-default-user-and-file-locations.patch +++ b/patches/0001-Allow-overriding-default-user-and-file-locations.patch @@ -9,10 +9,10 @@ Adjust version string for -portable src/usr.sbin/rpki-client/main.c | 15 ++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) -diff --git a/src/usr.sbin/rpki-client/extern.h b/src/usr.sbin/rpki-client/extern.h +diff --git src/usr.sbin/rpki-client/extern.h src/usr.sbin/rpki-client/extern.h index e41baff2f..53f01a5dc 100644 ---- a/src/usr.sbin/rpki-client/extern.h -+++ b/src/usr.sbin/rpki-client/extern.h +--- src/usr.sbin/rpki-client/extern.h ++++ src/usr.sbin/rpki-client/extern.h @@ -889,10 +889,27 @@ time_t getmonotime(void); int mkpath(const char *); int mkpathat(int, const char *); @@ -42,10 +42,10 @@ index e41baff2f..53f01a5dc 100644 /* Maximum number of TAL files we'll load. */ #define TALSZ_MAX 8 -diff --git a/src/usr.sbin/rpki-client/main.c b/src/usr.sbin/rpki-client/main.c +diff --git src/usr.sbin/rpki-client/main.c src/usr.sbin/rpki-client/main.c index 6c39865e0..297b12cf9 100644 ---- a/src/usr.sbin/rpki-client/main.c -+++ b/src/usr.sbin/rpki-client/main.c +--- src/usr.sbin/rpki-client/main.c ++++ src/usr.sbin/rpki-client/main.c @@ -765,7 +765,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg) } diff --git a/patches/0002-Apply-placeholders-for-portability-shim.patch b/patches/0002-Apply-placeholders-for-portability-shim.patch index 3e74413..87c4bb0 100644 --- a/patches/0002-Apply-placeholders-for-portability-shim.patch +++ b/patches/0002-Apply-placeholders-for-portability-shim.patch @@ -8,10 +8,10 @@ From Robert Scheck src/usr.sbin/rpki-client/rpki-client.8 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -diff --git a/src/usr.sbin/rpki-client/rpki-client.8 b/src/usr.sbin/rpki-client/rpki-client.8 +diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8 index 0644f3309..9544525de 100644 ---- a/src/usr.sbin/rpki-client/rpki-client.8 -+++ b/src/usr.sbin/rpki-client/rpki-client.8 +--- src/usr.sbin/rpki-client/rpki-client.8 ++++ src/usr.sbin/rpki-client/rpki-client.8 @@ -44,7 +44,7 @@ The .Nm utility queries the RPKI repository system with 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 df145bd..99b7d6e 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 @@ -8,10 +8,10 @@ Subject: [PATCH 3/4] Emit all output formats on non-OpenBSD systems src/usr.sbin/rpki-client/rpki-client.8 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) -diff --git a/src/usr.sbin/rpki-client/main.c b/src/usr.sbin/rpki-client/main.c +diff --git src/usr.sbin/rpki-client/main.c src/usr.sbin/rpki-client/main.c index 297b12cf9..0afd86d89 100644 ---- a/src/usr.sbin/rpki-client/main.c -+++ b/src/usr.sbin/rpki-client/main.c +--- src/usr.sbin/rpki-client/main.c ++++ src/usr.sbin/rpki-client/main.c @@ -1085,7 +1085,8 @@ main(int argc, char *argv[]) if ((outdirfd = open(outputdir, O_RDONLY | O_DIRECTORY)) == -1) err(1, "output directory %s", outputdir); @@ -22,10 +22,10 @@ index 297b12cf9..0afd86d89 100644 } check_fs_size(cachefd, cachedir); -diff --git a/src/usr.sbin/rpki-client/rpki-client.8 b/src/usr.sbin/rpki-client/rpki-client.8 +diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8 index 9544525de..8f7a0b8c5 100644 ---- a/src/usr.sbin/rpki-client/rpki-client.8 -+++ b/src/usr.sbin/rpki-client/rpki-client.8 +--- src/usr.sbin/rpki-client/rpki-client.8 ++++ src/usr.sbin/rpki-client/rpki-client.8 @@ -242,8 +242,8 @@ Defaults to By default .Nm 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 392f809..ff2812a 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 @@ -10,10 +10,10 @@ This is one giant hole but landlock is not capable to do proper protection. src/usr.sbin/rpki-client/http.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/src/usr.sbin/rpki-client/http.c b/src/usr.sbin/rpki-client/http.c +diff --git src/usr.sbin/rpki-client/http.c src/usr.sbin/rpki-client/http.c index c460c2056..43dfbed35 100644 ---- a/src/usr.sbin/rpki-client/http.c -+++ b/src/usr.sbin/rpki-client/http.c +--- src/usr.sbin/rpki-client/http.c ++++ src/usr.sbin/rpki-client/http.c @@ -64,6 +64,9 @@ #include #include