Regen patches.

Author: cjeker

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

@@ -1,4 +1,4 @@
-From a4bfbec5d33090c094fafdd249f248a628ca8899 Mon Sep 17 00:00:00 2001
+From cc682646acf080fac61788e1193efdb1775d3b2a 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
@@ -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 514dfea85..0bf10bfc7 100644
+index d1d6baae6..7d47f9f49 100644
 --- src/usr.sbin/rpki-client/extern.h
 +++ src/usr.sbin/rpki-client/extern.h
-@@ -1028,10 +1028,27 @@ time_t		 get_current_time(void);
+@@ -1024,10 +1024,27 @@ time_t		 get_current_time(void);
  int	mkpath(const char *);
  int	mkpathat(int, const char *);
 
@@ -43,10 +43,10 @@ index 514dfea85..0bf10bfc7 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 315ed1915..90bae8eca 100644
+index ff88a70c4..7473bb93a 100644
 --- src/usr.sbin/rpki-client/main.c
 +++ src/usr.sbin/rpki-client/main.c
-@@ -830,7 +830,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
+@@ -842,7 +842,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
  }
 
  /*
@@ -55,7 +55,7 @@ index 315ed1915..90bae8eca 100644
   * returning the number of files found and filled-in.
   * This may be zero.
   * Don't exceed "max" filenames.
-@@ -838,7 +838,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
+@@ -850,7 +850,7 @@ sum_repostats(const struct repo *rp, const struct repostats *in, void *arg)
  static int
  tal_load_default(void)
  {
@@ -64,7 +64,7 @@ index 315ed1915..90bae8eca 100644
  	int s = 0;
  	char *path;
  	DIR *dirp;
-@@ -1007,7 +1007,7 @@ main(int argc, char *argv[])
+@@ -1019,7 +1019,7 @@ main(int argc, char *argv[])
  	struct pollfd	 pfd[NPFD];
  	struct msgbuf	*queues[NPFD];
  	struct ibuf	*b;
@@ -73,7 +73,7 @@ index 315ed1915..90bae8eca 100644
  	char		*bind_addr = NULL;
  	const char	*cachedir = NULL, *outputdir = NULL;
  	const char	*errs, *name;
-@@ -1030,9 +1030,9 @@ main(int argc, char *argv[])
+@@ -1043,9 +1043,9 @@ main(int argc, char *argv[])
  	if (getuid() == 0) {
  		struct passwd *pw;
 
@@ -85,7 +85,7 @@ index 315ed1915..90bae8eca 100644
  		if (setgroups(1, &pw->pw_gid) == -1 ||
  		    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
  		    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1)
-@@ -1126,7 +1126,8 @@ main(int argc, char *argv[])
+@@ -1139,7 +1139,8 @@ main(int argc, char *argv[])
  			verbose++;
  			break;
  		case 'V':
@@ -95,7 +95,7 @@ index 315ed1915..90bae8eca 100644
  			return 0;
  		case 'x':
  			experimental = 1;
-@@ -1176,7 +1177,7 @@ main(int argc, char *argv[])
+@@ -1191,7 +1192,7 @@ main(int argc, char *argv[])
  	if (talsz == 0)
  		talsz = tal_load_default();
  	if (talsz == 0)
@@ -105,5 +105,5 @@ index 315ed1915..90bae8eca 100644
  	/* Load optional constraint files sitting next to the TALs. */
  	constraints_load();
 -- 
-2.50.1
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 4c6bae3f37fd0589ceb794bdad042d112ce25655 Mon Sep 17 00:00:00 2001
+From af56a8a9a494b13e624b647aa1a62ff133a88e80 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, 14 insertions(+), 14 deletions(-)
 
 diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8
-index c6fde7865..65435362b 100644
+index 8cd9681d7..7cda9afc1 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
 @@ -46,7 +46,7 @@ The
@@ -36,7 +36,7 @@ index c6fde7865..65435362b 100644
  to fetch repositories.
  It must accept the
  .Fl rt
-@@ -199,7 +199,7 @@ The skip filter is enforced during processing of the
+@@ -200,7 +200,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 c6fde7865..65435362b 100644
  .It Fl s Ar timeout
  Terminate after
  .Ar timeout
