From 0bef1a86f26d413443e46fefdefa6b2c6bf9acd9 Mon Sep 17 00:00:00 2001 From: benno Date: Wed, 14 Apr 2021 18:05:47 +0000 Subject: [PATCH] move the RPKI_VERSION define into its own version.h file, helps portable. ok claudio@ --- usr.sbin/rpki-client/extern.h | 3 +-- usr.sbin/rpki-client/main.c | 3 ++- usr.sbin/rpki-client/version.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 usr.sbin/rpki-client/version.h diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h index 47ef1afb2a5..1323c33ffd8 100644 --- a/usr.sbin/rpki-client/extern.h +++ b/usr.sbin/rpki-client/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.62 2021/04/01 16:04:48 claudio Exp $ */ +/* $OpenBSD: extern.h,v 1.63 2021/04/14 18:05:47 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -541,6 +541,5 @@ int mkpath(const char *); #define RPKI_PATH_OUT_DIR "/var/db/rpki-client" #define RPKI_PATH_BASE_DIR "/var/cache/rpki-client" -#define RPKI_VERSION "OpenBSD" #endif /* ! EXTERN_H */ diff --git a/usr.sbin/rpki-client/main.c b/usr.sbin/rpki-client/main.c index 94b5ac4a65d..417f4626224 100644 --- a/usr.sbin/rpki-client/main.c +++ b/usr.sbin/rpki-client/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.135 2021/04/11 01:20:03 job Exp $ */ +/* $OpenBSD: main.c,v 1.136 2021/04/14 18:05:47 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -40,6 +40,7 @@ #include #include "extern.h" +#include "version.h" /* * Maximum number of TAL files we'll load. diff --git a/usr.sbin/rpki-client/version.h b/usr.sbin/rpki-client/version.h new file mode 100644 index 00000000000..acec48f1124 --- /dev/null +++ b/usr.sbin/rpki-client/version.h @@ -0,0 +1,3 @@ +/* $OpenBSD: version.h,v 1.1 2021/04/14 18:05:47 benno Exp $ */ + +#define RPKI_VERSION "7.0" -- 2.20.1