39 files changed, 5 insertions, 384 deletions

diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
index b0615077cf4d..2ff1dd82c9fd 100644
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	2.1.6
-PORTREVISION=	1
+PORTVERSION=	2.1.7
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
@@ -61,7 +60,7 @@ SQLITE_BUILD_DEPENDS=	sqlite3>=3.3.9:databases/sqlite3
 SOFTHSM_CONFIGURE_ON=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
 SOFTHSM_RUN_DEPENDS=	softhsm2>=2.5.0:security/softhsm2
 
-INSTALL_TARGET=		install-strip 
+INSTALL_TARGET=		install-strip
 
 pre-build:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
diff --git a/dns/opendnssec2/distinfo b/dns/opendnssec2/distinfo
index 1fe9a2735efc..f000422c20a0 100644
--- a/dns/opendnssec2/distinfo
+++ b/dns/opendnssec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581416801
-SHA256 (opendnssec-2.1.6.tar.gz) = b2c0caa673b8cfef73585dedf276997f5ca69bb3d523ce4e080f70dfcb23c56c
-SIZE (opendnssec-2.1.6.tar.gz) = 1122405
+TIMESTAMP = 1601891664
+SHA256 (opendnssec-2.1.7.tar.gz) = 4cf3a797b8ff9fb0c02432187ef22adeb03d007074d70ec2b48b18ae6c1d09a4
+SIZE (opendnssec-2.1.7.tar.gz) = 1123558
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h
deleted file mode 100644
index 581f43d83910..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/daemon/ctrl_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/ctrl_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _CTRL_CMD_H_
- #define _CTRL_CMD_H_
- 
--struct cmd_func_block ctrl_funcblock;
-+extern struct cmd_func_block ctrl_funcblock;
- 
- #endif /* _CTRL_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.c b/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.c
deleted file mode 100644
index b3a1cdcb4146..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- enforcer/src/daemon/enforcercommands.c.orig	2020-02-10 17:25:12 UTC
-+++ enforcer/src/daemon/enforcercommands.c
-@@ -98,7 +98,7 @@ static struct cmd_func_block* enforcecommands[] = {
-         NULL
- };
- 
--struct cmd_func_block** enforcercommands = enforcecommands;
-+extern struct cmd_func_block** enforcercommands = enforcecommands;
- 
- engine_type*
- getglobalcontext(cmdhandler_ctx_type* context)
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.h
deleted file mode 100644
index dc7594d34c4e..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- enforcer/src/daemon/enforcercommands.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/enforcercommands.h
-@@ -37,7 +37,7 @@
- #include "engine.h"
- #include "db/db_connection.h"
- 
--struct cmd_func_block** enforcercommands;
-+extern struct cmd_func_block** enforcercommands;
- 
- engine_type* getglobalcontext(cmdhandler_ctx_type*);
- db_connection_t* getconnectioncontext(cmdhandler_ctx_type*);
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_help__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_help__cmd.h
deleted file mode 100644
index 16a0d9c40357..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_help__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/daemon/help_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/help_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _HELP_CMD_H_
- #define _HELP_CMD_H_
- 
--struct cmd_func_block help_funcblock;
-+extern struct cmd_func_block help_funcblock;
- 
- #endif /* _HELP_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_queue__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_queue__cmd.h
deleted file mode 100644
index 189c4058ec7d..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_queue__cmd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- enforcer/src/daemon/queue_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/queue_cmd.h
-@@ -29,7 +29,7 @@
- #ifndef _QUEUE_CMD_H_
- #define _QUEUE_CMD_H_
- 
--struct cmd_func_block queue_funcblock;
--struct cmd_func_block flush_funcblock;
-+extern struct cmd_func_block queue_funcblock;
-+extern struct cmd_func_block flush_funcblock;
- 
- #endif /* _QUEUE_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_time__leap__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_time__leap__cmd.h
deleted file mode 100644
index 18103ce49da6..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_time__leap__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/daemon/time_leap_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/time_leap_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _TIME_LEAP_CMD_H_
- #define _TIME_LEAP_CMD_H_
- 
--struct cmd_func_block time_leap_funcblock;
-+extern struct cmd_func_block time_leap_funcblock;
- 
- #endif /* _TIME_LEAP_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_verbosity__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_verbosity__cmd.h
deleted file mode 100644
index ab9814d2cd12..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_daemon_verbosity__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/daemon/verbosity_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/daemon/verbosity_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _VERBOSITY_CMD_H_
- #define _VERBOSITY_CMD_H_
- 
--struct cmd_func_block verbosity_funcblock;
-+extern struct cmd_func_block verbosity_funcblock;
- 
- #endif /* _VERBOSITY_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_enforcer_enforce__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_enforcer_enforce__cmd.h
deleted file mode 100644
index 5e450d558b75..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_enforcer_enforce__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/enforcer/enforce_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/enforcer/enforce_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _ENFORCER_ENFORCE_CMD_H_
- #define _ENFORCER_ENFORCE_CMD_H_
- 
--struct cmd_func_block enforce_funcblock;
-+extern struct cmd_func_block enforce_funcblock;
- 
- #endif /* _ENFORCER_ENFORCE_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_enforcer_repositorylist__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_enforcer_repositorylist__cmd.h
deleted file mode 100644
index de46cc8f8790..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_enforcer_repositorylist__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/enforcer/repositorylist_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/enforcer/repositorylist_cmd.h
-@@ -28,6 +28,6 @@
- #ifndef _ENFORCER_REPOSITORYLIST_CMD_H_
- #define _ENFORCER_REPOSITORYLIST_CMD_H_
- 
--struct cmd_func_block repositorylist_funcblock;
-+extern struct cmd_func_block repositorylist_funcblock;
- 
- #endif
diff --git a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__all__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__all__cmd.h
deleted file mode 100644
index f97b45f603be..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__all__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/enforcer/update_all_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/enforcer/update_all_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef UPDATE_ALL_CMD_H_
- #define UPDATE_ALL_CMD_H_
- 
--struct cmd_func_block update_all_funcblock;
-+extern struct cmd_func_block update_all_funcblock;
- 
- #endif /* UPDATE_ALL_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__conf__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__conf__cmd.h
deleted file mode 100644
index d2cb9911ea43..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__conf__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/enforcer/update_conf_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/enforcer/update_conf_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef UPDATE_CONF_CMD_H_
- #define UPDATE_CONF_CMD_H_
- 
--struct cmd_func_block update_conf_funcblock;
-+extern struct cmd_func_block update_conf_funcblock;
- 
- #endif /* UPDATE_CONF_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__repositorylist__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__repositorylist__cmd.h
deleted file mode 100644
index 3724b4af04dc..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__repositorylist__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/enforcer/update_repositorylist_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/enforcer/update_repositorylist_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef UPDATE_REPOSITORYLIST_CMD_H_
- #define UPDATE_REPOSITORYLIST_CMD_H_
- 
--struct cmd_func_block update_repositorylist_funcblock;
-+extern struct cmd_func_block update_repositorylist_funcblock;
- 
- #endif /* UPDATE_REPOSITORYLIST_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_hsmkey_backup__hsmkeys__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_hsmkey_backup__hsmkeys__cmd.h
deleted file mode 100644
index 332f8a6a0289..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_hsmkey_backup__hsmkeys__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/hsmkey/backup_hsmkeys_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/hsmkey/backup_hsmkeys_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _HSMKEY_BACKUP_CMD_H_
- #define _HSMKEY_BACKUP_CMD_H_
- 
--struct cmd_func_block backup_funcblock;
-+extern struct cmd_func_block backup_funcblock;
- 
- #endif /* _HSMKEY_BACKUP_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_hsmkey_key__generate__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_hsmkey_key__generate__cmd.h
deleted file mode 100644
index cee9de9ea03b..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_hsmkey_key__generate__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/hsmkey/key_generate_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/hsmkey/key_generate_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef HSMKEY_KEY_GENERATE_CMD_H_
- #define HSMKEY_KEY_GENERATE_CMD_H_
- 
--struct cmd_func_block key_generate_funcblock;
-+extern struct cmd_func_block key_generate_funcblock;
- 
- #endif /* HSMKEY_KEY_GENERATE_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_key__purge__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_key__purge__cmd.h
deleted file mode 100644
index c7d94ca0ae70..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_key__purge__cmd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- enforcer/src/keystate/key_purge_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/key_purge_cmd.h
-@@ -1,7 +1,7 @@
- #ifndef _KEYSTATE_KEY_PURGE_CMD_H_
- #define _KEYSTATE_KEY_PURGE_CMD_H_
- 
--struct cmd_func_block key_purge_funcblock;
-+extern struct cmd_func_block key_purge_funcblock;
- 
- #endif /* _KEYSTATE_KEY_PURGE_CMD_H_ */
- 
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__gone__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__gone__cmd.h
deleted file mode 100644
index 42d756919700..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__gone__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_ds_gone_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_ds_gone_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_DS_GONE_CMD_H_
- #define _KEYSTATE_DS_GONE_CMD_H_
- 
--struct cmd_func_block key_ds_gone_funcblock;
-+extern struct cmd_func_block key_ds_gone_funcblock;
- 
- #endif /* _KEYSTATE_DS_GONE_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__retract__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__retract__cmd.h
deleted file mode 100644
index 3c49535e1f15..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__retract__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_ds_retract_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_ds_retract_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_DS_RETRACT_CMD_H_
- #define _KEYSTATE_DS_RETRACT_CMD_H_
- 
--struct cmd_func_block key_ds_retract_funcblock;
-+extern struct cmd_func_block key_ds_retract_funcblock;
- 
- #endif /* _KEYSTATE_DS_RETRACT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__seen__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__seen__cmd.h
deleted file mode 100644
index 31477368d519..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__seen__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_ds_seen_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_ds_seen_cmd.h
-@@ -32,6 +32,6 @@
- 
- #include "daemon/engine.h"
- 
--struct cmd_func_block key_ds_seen_funcblock;
-+extern struct cmd_func_block key_ds_seen_funcblock;
- 
- #endif /* _KEYSTATE_DS_SEEN_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__submit__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__submit__cmd.h
deleted file mode 100644
index cffd116335b2..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__submit__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_ds_submit_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_ds_submit_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_DS_SUBMIT_CMD_H_
- #define _KEYSTATE_DS_SUBMIT_CMD_H_
- 
--struct cmd_func_block key_ds_submit_funcblock;
-+extern struct cmd_func_block key_ds_submit_funcblock;
- 
- #endif /* _KEYSTATE_DS_SUBMIT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__export__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__export__cmd.h
deleted file mode 100644
index 049a46c23043..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__export__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_export_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_export_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_EXPORT_CMD_H_
- #define _KEYSTATE_EXPORT_CMD_H_
- 
--struct cmd_func_block key_export_funcblock;
-+extern struct cmd_func_block key_export_funcblock;
- 
- #endif /* _KEYSTATE_EXPORT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__import__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__import__cmd.h
deleted file mode 100644
index 1c00e63655b3..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__import__cmd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- enforcer/src/keystate/keystate_import_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_import_cmd.h
-@@ -28,7 +28,7 @@
- #ifndef _KEYSTATE_IMPORT_CMD_H_
- #define _KEYSTATE_IMPORT_CMD_H_
- 
--struct cmd_func_block key_import_funcblock;
-+extern struct cmd_func_block key_import_funcblock;
- 
- #endif /* _KEYSTATE_IMPORT_CMD_H_ */
- 
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__list__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__list__cmd.h
deleted file mode 100644
index e9eb7648eed9..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__list__cmd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- enforcer/src/keystate/keystate_list_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_list_cmd.h
-@@ -32,7 +32,7 @@
- 
- #include "db/key_data.h"
- 
--struct cmd_func_block key_list_funcblock;
-+extern struct cmd_func_block key_list_funcblock;
- 
- const char* map_keystate(key_data_t *key);
- 
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__rollover__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__rollover__cmd.h
deleted file mode 100644
index 08234972e341..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__rollover__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/keystate_rollover_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/keystate_rollover_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_ROLLOVER_CMD_H_
- #define _KEYSTATE_ROLLOVER_CMD_H_
- 
--struct cmd_func_block key_rollover_funcblock;
-+extern struct cmd_func_block key_rollover_funcblock;
- 
- #endif /* _KEYSTATE_ROLLOVER_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_rollover__list__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_rollover__list__cmd.h
deleted file mode 100644
index a2f80d37a161..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_rollover__list__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/rollover_list_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/rollover_list_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _ROLLOVER_LIST_CMD_H_
- #define _ROLLOVER_LIST_CMD_H_
- 
--struct cmd_func_block rollover_list_funcblock;
-+extern struct cmd_func_block rollover_list_funcblock;
- 
- #endif /* _ROLLOVER_LIST_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__add__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__add__cmd.h
deleted file mode 100644
index 3baff29e1530..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__add__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zone_add_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/zone_add_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_ZONE_ADD_CMD_H_
- #define _KEYSTATE_ZONE_ADD_CMD_H_
- 
--struct cmd_func_block zone_add_funcblock;
-+extern struct cmd_func_block zone_add_funcblock;
- 
- #endif /* _KEYSTATE_ZONE_ADD_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__del__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__del__cmd.h
deleted file mode 100644
index 07c69f685871..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__del__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zone_del_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/zone_del_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_ZONE_DEL_CMD_H_
- #define _KEYSTATE_ZONE_DEL_CMD_H_
- 
--struct cmd_func_block zone_del_funcblock;
-+extern struct cmd_func_block zone_del_funcblock;
- 
- #endif /* _KEYSTATE_ZONE_DEL_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__list__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__list__cmd.h
deleted file mode 100644
index 6970f3f27e2e..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__list__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zone_list_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/zone_list_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _KEYSTATE_ZONE_LIST_CMD_H_
- #define _KEYSTATE_ZONE_LIST_CMD_H_
- 
--struct cmd_func_block zone_list_funcblock;
-+extern struct cmd_func_block zone_list_funcblock;
- 
- #endif /* _KEYSTATE_ZONE_LIST_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__set__policy__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__set__policy__cmd.h
deleted file mode 100644
index 4d3fbab46db9..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__set__policy__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zone_set_policy_cmd.h.orig	2020-02-10 17:25:12 UTC
-+++ enforcer/src/keystate/zone_set_policy_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _KEYSTATE_ZONE_SET_POLICY_CMD_H_
- #define _KEYSTATE_ZONE_SET_POLICY_CMD_H_
- 
--struct cmd_func_block zone_set_policy_funcblock;
-+extern struct cmd_func_block zone_set_policy_funcblock;
- 
- #endif /* _KEYSTATE_ZONE_SET_POLICY_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__export__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__export__cmd.h
deleted file mode 100644
index ea6e706acf8c..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__export__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zonelist_export_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/zonelist_export_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _KEYSTATE_ZONELIST_EXPORT_CMD_H_
- #define _KEYSTATE_ZONELIST_EXPORT_CMD_H_
- 
--struct cmd_func_block zonelist_export_funcblock;
-+extern struct cmd_func_block zonelist_export_funcblock;
- 
- #endif /* _KEYSTATE_ZONELIST_EXPORT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__import__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__import__cmd.h
deleted file mode 100644
index 4fe8f91d8ce1..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__import__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/keystate/zonelist_import_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/keystate/zonelist_import_cmd.h
-@@ -29,6 +29,6 @@
- #ifndef _KEYSTATE_ZONELIST_IMPORT_CMD_H_
- #define _KEYSTATE_ZONELIST_IMPORT_CMD_H_
- 
--struct cmd_func_block zonelist_import_funcblock;
-+extern struct cmd_func_block zonelist_import_funcblock;
- 
- #endif /* _KEYSTATE_ZONELIST_IMPORT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__export__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__export__cmd.h
deleted file mode 100644
index 6fd6a1262539..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__export__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/policy/policy_export_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/policy/policy_export_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _POLICY_POLICY_EXPORT_CMD_H_
- #define _POLICY_POLICY_EXPORT_CMD_H_
- 
--struct cmd_func_block policy_export_funcblock;
-+extern struct cmd_func_block policy_export_funcblock;
- 
- #endif /* _POLICY_POLICY_EXPORT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__import__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__import__cmd.h
deleted file mode 100644
index 807abf68c116..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__import__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/policy/policy_import_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/policy/policy_import_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _POLICY_POLICY_IMPORT_CMD_H_
- #define _POLICY_POLICY_IMPORT_CMD_H_
- 
--struct cmd_func_block policy_import_funcblock;
-+extern struct cmd_func_block policy_import_funcblock;
- 
- #endif /* _POLICY_POLICY_IMPORT_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__list__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__list__cmd.h
deleted file mode 100644
index 4e24c7ecf2b0..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__list__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/policy/policy_list_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/policy/policy_list_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _POLICY_POLICY_LIST_CMD_H_
- #define _POLICY_POLICY_LIST_CMD_H_
- 
--struct cmd_func_block policy_list_funcblock;
-+extern struct cmd_func_block policy_list_funcblock;
- 
- #endif /* _POLICY_POLICY_LIST_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__purge__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__purge__cmd.h
deleted file mode 100644
index 0bedae9c0e7f..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__purge__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/policy/policy_purge_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/policy/policy_purge_cmd.h
-@@ -1,6 +1,6 @@
- #ifndef _POLICY_POLICY_PURGE_CMD_H_
- #define _POLICY_POLICY_PURGE_CMD_H_
- 
--struct cmd_func_block policy_purge_funcblock;
-+extern struct cmd_func_block policy_purge_funcblock;
- 
- #endif /* _POLICY_POLICY_PURGE_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__resalt__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__resalt__cmd.h
deleted file mode 100644
index 7ce76ebfa443..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_policy_policy__resalt__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/policy/policy_resalt_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/policy/policy_resalt_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _POLICY_POLICY_RESALT_CMD_H_
- #define _POLICY_POLICY_RESALT_CMD_H_
- 
--struct cmd_func_block resalt_funcblock;
-+extern struct cmd_func_block resalt_funcblock;
- 
- #endif /*_POLICY_POLICY_RESALT_CMD_H_*/
diff --git a/dns/opendnssec2/files/patch-enforcer_src_signconf_signconf__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_signconf_signconf__cmd.h
deleted file mode 100644
index 9004248083dc..000000000000
--- a/dns/opendnssec2/files/patch-enforcer_src_signconf_signconf__cmd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- enforcer/src/signconf/signconf_cmd.h.orig	2020-02-10 17:25:11 UTC
-+++ enforcer/src/signconf/signconf_cmd.h
-@@ -30,6 +30,6 @@
- #ifndef _SIGNCONF_SIGNCONF_CMD_H_
- #define _SIGNCONF_SIGNCONF_CMD_H_
- 
--struct cmd_func_block signconf_funcblock;
-+extern struct cmd_func_block signconf_funcblock;
- 
- #endif /* _SIGNCONF_SIGNCONF_CMD_H_ */
diff --git a/dns/opendnssec2/files/patch-signer_src_daemon_signercommands.h b/dns/opendnssec2/files/patch-signer_src_daemon_signercommands.h
deleted file mode 100644
index edb2af5953c3..000000000000
--- a/dns/opendnssec2/files/patch-signer_src_daemon_signercommands.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- signer/src/daemon/signercommands.h.orig	2020-02-10 17:25:11 UTC
-+++ signer/src/daemon/signercommands.h
-@@ -35,7 +35,7 @@
- #include "config.h"
- #include "cmdhandler.h"
- 
--struct cmd_func_block** signercommands;
-+extern struct cmd_func_block** signercommands;
- 
- extern engine_type* getglobalcontext(cmdhandler_ctx_type*);
-