Update to 2.3.8.

While there, pass maintainership to submitter.

PR:		226539
Submitted by:	Leo Vandewoestijne
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2018-03-22 14:13:11 +00:00
parent 6f1e9fd48d
commit 4302d4db9a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465289
7 changed files with 15 additions and 88 deletions

View File

@ -1,14 +1,12 @@
# Created by: Mathieu Arnold <mat@FreeBSD.org>
# $FreeBSD$
PORTNAME= yadifa
PORTVERSION= 2.2.3
DISTVERSIONSUFFIX= -6711
PORTREVISION= 2
DISTVERSION= 2.3.8
DISTVERSIONSUFFIX= -7713
CATEGORIES= dns ipv6
MASTER_SITES= http://cdn.yadifa.eu/sites/default/files/releases/
MAINTAINER= mat@FreeBSD.org
MAINTAINER= freebsd@dns.company
COMMENT= Authoritative nameserver with DNSSEC capabilities
LICENSE= BSD3CLAUSE

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1483478486
SHA256 (yadifa-2.2.3-6711.tar.gz) = 4a7de1a1c17606c99e1f4ad2f9989268713283cd83eb6edfe0f283fe00a96e46
SIZE (yadifa-2.2.3-6711.tar.gz) = 3672934
TIMESTAMP = 1520801790
SHA256 (yadifa-2.3.8-7713.tar.gz) = cc84417ce8a15b72a76e57af74c5fed73f862f46defccb99569dc9ccc8fbb097
SIZE (yadifa-2.3.8-7713.tar.gz) = 3730104

View File

@ -1,20 +0,0 @@
--- lib/dnscore/src/dnskey_dsa.c.orig 2016-12-16 11:52:17 UTC
+++ lib/dnscore/src/dnskey_dsa.c
@@ -70,7 +70,7 @@
#error "OPENSSL_VERSION_NUMBER not defined"
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* Backward-compatible interface for 0.9.x
@@ -226,7 +226,7 @@ dnskey_dsa_genkey(u32 size)
int err;
DSA* dsa;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
dsa = DSA_generate_parameters(size, NULL,0, NULL, NULL, NULL, NULL);
#else
dsa = DSA_new();

View File

@ -1,11 +0,0 @@
--- lib/dnscore/src/dnskey_ecdsa.c.orig 2016-12-16 11:52:17 UTC
+++ lib/dnscore/src/dnskey_ecdsa.c
@@ -79,7 +79,7 @@
#define DNSKEY_ALGORITHM_ECDSAP256SHA256_NID NID_X9_62_prime256v1
#define DNSKEY_ALGORITHM_ECDSAP384SHA384_NID NID_secp384r1
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define SSL_FIELD_GET(st_,f_) if(f_ != NULL) { *f_ = st_->f_; }
#define SSL_FIELD_SET(st_,f_) if(f_ != NULL) { BN_free(st_->f_); st_->f_ = f_; }

View File

@ -1,11 +0,0 @@
--- lib/dnscore/src/dnskey_rsa.c.orig 2016-12-16 11:52:17 UTC
+++ lib/dnscore/src/dnskey_rsa.c
@@ -64,7 +64,7 @@
#define MODULE_MSG_HANDLE g_system_logger
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define SSL_FIELD_GET(st_,f_) if(f_ != NULL) { *f_ = st_->f_; }
#define SSL_FIELD_SET(st_,f_) if(f_ != NULL) { BN_free(st_->f_); st_->f_ = f_; }

View File

