From owner-svn-ports-head@freebsd.org Tue Jan 29 12:18:26 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 452DD14BB690; Tue, 29 Jan 2019 12:18:26 +0000 (UTC) (envelope-from mat@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 DF2538413F; Tue, 29 Jan 2019 12:18:25 +0000 (UTC) (envelope-from mat@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 C97347811; Tue, 29 Jan 2019 12:18:25 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0TCIPG4037258; Tue, 29 Jan 2019 12:18:25 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0TCIPBL037257; Tue, 29 Jan 2019 12:18:25 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201901291218.x0TCIPBL037257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 29 Jan 2019 12:18:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491555 - head/dns/bind9-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/dns/bind9-devel/files X-SVN-Commit-Revision: 491555 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DF2538413F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,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: Tue, 29 Jan 2019 12:18:26 -0000 Author: mat Date: Tue Jan 29 12:18:25 2019 New Revision: 491555 URL: https://svnweb.freebsd.org/changeset/ports/491555 Log: Use official patch instead of my half baked one. No functionnal changes. Modified: head/dns/bind9-devel/files/patch-fix-quota (contents, props changed) Modified: head/dns/bind9-devel/files/patch-fix-quota ============================================================================== --- head/dns/bind9-devel/files/patch-fix-quota Tue Jan 29 11:23:39 2019 (r491554) +++ head/dns/bind9-devel/files/patch-fix-quota Tue Jan 29 12:18:25 2019 (r491555) @@ -1,50 +1,92 @@ +From 995134ce76e869cbcdc6c838570bd7d2f653dfa9 Mon Sep 17 00:00:00 2001 +From: Evan Hunt +Date: Mon, 28 Jan 2019 10:59:27 -0800 +Subject: [PATCH] rename struct members to avoid a name collision on BSD + --- lib/isc/include/isc/quota.h.orig 2019-01-25 09:45:27 UTC +++ lib/isc/include/isc/quota.h -@@ -44,7 +44,7 @@ ISC_LANG_BEGINDECLS +@@ -43,9 +43,9 @@ ISC_LANG_BEGINDECLS + /*% isc_quota structure */ struct isc_quota { - atomic_uint_fast32_t __max; +- atomic_uint_fast32_t __max; - atomic_uint_fast32_t __used; -+ atomic_uint_fast32_t _used; - atomic_uint_fast32_t __soft; +- atomic_uint_fast32_t __soft; ++ atomic_uint_fast32_t max; ++ atomic_uint_fast32_t used; ++ atomic_uint_fast32_t soft; }; + + lib/isc/include/isc/quota.h | 6 +++--- + lib/isc/quota.c | 34 +++++++++++++++++----------------- + 2 files changed, 20 insertions(+), 20 deletions(-) + --- lib/isc/quota.c.orig 2019-01-25 09:45:27 UTC +++ lib/isc/quota.c -@@ -24,15 +24,15 @@ +@@ -23,50 +23,50 @@ + void isc_quota_init(isc_quota_t *quota, unsigned int max) { - atomic_store("a->__max, max); +- atomic_store("a->__max, max); - atomic_store("a->__used, 0); -+ atomic_store("a->_used, 0); - atomic_store("a->__soft, 0); +- atomic_store("a->__soft, 0); ++ atomic_store("a->max, max); ++ atomic_store("a->used, 0); ++ atomic_store("a->soft, 0); } void isc_quota_destroy(isc_quota_t *quota) { - INSIST(atomic_load("a->__used) == 0); -+ INSIST(atomic_load("a->_used) == 0); - atomic_store("a->__max, 0); +- atomic_store("a->__max, 0); - atomic_store("a->__used, 0); -+ atomic_store("a->_used, 0); - atomic_store("a->__soft, 0); +- atomic_store("a->__soft, 0); ++ INSIST(atomic_load("a->used) == 0); ++ atomic_store("a->max, 0); ++ atomic_store("a->used, 0); ++ atomic_store("a->soft, 0); } -@@ -58,7 +58,7 @@ isc_quota_getsoft(isc_quota_t *quota) { + void + isc_quota_soft(isc_quota_t *quota, unsigned int soft) { +- atomic_store("a->__soft, soft); ++ atomic_store("a->soft, soft); + } + void + isc_quota_max(isc_quota_t *quota, unsigned int max) { +- atomic_store("a->__max, max); ++ atomic_store("a->max, max); + } + unsigned int + isc_quota_getmax(isc_quota_t *quota) { +- return (atomic_load_relaxed("a->__max)); ++ return (atomic_load_relaxed("a->max)); + } + + unsigned int + isc_quota_getsoft(isc_quota_t *quota) { +- return (atomic_load_relaxed("a->__soft)); ++ return (atomic_load_relaxed("a->soft)); + } + + unsigned int isc_quota_getused(isc_quota_t *quota) { - return (atomic_load_relaxed("a->__used)); -+ return (atomic_load_relaxed("a->_used)); ++ return (atomic_load_relaxed("a->used)); } isc_result_t -@@ -66,7 +66,7 @@ isc_quota_reserve(isc_quota_t *quota) { + isc_quota_reserve(isc_quota_t *quota) { isc_result_t result; - uint32_t max = atomic_load("a->__max); - uint32_t soft = atomic_load("a->__soft); +- uint32_t max = atomic_load("a->__max); +- uint32_t soft = atomic_load("a->__soft); - uint32_t used = atomic_fetch_add("a->__used, 1); -+ uint32_t used = atomic_fetch_add("a->_used, 1); ++ uint32_t max = atomic_load("a->max); ++ uint32_t soft = atomic_load("a->soft); ++ uint32_t used = atomic_fetch_add("a->used, 1); if (max == 0 || used < max) { if (soft == 0 || used < soft) { result = ISC_R_SUCCESS; @@ -53,7 +95,7 @@ } } else { - INSIST(atomic_fetch_sub("a->__used, 1) > 0); -+ INSIST(atomic_fetch_sub("a->_used, 1) > 0); ++ INSIST(atomic_fetch_sub("a->used, 1) > 0); result = ISC_R_QUOTA; } return (result); @@ -62,7 +104,7 @@ void isc_quota_release(isc_quota_t *quota) { - INSIST(atomic_fetch_sub("a->__used, 1) > 0); -+ INSIST(atomic_fetch_sub("a->_used, 1) > 0); ++ INSIST(atomic_fetch_sub("a->used, 1) > 0); } isc_result_t