pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fix duplicate declaration in ldns header



Can this please be backported?
https://git.nlnetlabs.nl/ldns/commit/ldns/dnssec_verify.h?h=release-1.7.x&id=c0c45a9201b61d9d1de3b5ef1b0f3a381526f683

Or the below applied if google doesn't mangle it ...

diff --git a/net/ldns/distinfo b/net/ldns/distinfo
index 86412520cfe..ba7bdb1629e 100644
--- a/net/ldns/distinfo
+++ b/net/ldns/distinfo
@@ -8,3 +8,4 @@ SHA1 (patch-doc_doxyparse.pl) =
8d21d6f1c2e5e8d9ecc16a23dc7a462f0c54b5f7
 SHA1 (patch-examples_ldns-keygen.c) = 12ab1cb2c74f09d763969298a21c9470b748d292
 SHA1 (patch-parse.c) = 3dbf4443b4a068f02e2799e820e8fcbf50abaa15
 SHA1 (patch-str2host.c) = 002e2f04059a9bc2479a8d66335595d4d7dd598f
+SHA1 (patch-ldns-dnssec_verify_h) = 9e69835f5b47bfedc234d66f8e95d3814859eba0
diff --git a/net/ldns/patches/patch-ldns-dnssec_verify_h
b/net/ldns/patches/patch-ldns-dnssec_verify_h
new file mode 100644
index 00000000000..eb213e2a3e4
--- /dev/null
+++ b/net/ldns/patches/patch-ldns-dnssec_verify_h
@@ -0,0 +1,25 @@
+--- ldns/dnssec_verify.h.1.6.17        2018-05-25 20:00:51.167365062 -0400
++++ ldns/dnssec_verify.h       2018-05-25 20:01:38.658393605 -0400
+@@ -296,22 +296,6 @@
+
+
+ /**
+- * Sub function for derive_trust_tree that is used for DNSKEY rrsets
+- *
+- * \param[in] new_tree The trust tree that we are building
+- * \param[in] data_chain The data chain containing the data for the trust tree
+- * \param[in] cur_rr The currently relevant DNSKEY RR
+- * \param[in] cur_sig_rr The currently relevant signature
+- * \param[in] check_time the time for which the validation is performed
+- */
+-void ldns_dnssec_derive_trust_tree_dnskey_rrset_time(
+-         ldns_dnssec_trust_tree *new_tree,
+-          ldns_dnssec_data_chain *data_chain,
+-          ldns_rr *cur_rr, ldns_rr *cur_sig_rr,
+-          time_t check_time);
+-
+-
+-/**
+  * Sub function for derive_trust_tree that is used for DS rrsets
+  *
+  * \param[in] new_tree The trust tree that we are building


Home | Main Index | Thread Index | Old Index