From 5f0faded709e9cacb8e00f47f9087349b51fc5b9 Mon Sep 17 00:00:00 2001
From: job <job@openbsd.org>
Date: Wed, 4 Sep 2024 15:46:43 +0000
Subject: [PATCH] Remove deprecated '-r' command line option

OK tb@ claudio@
---
 usr.sbin/rpki-client/main.c        |  9 +++------
 usr.sbin/rpki-client/rpki-client.8 | 14 ++++----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/usr.sbin/rpki-client/main.c b/usr.sbin/rpki-client/main.c
index 88b30455667..1399cc8648a 100644
--- a/usr.sbin/rpki-client/main.c
+++ b/usr.sbin/rpki-client/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.265 2024/09/03 15:04:48 job Exp $ */
+/*	$OpenBSD: main.c,v 1.266 2024/09/04 15:46:43 job Exp $ */
 /*
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -1009,7 +1009,7 @@ main(int argc, char *argv[])
 	    "proc exec unveil", NULL) == -1)
 		err(1, "pledge");
 
-	while ((c = getopt(argc, argv, "Ab:Bcd:e:fH:jmnoP:rRs:S:t:T:vVx")) != -1)
+	while ((c = getopt(argc, argv, "Ab:Bcd:e:fH:jmnoP:Rs:S:t:T:vVx")) != -1)
 		switch (c) {
 		case 'A':
 			excludeaspa = 1;
@@ -1058,9 +1058,6 @@ main(int argc, char *argv[])
 		case 'R':
 			rrdpon = 0;
 			break;
-		case 'r': /* Remove after OpenBSD 7.3 */
-			rrdpon = 1;
-			break;
 		case 's':
 			timeout = strtonum(optarg, 0, 24*60*60, &errs);
 			if (errs)
@@ -1527,7 +1524,7 @@ main(int argc, char *argv[])
 
 usage:
 	fprintf(stderr,
-	    "usage: rpki-client [-ABcjmnoRrVvx] [-b sourceaddr] [-d cachedir]"
+	    "usage: rpki-client [-ABcjmnoRVvx] [-b sourceaddr] [-d cachedir]"
 	    " [-e rsync_prog]\n"
 	    "                   [-H fqdn] [-P epoch] [-S skiplist] [-s timeout]"
 	    " [-T table]\n"
diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8
index 8ccfdbc1559..0061341d3e0 100644
--- a/usr.sbin/rpki-client/rpki-client.8
+++ b/usr.sbin/rpki-client/rpki-client.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpki-client.8,v 1.108 2024/08/20 12:53:47 job Exp $
+.\"	$OpenBSD: rpki-client.8,v 1.109 2024/09/04 15:46:43 job Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 20 2024 $
+.Dd $Mdocdate: September 4 2024 $
 .Dt RPKI-CLIENT 8
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nd RPKI validator to support BGP routing security
 .Sh SYNOPSIS
 .Nm
-.Op Fl ABcjmnoRrVvx
+.Op Fl ABcjmnoRVvx
 .Op Fl b Ar sourceaddr
 .Op Fl d Ar cachedir
 .Op Fl e Ar rsync_prog
@@ -171,13 +171,7 @@ Specify the time for the evaluation in
 seconds from the unix epoch.
 This overrides the default of using the current system time.
 .It Fl R
-Synchronize via RSYNC only.
-.It Fl r
-Synchronize via RRDP.
-If RRDP fails, RSYNC will be used.
-This is the default.
-Mutually exclusive with
-.Fl n .
+Disable RRDP, synchronize only via RSYNC.
 .It Fl S Ar skiplist
 Do not connect to hosts listed in the
 .Ar skiplist
-- 
2.20.1