-@@ -219,7 +219,7 @@ This option can be used multiple times to load multiple TALs.
+@@ -220,7 +220,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 c6fde7865..65435362b 100644
  TAL are small files containing a public key and URL endpoint address.
  .It Fl V
  Show the version and exit.
-@@ -240,7 +240,7 @@ The directory where
+@@ -241,7 +241,7 @@ The directory where
  .Nm
  will write the output files.
  Defaults to
@@ -63,7 +63,7 @@ index c6fde7865..65435362b 100644
  .El
  .Pp
  By default
-@@ -302,32 +302,32 @@ utilizes the following environment variables:
+@@ -304,32 +304,32 @@ utilizes the following environment variables:
  URL of HTTP proxy to use.
  .El
  .Sh FILES
@@ -105,5 +105,5 @@ index c6fde7865..65435362b 100644
  .Sh STANDARDS
  .Rs
 -- 
-2.50.1
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 0a2059119aa656cedc398b812fbce5e1369e3b59 Mon Sep 17 00:00:00 2001
+From 91a42c7d4f55b005ef5f0a061865276d0023cfb5 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
@@ -9,10 +9,10 @@ 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 90bae8eca..cfa06d05b 100644
+index 7473bb93a..c56d4efb9 100644
 --- src/usr.sbin/rpki-client/main.c
 +++ src/usr.sbin/rpki-client/main.c
-@@ -1168,7 +1168,8 @@ main(int argc, char *argv[])
+@@ -1181,7 +1181,8 @@ main(int argc, char *argv[])
  		if ((outdirfd = open(outputdir, O_RDONLY | O_DIRECTORY)) == -1)
  			err(1, "output directory %s", outputdir);
  		if (outformats == 0)
@@ -23,20 +23,20 @@ index 90bae8eca..cfa06d05b 100644
  	}
 
 diff --git src/usr.sbin/rpki-client/rpki-client.8 src/usr.sbin/rpki-client/rpki-client.8
-index 65435362b..b97947d1f 100644
+index 7cda9afc1..70d752642 100644
 --- src/usr.sbin/rpki-client/rpki-client.8
 +++ src/usr.sbin/rpki-client/rpki-client.8
-@@ -246,8 +246,8 @@ Defaults to
+@@ -247,8 +247,8 @@ Defaults to
  By default
  .Nm
  outputs validated payloads in
 -.Fl o
--(OpenBGPD compatible) format.
+-(OpenBGPD compatible) format
 +.Fl joBcm
-+(JSON, OpenBGPD, BIRD, CSV and OpenMetric) formats.
++(JSON, OpenBGPD, BIRD, CSV and OpenMetric) formats
+ and in canonical cache representation format.
  .Pp
  .Nm
- should be run hourly by
 -- 
-2.50.1
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 4d6dca3d8f0dc8c6c0ddd9d6b5c1db5dd2166bfe Mon Sep 17 00:00:00 2001
+From e47436990831d6e5c7a024864731dc7c036fa269 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.
@@ -11,7 +11,7 @@ This is one giant hole but landlock is not capable to do proper protection.
  1 file changed, 16 insertions(+)
 
 diff --git src/usr.sbin/rpki-client/http.c src/usr.sbin/rpki-client/http.c
-index b7e8fcdf9..6dc366cb5 100644
+index 1d75f1758..ecee291bc 100644
 --- src/usr.sbin/rpki-client/http.c
 +++ src/usr.sbin/rpki-client/http.c
 @@ -64,6 +64,9 @@
@@ -35,7 +35,7 @@ index b7e8fcdf9..6dc366cb5 100644
 
  /* HTTP request API */
  static void	http_req_new(unsigned int, char *, char *, int, int);
-@@ -2036,12 +2041,23 @@ http_setup(void)
+@@ -2048,12 +2053,23 @@ http_setup(void)
  		    tls_config_error(tls_config));
  #endif
 
@@ -60,5 +60,5 @@ index b7e8fcdf9..6dc366cb5 100644
  	if ((httpproxy = getenv("http_proxy")) != NULL && *httpproxy == '\0')
  		httpproxy = NULL;
 -- 
-2.50.1
+2.52.0