diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile index 16085e07a169..b0615077cf4d 100644 --- a/dns/opendnssec2/Makefile +++ b/dns/opendnssec2/Makefile @@ -1,96 +1,99 @@ # Created by: Jaap Akkerhuis # $FreeBSD$ PORTNAME= opendnssec PORTVERSION= 2.1.6 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://dist.opendnssec.org/source/ PKGNAMESUFFIX= 2 MAINTAINER= jaap@NLnetLabs.nl COMMENT= Tool suite for maintaining DNSSEC LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ldns>=1.6.16:dns/ldns LIB_DEPENDS= libldns.so:dns/ldns -USES= ssl gnome +USES= ssl gnome dos2unix USE_RC_SUBR= opendnssec USE_GNOME= libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" \ --with-ssl=${OPENSSLBASE} SUB_FILES= pkg-message CONFLICTS= opendnssec-1.[0-4]* USERS= opendnssec GROUPS= opendnssec PORTDOCS= MIGRATION NEWS README.md MIGRATE= README.md find_problematic_zones.sql \ convert_mysql mysql_convert.sql \ convert_sqlite sqlite_convert.sql CONVERT= convert_mysql_to_sqlite convert_sqlite_to_mysql SCHEMAS= schema.mysql schema.sqlite OPTIONS_DEFINE= SOFTHSM DOCS OPTIONS_DEFAULT= SQLITE OPTIONS_SUB= yes OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= SQLITE MYSQL SOFTHSM_DESC= SoftHSM cryptographic store for PKCS \#11 interface MYSQL_DESC= Use MYSQL backend SQLITE_DESC= Use SQLite backend MYSQL_CONFIGURE_ON= --with-enforcer-database=mysql MYSQL_USES= mysql SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-enforcer-database=sqlite3 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 -post-patch: +INSTALL_TARGET= install-strip + +pre-build: ${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \ ${WRKSRC}/configure pre-install-MYSQL-on: ${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert ${INSTALL_DATA} \ ${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \ ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert ${INSTALL_DATA} \ ${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \ ${STAGEDIR}${DOCSDIR} ${REINPLACE_CMD} -e 's|enforcer/utils/|${DOCSDIR}/|' \ ${STAGEDIR}${DOCSDIR}/MIGRATION ${INSTALL_DATA} \ ${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \ ${STAGEDIR}${DOCSDIR} ${REINPLACE_CMD} -e 's|../src/db/schema|${DOCSDIR}/schema|' \ -e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ -e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ -e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ ${STAGEDIR}${DOCSDIR}/convert_* ${REINPLACE_CMD} -e 's|../../src/db/schema|${DOCSDIR}/schema|' \ -e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ -e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ -e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert/convert_* .include diff --git a/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h b/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h new file mode 100644 index 000000000000..581f43d83910 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_ctrl__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..b3a1cdcb4146 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.c @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..dc7594d34c4e --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_enforcercommands.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..16a0d9c40357 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_help__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..189c4058ec7d --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_queue__cmd.h @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..18103ce49da6 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_time__leap__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..ab9814d2cd12 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_daemon_verbosity__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..5e450d558b75 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_enforcer_enforce__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..de46cc8f8790 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_enforcer_repositorylist__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..f97b45f603be --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__all__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..d2cb9911ea43 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__conf__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..3724b4af04dc --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_enforcer_update__repositorylist__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..332f8a6a0289 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_hsmkey_backup__hsmkeys__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..cee9de9ea03b --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_hsmkey_key__generate__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..c7d94ca0ae70 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_key__purge__cmd.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..42d756919700 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__gone__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..3c49535e1f15 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__retract__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..31477368d519 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__seen__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..cffd116335b2 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__ds__submit__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..049a46c23043 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__export__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..1c00e63655b3 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__import__cmd.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..e9eb7648eed9 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__list__cmd.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..08234972e341 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_keystate__rollover__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..a2f80d37a161 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_rollover__list__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..3baff29e1530 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__add__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..07c69f685871 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__del__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..6970f3f27e2e --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__list__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..4d3fbab46db9 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zone__set__policy__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..ea6e706acf8c --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__export__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..4fe8f91d8ce1 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_keystate_zonelist__import__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..6fd6a1262539 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__export__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..807abf68c116 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__import__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..4e24c7ecf2b0 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__list__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..0bedae9c0e7f --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__purge__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..7ce76ebfa443 --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_policy_policy__resalt__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..9004248083dc --- /dev/null +++ b/dns/opendnssec2/files/patch-enforcer_src_signconf_signconf__cmd.h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..edb2af5953c3 --- /dev/null +++ b/dns/opendnssec2/files/patch-signer_src_daemon_signercommands.h @@ -0,0 +1,11 @@ +--- 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*); +