From c5cbd5ff6291cee63b15c0a35395962d949ecd60 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 30 Nov 2019 02:31:12 +0000
Subject: [PATCH] Tweak rpki-client to create all 4 output file formats from a
 single compute, based upon flags.  OpenBGPD compatible format by default if
 no options, to integrate with bgpd.conf and bgpctl reload.  Adapt mtree and
 stuff.  This will receive further refactoring... ok benno job

---
 src/etc/Makefile           | 4 ++--
 src/etc/examples/bgpd.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 239d892b..d0b55839 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.473 2019/11/29 03:22:13 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.474 2019/11/30 02:31:12 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -183,7 +183,7 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g wheel -m 444 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
 	${INSTALL} -c -o _rpki-client -g wheel -m 644 /dev/null \
-	    ${DESTDIR}/var/db/rpki-client/roa
+	    ${DESTDIR}/var/db/rpki-client/openbsd
 	${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \
 	    ${DESTDIR}/var/log/authlog
 	${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \
diff --git a/src/etc/examples/bgpd.conf b/src/etc/examples/bgpd.conf
index 2396d63b..76a95dfb 100644
--- a/src/etc/examples/bgpd.conf
+++ b/src/etc/examples/bgpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf,v 1.16 2019/11/29 03:42:10 deraadt Exp $
+# $OpenBSD: bgpd.conf,v 1.17 2019/11/30 02:31:12 deraadt Exp $
 # example bgpd configuration file, see bgpd.conf(5)
 
 # define our own ASN as a macro
@@ -14,7 +14,7 @@ prefix-set mynetworks {		\
 	2001:db8:abcd::/48	\
 }
 
-include "/var/db/rpki-client/roa"
+include "/var/db/rpki-client/openbgpd"
 
 # define bogon prefixes which should not be part of the DFZ
 prefix-set bogons {