From owner-svn-ports-all@freebsd.org Tue Dec 11 12:35:00 2018 Return-Path: Delivered-To: svn-ports-all@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 9865F132FE98; Tue, 11 Dec 2018 12:35:00 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3EC916CF6E; Tue, 11 Dec 2018 12:35:00 +0000 (UTC) (envelope-from decke@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 19F2F2FAAF; Tue, 11 Dec 2018 12:35:00 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBBCYx03048750; Tue, 11 Dec 2018 12:34:59 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBBCYwLn048742; Tue, 11 Dec 2018 12:34:58 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201812111234.wBBCYwLn048742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Tue, 11 Dec 2018 12:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487232 - in head/dns/dnsperf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/dns/dnsperf: . files X-SVN-Commit-Revision: 487232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3EC916CF6E X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.99)[-0.987,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2018 12:35:00 -0000 Author: decke Date: Tue Dec 11 12:34:58 2018 New Revision: 487232 URL: https://svnweb.freebsd.org/changeset/ports/487232 Log: dns/dnsperf: Fix building with bind 9.12 and newer Patches are partially based on ISC upstream commit 64fe6bbaf2019f444475dfbf744eb6ea4e619c19 the other parts are mine. PR: 232774 Reported by: leeb@ratnaling.org Approved by: portmgr (blanket) Obtained from: https://gitlab.isc.org/isc-projects/bind9/commit/64fe6bbaf2019f444475dfbf744eb6ea4e619c19 Added: head/dns/dnsperf/files/patch-datafile.c (contents, props changed) head/dns/dnsperf/files/patch-dns.c (contents, props changed) head/dns/dnsperf/files/patch-dnsperf.c (contents, props changed) head/dns/dnsperf/files/patch-log.c (contents, props changed) head/dns/dnsperf/files/patch-opt.c (contents, props changed) head/dns/dnsperf/files/patch-os.c (contents, props changed) head/dns/dnsperf/files/patch-resperf.c (contents, props changed) Modified: head/dns/dnsperf/Makefile Modified: head/dns/dnsperf/Makefile ============================================================================== --- head/dns/dnsperf/Makefile Tue Dec 11 10:51:21 2018 (r487231) +++ head/dns/dnsperf/Makefile Tue Dec 11 12:34:58 2018 (r487232) @@ -3,7 +3,7 @@ PORTNAME= dnsperf PORTVERSION= 2.1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns benchmarks net MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-src-${PORTVERSION}-1 @@ -12,8 +12,6 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= Performance measurement of Domain Name System (DNS) servers LICENSE= ISCL - -BROKEN= fails to build BUILD_DEPENDS= isc-config.sh:dns/bind912 LIB_DEPENDS= liblmdb.so:databases/lmdb \ Added: head/dns/dnsperf/files/patch-datafile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-datafile.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,12 @@ +--- datafile.c.orig 2015-12-16 00:46:49 UTC ++++ datafile.c +@@ -23,7 +23,9 @@ + + #define ISC_BUFFER_USEINLINE + ++#include + #include ++#include + #include + + #include "datafile.h" Added: head/dns/dnsperf/files/patch-dns.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-dns.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,14 @@ +--- dns.c.orig 2015-12-16 00:46:50 UTC ++++ dns.c +@@ -41,9 +41,11 @@ + #define ISC_BUFFER_USEINLINE + + #include ++#include + #include + #include + #include ++#include + #include + #include + #include Added: head/dns/dnsperf/files/patch-dnsperf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-dnsperf.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,43 @@ +--- dnsperf.c.orig 2015-12-16 00:46:49 UTC ++++ dnsperf.c +@@ -52,8 +52,10 @@ + + #define ISC_BUFFER_USEINLINE + ++#include + #include + #include ++#include + #include + #include + #include +@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t + + printf("Statistics:\n\n"); + +- printf(" %s sent: %" ISC_PRINT_QUADFORMAT "u\n", ++ printf(" %s sent: %" PRIu64 "\n", + units, stats->num_sent); +- printf(" %s completed: %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n", ++ printf(" %s completed: %" PRIu64 " (%.2lf%%)\n", + units, stats->num_completed, + SAFE_DIV(100.0 * stats->num_completed, stats->num_sent)); +- printf(" %s lost: %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n", ++ printf(" %s lost: %" PRIu64 " (%.2lf%%)\n", + units, stats->num_timedout, + SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent)); + if (stats->num_interrupted > 0) +- printf(" %s interrupted: %" ISC_PRINT_QUADFORMAT "u " ++ printf(" %s interrupted: %" PRIu64 " " + "(%.2lf%%)\n", + units, stats->num_interrupted, + SAFE_DIV(100.0 * stats->num_interrupted, +@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t + first_rcode = ISC_FALSE; + else + printf(", "); +- printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)", ++ printf("%s %" PRIu64 " (%.2lf%%)", + perf_dns_rcode_strings[i], stats->rcodecounts[i], + (stats->rcodecounts[i] * 100.0) / stats->num_completed); + } Added: head/dns/dnsperf/files/patch-log.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-log.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,11 @@ +--- log.c.orig 2015-12-16 00:46:50 UTC ++++ log.c +@@ -20,6 +20,8 @@ + #include + #include + ++#include ++ + #include "log.h" + #include "util.h" + Added: head/dns/dnsperf/files/patch-opt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-opt.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,12 @@ +--- opt.c.orig 2015-12-16 00:46:50 UTC ++++ opt.c +@@ -22,7 +22,9 @@ + + #include + ++#include + #include ++#include + #include + #include + Added: head/dns/dnsperf/files/patch-os.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-os.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,11 @@ +--- os.c.orig 2015-12-16 00:46:49 UTC ++++ os.c +@@ -22,6 +22,8 @@ + + #include + ++#include ++#include + #include + #include + Added: head/dns/dnsperf/files/patch-resperf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsperf/files/patch-resperf.c Tue Dec 11 12:34:58 2018 (r487232) @@ -0,0 +1,37 @@ +--- resperf.c.orig 2015-12-16 00:46:50 UTC ++++ resperf.c +@@ -46,8 +46,10 @@ + + #include + ++#include + #include + #include ++#include + #include + #include + #include +@@ -389,11 +391,11 @@ print_statistics(void) { + + printf("\nStatistics:\n\n"); + +- printf(" Queries sent: %" ISC_PRINT_QUADFORMAT "u\n", ++ printf(" Queries sent: %" PRIu64 "\n", + num_queries_sent); +- printf(" Queries completed: %" ISC_PRINT_QUADFORMAT "u\n", ++ printf(" Queries completed: %" PRIu64 "\n", + num_responses_received); +- printf(" Queries lost: %" ISC_PRINT_QUADFORMAT "u\n", ++ printf(" Queries lost: %" PRIu64 "\n", + num_queries_sent - num_responses_received); + printf(" Response codes: "); + first_rcode = ISC_TRUE; +@@ -404,7 +406,7 @@ print_statistics(void) { + first_rcode = ISC_FALSE; + else + printf(", "); +- printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)", ++ printf("%s %" PRIu64 " (%.2lf%%)", + perf_dns_rcode_strings[i], rcodecounts[i], + (rcodecounts[i] * 100.0) / num_responses_received); + }