From c6fd350716bd3e9836dc6967378eedc61decf203 Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 19 Nov 2016 12:25:27 +0000 Subject: [PATCH] update to opendnssec-1.4.12, from Patrik Lundin --- security/opendnssec/Makefile | 7 +++---- security/opendnssec/distinfo | 4 ++-- .../opendnssec/patches/patch-conf_conf_xml_in | 12 +++++------ .../patch-enforcer_ksm_database_access_lite_c | 12 +++++++++++ .../patches/patch-enforcer_utils_ksmutil_c | 12 ----------- .../patches/patch-signer_src_signer_zone_c | 21 ------------------- 6 files changed, 23 insertions(+), 45 deletions(-) create mode 100644 security/opendnssec/patches/patch-enforcer_ksm_database_access_lite_c delete mode 100644 security/opendnssec/patches/patch-enforcer_utils_ksmutil_c delete mode 100644 security/opendnssec/patches/patch-signer_src_signer_zone_c diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 9141eafdef4..53c4cf0927c 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2016/09/23 09:16:57 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2016/11/19 12:25:27 sthen Exp $ COMMENT= open-source turn-key solution for DNSSEC -DISTNAME= opendnssec-1.4.10 -REVISION= 0 +DISTNAME= opendnssec-1.4.12 CATEGORIES= security @@ -19,7 +18,6 @@ WANTLIB += c crypto iconv ldns lzma m pthread xml2 z MASTER_SITES= http://dist.opendnssec.org/source/ LIB_DEPENDS= converters/libiconv \ - databases/sqlite3 \ net/ldns/libldns \ textproc/libxml @@ -35,6 +33,7 @@ FLAVOR?= sqlite3 .if ${FLAVOR:Msqlite3} WANTLIB+= sqlite3 +LIB_DEPENDS+= databases/sqlite3 .endif .if ${FLAVOR:Mmysql} diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo index 4bcc7d21e3c..ec1c5096bf1 100644 --- a/security/opendnssec/distinfo +++ b/security/opendnssec/distinfo @@ -1,2 +1,2 @@ -SHA256 (opendnssec-1.4.10.tar.gz) = VbRMHaOmZe7wrx0bP00cV9IPUPd4WLHdPQPKbrwd98s= -SIZE (opendnssec-1.4.10.tar.gz) = 1036069 +SHA256 (opendnssec-1.4.12.tar.gz) = S6bPBvzRExwe2RPWGVndyQcm7V5PFTyQ9F7GREVSigw= +SIZE (opendnssec-1.4.12.tar.gz) = 1036392 diff --git a/security/opendnssec/patches/patch-conf_conf_xml_in b/security/opendnssec/patches/patch-conf_conf_xml_in index 8a3f7e8dcbd..73c12f47f49 100644 --- a/security/opendnssec/patches/patch-conf_conf_xml_in +++ b/security/opendnssec/patches/patch-conf_conf_xml_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-conf_conf_xml_in,v 1.1.1.1 2015/10/13 17:03:55 jca Exp $ ---- conf/conf.xml.in.orig Mon Jul 21 11:30:08 2014 -+++ conf/conf.xml.in Wed Aug 20 08:52:31 2014 -@@ -28,7 +28,7 @@ +$OpenBSD: patch-conf_conf_xml_in,v 1.2 2016/11/19 12:25:27 sthen Exp $ +--- conf/conf.xml.in.orig Mon Oct 17 14:32:58 2016 ++++ conf/conf.xml.in Mon Nov 14 18:41:45 2016 +@@ -31,7 +31,7 @@ 3 @@ -10,7 +10,7 @@ $OpenBSD: patch-conf_conf_xml_in,v 1.1.1.1 2015/10/13 17:03:55 jca Exp $ @OPENDNSSEC_CONFIG_DIR@/kasp.xml -@@ -36,19 +36,17 @@ +@@ -39,19 +39,17 @@ @@ -33,7 +33,7 @@ $OpenBSD: patch-conf_conf_xml_in,v 1.1.1.1 2015/10/13 17:03:55 jca Exp $ PT3600S -@@ -60,12 +58,10 @@ +@@ -63,12 +61,10 @@ diff --git a/security/opendnssec/patches/patch-enforcer_ksm_database_access_lite_c b/security/opendnssec/patches/patch-enforcer_ksm_database_access_lite_c new file mode 100644 index 00000000000..532238a99cc --- /dev/null +++ b/security/opendnssec/patches/patch-enforcer_ksm_database_access_lite_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-enforcer_ksm_database_access_lite_c,v 1.1 2016/11/19 12:25:27 sthen Exp $ +--- enforcer/ksm/database_access_lite.c.orig Mon Nov 14 18:59:16 2016 ++++ enforcer/ksm/database_access_lite.c Mon Nov 14 19:00:58 2016 +@@ -41,6 +41,8 @@ + #include + #include + ++#include ++ + #include + + #include "ksm/dbsdef.h" diff --git a/security/opendnssec/patches/patch-enforcer_utils_ksmutil_c b/security/opendnssec/patches/patch-enforcer_utils_ksmutil_c deleted file mode 100644 index e75b29fe905..00000000000 --- a/security/opendnssec/patches/patch-enforcer_utils_ksmutil_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-enforcer_utils_ksmutil_c,v 1.1 2016/06/14 11:29:46 jca Exp $ ---- enforcer/utils/ksmutil.c.orig Wed May 4 21:09:00 2016 -+++ enforcer/utils/ksmutil.c Wed May 4 21:09:22 2016 -@@ -6878,7 +6878,7 @@ int ListKeys(int zone_id) - hsm_key_t *key = NULL; - ldns_rr *dnskey_rr = NULL; - hsm_sign_params_t *sign_params = NULL; -- hsm_ctx_t* ctx; -+ hsm_ctx_t* ctx = NULL; - - if (verbose_flag) { - /* connect to the HSM */ diff --git a/security/opendnssec/patches/patch-signer_src_signer_zone_c b/security/opendnssec/patches/patch-signer_src_signer_zone_c deleted file mode 100644 index 40a7bf394b4..00000000000 --- a/security/opendnssec/patches/patch-signer_src_signer_zone_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-signer_src_signer_zone_c,v 1.1 2016/06/14 11:29:46 jca Exp $ ---- signer/src/signer/zone.c.orig Wed May 4 21:09:53 2016 -+++ signer/src/signer/zone.c Wed May 4 21:10:02 2016 -@@ -571,7 +571,7 @@ zone_add_rr(zone_type* zone, ldns_rr* rr, int do_stats - rr_type* record = NULL; - ods_status status = ODS_STATUS_OK; - char* str = NULL; -- int i; -+ size_t i; - - ods_log_assert(rr); - ods_log_assert(zone); -@@ -694,7 +694,7 @@ zone_del_nsec3params(zone_type* zone) - { - domain_type* domain = NULL; - rrset_type* rrset = NULL; -- int i; -+ size_t i; - - ods_log_assert(zone); - ods_log_assert(zone->name);