update to libldns-1.8.2

2022-08-12 13:16:45 +00:00 · 2022-08-12 13:16:45 +00:00 · e8fcb14a30
commit e8fcb14a30
parent a9b45e4611
7 changed files with 6 additions and 100 deletions
--- a/net/ldns/Makefile
+++ b/net/ldns/Makefile
@ -4,13 +4,12 @@ COMMENT-main=	DNS library modelled after Net::DNS
 COMMENT-drill=	DNS debugger
 COMMENT-utils=	LDNS utilities

-V=		1.8.1
+V=		1.8.2
 DISTNAME=	ldns-$V
 PKGNAME-main=	libldns-$V
 PKGNAME-drill=	drill-$V
-REVISION-main=	1

-SHARED_LIBS +=	ldns                 7.2      # 3.0
+SHARED_LIBS +=	ldns                 8.0      # 7.0

 CATEGORIES=	net

--- a/net/ldns/distinfo
+++ b/net/ldns/distinfo
@ -1,2 +1,2 @@
-SHA256 (ldns-1.8.1.tar.gz) = lYIpq85NOqoZp1wNEnZmVksXIWkCGG6VLKSu9Hxtf6M=
-SIZE (ldns-1.8.1.tar.gz) = 1284971
+SHA256 (ldns-1.8.2.tar.gz) = uSsAHN04LeZTYgoFRF5C4XqCfuyT1k7lh60pGlM8wek=
+SIZE (ldns-1.8.2.tar.gz) = 1299263
--- a/net/ldns/patches/patch-dnssec_c
+++ b/net/ldns/patches/patch-dnssec_c
@ -1,24 +0,0 @@
-Fix build with opaque DSA/RSA in LibreSSL 3.5.
-https://github.com/NLnetLabs/ldns/pull/151
-
-Index: dnssec.c
--- dnssec.c.orig
-+++ dnssec.c
-@@ -380,7 +380,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t 
- 		BN_free(Y);
- 		return NULL;
- 	}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- #ifndef S_SPLINT_S
- 	dsa->p = P;
- 	dsa->q = Q;
-@@ -466,7 +466,7 @@ ldns_key_buf2rsa_raw(const unsigned char* key, size_t 
- 		BN_free(modulus);
- 		return NULL;
- 	}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- #ifndef S_SPLINT_S
- 	rsa->n = modulus;
- 	rsa->e = exponent;
--- a/net/ldns/patches/patch-host2str_c
+++ b/net/ldns/patches/patch-host2str_c
@ -1,24 +0,0 @@
-Fix build with opaque DSA/RSA in LibreSSL 3.5.
-https://github.com/NLnetLabs/ldns/pull/151
-
-Index: host2str.c
--- host2str.c.orig
-+++ host2str.c
-@@ -2207,7 +2207,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_ke
- 					const BIGNUM *n=NULL, *e=NULL, *d=NULL,
- 						*p=NULL, *q=NULL, *dmp1=NULL,
- 						*dmq1=NULL, *iqmp=NULL;
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- 					n = rsa->n;
- 					e = rsa->e;
- 					d = rsa->d;
-@@ -2259,7 +2259,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_ke
- 				if(1) {
- 					const BIGNUM *p=NULL, *q=NULL, *g=NULL,
- 						*priv_key=NULL, *pub_key=NULL;
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- #ifndef S_SPLINT_S
- 					p = dsa->p;
- 					q = dsa->q;
--- a/net/ldns/patches/patch-keys_c
+++ b/net/ldns/patches/patch-keys_c
@ -1,33 +0,0 @@
-Fix build with opaque DSA/RSA in LibreSSL 3.5.
-https://github.com/NLnetLabs/ldns/pull/151
-
-Index: keys.c
--- keys.c.orig
-+++ keys.c
-@@ -860,7 +860,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr)
- 	}
- #endif /* splint */
- 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- # ifndef S_SPLINT_S
- 	rsa->n = n;
- 	rsa->e = e;
-@@ -980,7 +980,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *li
- 	}
- #endif /* splint */
- 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- # ifndef S_SPLINT_S
- 	dsa->p = p;
- 	dsa->q = q;
-@@ -1657,7 +1657,7 @@ ldns_key_rsa2bin(unsigned char *data, RSA *k, uint16_t
- 	if (!k) {
- 		return false;
- 	}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- 	n = k->n;
- 	e = k->e;
- #else
--- a/net/ldns/patches/patch-ldns_keys_h
+++ b/net/ldns/patches/patch-ldns_keys_h
@ -4,20 +4,7 @@ non-ldns-related purpose
 Index: ldns/keys.h
 --- ldns/keys.h.orig
 +++ ldns/keys.h
-@@ -59,10 +59,10 @@ enum ldns_enum_algorithm
-         LDNS_ECC_GOST           = 12,  /* RFC 5933 */
-         LDNS_ECDSAP256SHA256    = 13,  /* RFC 6605 */
-         LDNS_ECDSAP384SHA384    = 14,  /* RFC 6605 */
-#if LDNS_BUILD_CONFIG_USE_ED25519
-+#if LDNS_BUILD_CONFIG_USE_ED25519 || USE_ED25519
- 	LDNS_ED25519		= 15,  /* RFC 8080 */
- #endif /* LDNS_BUILD_CONFIG_USE_ED25519 */
-#if LDNS_BUILD_CONFIG_USE_ED448
-+#if LDNS_BUILD_CONFIG_USE_ED448 || USE_ED448
- 	LDNS_ED448		= 16,  /* RFC 8080 */
- #endif /* LDNS_BUILD_CONFIG_USE_ED448 */
-         LDNS_INDIRECT           = 252,
-@@ -102,10 +102,10 @@ enum ldns_enum_signing_algorithm
+@@ -94,10 +94,10 @@ enum ldns_enum_signing_algorithm
 	LDNS_SIGN_ECC_GOST       = LDNS_ECC_GOST,
         LDNS_SIGN_ECDSAP256SHA256 = LDNS_ECDSAP256SHA256,
         LDNS_SIGN_ECDSAP384SHA384 = LDNS_ECDSAP384SHA384,
--- a/net/ldns/pkg/PLIST-main
+++ b/net/ldns/pkg/PLIST-main
@ -10,6 +10,7 @@ include/ldns/dnssec_sign.h
 include/ldns/dnssec_verify.h
 include/ldns/dnssec_zone.h
 include/ldns/duration.h
+include/ldns/edns.h
 include/ldns/error.h
 include/ldns/higher.h
 include/ldns/host2str.h