From owner-svn-ports-head@freebsd.org Mon Jul 8 01:40:37 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9AC2215D0B28; Mon, 8 Jul 2019 01:40:37 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D53785B7D; Mon, 8 Jul 2019 01:40:37 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08F2E976E; Mon, 8 Jul 2019 01:40:37 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x681eacA090342; Mon, 8 Jul 2019 01:40:36 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x681eaBm090341; Mon, 8 Jul 2019 01:40:36 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201907080140.x681eaBm090341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 8 Jul 2019 01:40:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506199 - head/dns/dnsmasq/files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/dns/dnsmasq/files X-SVN-Commit-Revision: 506199 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3D53785B7D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.92)[-0.919,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jul 2019 01:40:37 -0000 Author: mandree Date: Mon Jul 8 01:40:36 2019 New Revision: 506199 URL: https://svnweb.freebsd.org/changeset/ports/506199 Log: Make compatible with nettle >= 3.5 (not yet in ports) Pull in patch from https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace Obtained from: Vladislav Grishenko Added: head/dns/dnsmasq/files/patch-src_crypto.c (contents, props changed) Added: head/dns/dnsmasq/files/patch-src_crypto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsmasq/files/patch-src_crypto.c Mon Jul 8 01:40:36 2019 (r506199) @@ -0,0 +1,31 @@ +--- src/crypto.c.orig 2018-10-18 18:21:55 UTC ++++ src/crypto.c +@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_ + static struct ecc_point *key_256 = NULL, *key_384 = NULL; + static mpz_t x, y; + static struct dsa_signature *sig_struct; ++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 ++#define nettle_get_secp_256r1() (&nettle_secp_256r1) ++#define nettle_get_secp_384r1() (&nettle_secp_384r1) ++#endif + + if (!sig_struct) + { +@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_ + if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_256, &nettle_secp_256r1); ++ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); + } + + key = key_256; +@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_ + if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_384, &nettle_secp_384r1); ++ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); + } + + key = key_384;