@ -1,29 +0,0 @@
--- lib/dnscore/src/tsig.c.orig 2016-12-16 11:52:17 UTC
+++ lib/dnscore/src/tsig.c
@@ -233,7 +233,7 @@
tsig_hmac_t
tsig_hmac_allocate()
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L // ie: 0.9.x
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) // ie: 0.9.x
HMAC_CTX *hmac;
ZALLOC_OR_DIE(HMAC_CTX*, hmac, HMAC_CTX, GENERIC_TAG);
HMAC_CTX_init(hmac);
@@ -257,7 +257,7 @@ tsig_hmac_free(tsig_hmac_t t)
{
HMAC_CTX *hmac = (HMAC_CTX*)t;
yassert(hmac != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX_cleanup(hmac);
ZFREE(t, HMAC_CTX);
#else
@@ -268,7 +268,7 @@ tsig_hmac_free(tsig_hmac_t t)
void tsig_hmac_reset(tsig_hmac_t t)
{
HMAC_CTX *hmac = (HMAC_CTX*)t;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX_cleanup(hmac);
HMAC_CTX_init(hmac);
#else

View File

@ -36,6 +36,7 @@ include/dnscore/dnscore-config.h
include/dnscore/dnscore.h
include/dnscore/dnsformat.h
include/dnscore/dnskey-keyring.h
include/dnscore/dnskey-signature.h
include/dnscore/dnskey.h
include/dnscore/dnskey_dsa.h
include/dnscore/dnskey_ecdsa.h
@ -55,6 +56,7 @@ include/dnscore/identity.h
include/dnscore/input_stream.h
include/dnscore/io_stream.h
include/dnscore/limited_input_stream.h
include/dnscore/limiter.h
include/dnscore/list-dl.h
include/dnscore/list-sl-debug.h
include/dnscore/list-sl.h
@ -121,6 +123,7 @@ include/dnscore/zalloc.h
include/dnscore/zonefile_reader.h
include/dnsdb/avl.h
include/dnsdb/btree.h
include/dnsdb/chain-replay.h
include/dnsdb/dictionary-node.h
include/dnsdb/dictionary.h
include/dnsdb/dnsdb-config.h
@ -128,12 +131,11 @@ include/dnsdb/dnsrdata.h
include/dnsdb/dnssec-keystore.h
include/dnsdb/dnssec.h
include/dnsdb/dnssec_config.h
include/dnsdb/dnssec_task.h
include/dnsdb/dynupdate.h
include/dnsdb/dynupdate-diff.h
include/dnsdb/hash.h
include/dnsdb/htable.h
include/dnsdb/htbt.h
include/dnsdb/icmtl_input_stream.h
include/dnsdb/journal-cjf-common.h
include/dnsdb/journal-cjf-idxt.h
include/dnsdb/journal-cjf-page-cache.h
@ -143,30 +145,27 @@ include/dnsdb/journal-cjf.h
include/dnsdb/journal.h
include/dnsdb/journal_ix.h
include/dnsdb/nsec.h
include/dnsdb/nsec3-chain-create.h
include/dnsdb/nsec3-chain-destroy.h
include/dnsdb/nsec-chain-replay.h
include/dnsdb/nsec3-chain-replay.h
include/dnsdb/nsec3-forall-label.h
include/dnsdb/nsec3.h
include/dnsdb/nsec3_collection.h
include/dnsdb/nsec3_hash.h
include/dnsdb/nsec3_icmtl.h
include/dnsdb/nsec3_item.h
include/dnsdb/nsec3_load.h
include/dnsdb/nsec3_name_error.h
include/dnsdb/nsec3_nodata_error.h
include/dnsdb/nsec3_owner.h
include/dnsdb/nsec3_rrsig_updater.h
include/dnsdb/nsec3_types.h
include/dnsdb/nsec3_update.h
include/dnsdb/nsec3_zone.h
include/dnsdb/nsec_collection.h
include/dnsdb/nsec_common.h
include/dnsdb/rr_canonize.h
include/dnsdb/rrsig.h
include/dnsdb/rrsig_updater.h
include/dnsdb/xfr_copy.h
include/dnsdb/zdb-config-features.h
include/dnsdb/zdb-lock.h
include/dnsdb/zdb-packed-ttlrdata.h
include/dnsdb/zdb-zone-answer-axfr.h
include/dnsdb/zdb-zone-answer-ixfr.h
include/dnsdb/zdb-zone-arc.h
@ -175,6 +174,8 @@ include/dnsdb/zdb-zone-find.h
include/dnsdb/zdb-zone-garbage.h
include/dnsdb/zdb-zone-journal.h
include/dnsdb/zdb-zone-lock.h
include/dnsdb/zdb-zone-lock-monitor.h
include/dnsdb/zdb-zone-maintenance.h
include/dnsdb/zdb-zone-path-provider.h
include/dnsdb/zdb-zone-reader-filter.h
include/dnsdb/zdb.h
@ -182,7 +183,6 @@ include/dnsdb/zdb_cache.h
include/dnsdb/zdb_config.h
include/dnsdb/zdb_error.h
include/dnsdb/zdb_icmtl.h
include/dnsdb/zdb_listener.h
include/dnsdb/zdb_record.h
include/dnsdb/zdb_rr_label.h
include/dnsdb/zdb_sanitize.h