From a6ade9fb7b0abb0eb73f80f0dc535ce1b19e701f Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 4 Sep 2019 19:31:07 +0100 Subject: [PATCH] dhcpcd: Import new config.h --- sbin/dhcpcd/config.h | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sbin/dhcpcd/config.h b/sbin/dhcpcd/config.h index e399dc10d9..3893a35f94 100644 --- a/sbin/dhcpcd/config.h +++ b/sbin/dhcpcd/config.h @@ -1,15 +1,27 @@ -/* - * dhcpcd config.h for dragonfly - * - * generated by 'configure', with custom changes - */ - -#define HAVE_SYS_QUEUE_H -#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE -#define HAVE_KQUEUE -#define HAVE_REALLOCARRAY +/* dragonfly */ +#ifndef SYSCONFDIR +#define SYSCONFDIR "/etc" +#define SBINDIR "/sbin" +#define LIBDIR "/lib" +#define LIBEXECDIR "/usr/libexec" +#define DBDIR "/var/db/dhcpcd" +#define RUNDIR "/var/run" +#endif +#define HAVE_OPEN_MEMSTREAM #include "compat/pidfile.h" #include "compat/strtoi.h" +#include "compat/consttime_memequal.h" +#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE +#define HAVE_SYS_QUEUE_H +#define RBTEST +#include "compat/rbtree.h" +#define HAVE_REALLOCARRAY +#define HAVE_KQUEUE +#ifdef USE_PRIVATECRYPTO #define HAVE_MD5_H -#define SHA2_H +#define SHA2_H +#else +#include "compat/crypt/md5.h" +#include "compat/crypt/sha256.h" +#endif #include "compat/crypt/hmac.h" -- 2.41.0