From 81cdbe6fdd800d1feefd43c4b449e2bb66115a53 Mon Sep 17 00:00:00 2001 From: maya Date: Wed, 16 Oct 2019 10:05:28 +0000 Subject: [PATCH] dnsperf: update to 2.3.2. Changed upstream to DNS-OARC. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2019-08-23 Jerry Lundström Release 2.3.2 This release fixes a buffer overflow when using TSIG and algorithms with digests larger then SHA256, reported by Mukund Sivaraman. Also fix build dependencies for `sqrt()`. e54aa58 Digest bca5d8d sqrt d9eaa5b Package 2019-07-24 Jerry Lundström Release 2.3.1 After a report and additional confirming results the use of `poll()` in the network receive code for TCP and TLS has been removed. This `poll()` initially gave better results while testing in a docker container on it's loopback interface but when on physical networks it reduced performance to 1/12th, so it had to go. Thanks to Brian Wellington (Akamai/Nominum) for the initial report and testing, and to Jan Hák (CZ.NIC) for testing and confirming the results. Bugfix: - Fix check for having more DNS messages in the receive buffer for TCP and TLS 670db9c TCP/TLS receive b8925b2 recvbuf have more 2019-07-17 Jerry Lundström Release 2.3.0 This release adds support for DNS over TCP and TLS which can be selected by using the mode option for `dnsperf` and `resperf`. The default server port used is now determined by the transport mode, udp/tcp port 53 and tls port 853. Note that the mode option is different between the program because it was already taken for `resperf`. `dnsperf` changes: - Add `-m` for setting transport mode, `udp` (default), `tcp` or `tls` - Add verbose messages about network readiness and congestion `resperf` changes: - Add `-M` for setting transport mode, `udp` (default), `tcp` or `tls` - Add `-v` for verbose mode to report about network readiness and congestion ffa49cf LGTM, SonarCloud 4cd5441 TLS 35624d1 TCP send, socket ready loop fbf76aa TCP support 5988b06 Funding 2019-01-28 Jerry Lundström Release 2.2.1 The commit pulled from a fork that used `inttypes.h`, instead of ISC internal types, missed to remove the old conversion specifier. This was reported and fixed by Vladimír Čunát. 9534ce1 remove visible "u" characters after numbers 2019-01-25 Jerry Lundström Release 2.2.0 First release by DNS-OARC with a rework of the code to use autotools, semantic versioning 2.0 and bugfixes pulled from other's forks. Bugfixes: - Fix infinite loop in argument parsing - Fix min/max latency summing for multithreaded runs - Fix calculation of per_thread socket counts - Fixes to queryparse - Mark correctly end of file - Support python3 - Stop looping on end of file undefinitely - Fix compilation issues and work around missing `dns_fixedname_initname()` - Clang `scan-build` fixes Other changes: - add "configure --with-bind" option - Handle bind library changes to HMAC (see #22) and other differences between versions - Workaround issue on FreeBSD (see #23) - Use `snprintf()` and OpenBSD's `strlcat()` - Add/update build dependencies for Debia, Ubuntu, CentOS, FreeBSD and OpenBSD ae9bc91 Clang format b9bb085 CI, buildbot b84e41b Autotools, README, changelog a2e1732 License 9dcb661 Remove $Id markers, Principal Author and Reviewed tags from the full source tree 0677bf0 Use dns_fixedname_initname() where possible d8d4696 [master] add "configure --with-bind" option to dnsperf b71a280 Add deb based distros dependencies 439c614 Replace custom isc_boolean_t with C standard bool type 407ae7c Replace custom isc_u?intNN_t types with C99 u?intNN_t types c27afd4 Replace ISC_PRINT_QUADFORMAT with inttypes.h format constants 6fdb2f7 Fix queryparse 4909b78 README 2782d50 README.md: Rectify link to software e31ddf4 fix calculation of per_thread socket counts 3bd7fb4 Fix min/max latency summing for multithreaded runs 2207e27 Fix infinite loop in argument parsing. 3bfe97a Include the github URL; remove the bug reports section. 0cee04a Add note about bug reports. 62c4b32 add .gitignore c45f0be Initial import. 149172b Initial commit --- benchmarks/dnsperf/Makefile | 12 +++++------- benchmarks/dnsperf/PLIST | 5 ++++- benchmarks/dnsperf/distinfo | 15 +++++---------- benchmarks/dnsperf/patches/patch-Makefile.in | 15 --------------- benchmarks/dnsperf/patches/patch-datafile.h | 17 ----------------- benchmarks/dnsperf/patches/patch-dns.h | 15 --------------- benchmarks/dnsperf/patches/patch-os.h | 16 ---------------- benchmarks/dnsperf/patches/patch-util.h | 15 --------------- 8 files changed, 14 insertions(+), 96 deletions(-) delete mode 100644 benchmarks/dnsperf/patches/patch-Makefile.in delete mode 100644 benchmarks/dnsperf/patches/patch-datafile.h delete mode 100644 benchmarks/dnsperf/patches/patch-dns.h delete mode 100644 benchmarks/dnsperf/patches/patch-os.h delete mode 100644 benchmarks/dnsperf/patches/patch-util.h diff --git a/benchmarks/dnsperf/Makefile b/benchmarks/dnsperf/Makefile index 44b146d9f8ab..f58ae6c42a3c 100644 --- a/benchmarks/dnsperf/Makefile +++ b/benchmarks/dnsperf/Makefile @@ -1,18 +1,16 @@ -# $NetBSD: Makefile,v 1.10 2019/10/16 09:37:27 maya Exp $ +# $NetBSD: Makefile,v 1.11 2019/10/16 10:05:28 maya Exp $ -DISTNAME= dnsperf-src-2.1.0.0-1 -PKGNAME= dnsperf-2.1.0.0 -PKGREVISION= 2 +DISTNAME= dnsperf-2.3.2 CATEGORIES= benchmarks net -MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PKGBASE}/${PKGVERSION_NOREV}/ +MASTER_SITES= https://www.dns-oarc.net/files/dnsperf/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.nominum.com/support/measurement-tools/ +HOMEPAGE= https://www.dns-oarc.net/tools/dnsperf COMMENT= DNS server performance measurement tools LICENSE= mit GNU_CONFIGURE= yes -USE_TOOLS+= sh:run +USE_TOOLS+= sh:run pkg-config # This package needs "isc" include files and "isc-config.sh" to build. # The built-in check only considers "libbind". diff --git a/benchmarks/dnsperf/PLIST b/benchmarks/dnsperf/PLIST index e7d5027e621c..57aaff4bb327 100644 --- a/benchmarks/dnsperf/PLIST +++ b/benchmarks/dnsperf/PLIST @@ -1,6 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2013/11/30 20:31:18 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/10/16 10:05:28 maya Exp $ bin/dnsperf bin/resperf bin/resperf-report man/man1/dnsperf.1 man/man1/resperf.1 +share/doc/dnsperf/CHANGES +share/doc/dnsperf/LICENSE +share/doc/dnsperf/README.md diff --git a/benchmarks/dnsperf/distinfo b/benchmarks/dnsperf/distinfo index 16493a1512a6..f5ce5fb2c246 100644 --- a/benchmarks/dnsperf/distinfo +++ b/benchmarks/dnsperf/distinfo @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.4 2018/10/27 12:04:33 tron Exp $ +$NetBSD: distinfo,v 1.5 2019/10/16 10:05:28 maya Exp $ -SHA1 (dnsperf-src-2.1.0.0-1.tar.gz) = 1a5d32feb41dd174f82f57ba62389d3480619c91 -RMD160 (dnsperf-src-2.1.0.0-1.tar.gz) = 0392903f300750ca53785f342a547eee5eb9db6d -SHA512 (dnsperf-src-2.1.0.0-1.tar.gz) = 5571bd0855aba4affcdf81724919e60ab6762d646f8d9a6abf177a2a588675c636842f2fb708bf648004b9c411e9c9b68789f7c6bbbd87afc24c8299a21aa6c9 -Size (dnsperf-src-2.1.0.0-1.tar.gz) = 561502 bytes -SHA1 (patch-Makefile.in) = 9f5377a75d9674a3aeb12f933f0a552564534d91 -SHA1 (patch-datafile.h) = d05f41b5d02048ffe5ca7261cd0164202fb9821a -SHA1 (patch-dns.h) = 1c78fc5dd05c4eb32563c2cfacdabadfa9937c1b -SHA1 (patch-os.h) = 53b573fddee3495a8b8e73088b1a4742a6b1b9ae -SHA1 (patch-util.h) = 94893a9d867aabd43650e66ffbbb0995ceb9becd +SHA1 (dnsperf-2.3.2.tar.gz) = e533ac288de7e52d7b09b4e2fc059b380b1a9164 +RMD160 (dnsperf-2.3.2.tar.gz) = 3b7ebde9379fcdb268765ff934879c913c90ac5b +SHA512 (dnsperf-2.3.2.tar.gz) = b4fbfa40811174a0613ba333a57278262af2c424118c55ad3f0fe7bf4df07ae4ca4c5fb528ff659d98db61393399308b652bc9887c48ed24427c70343307f06d +Size (dnsperf-2.3.2.tar.gz) = 402223 bytes diff --git a/benchmarks/dnsperf/patches/patch-Makefile.in b/benchmarks/dnsperf/patches/patch-Makefile.in deleted file mode 100644 index 67dabbd473c7..000000000000 --- a/benchmarks/dnsperf/patches/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/11/30 20:31:18 tron Exp $ - -Don't attempt to strip shell scripts which breaks the installation. - ---- Makefile.in.orig 2012-03-02 02:25:22.000000000 +0000 -+++ Makefile.in 2013-11-30 19:48:44.000000000 +0000 -@@ -41,7 +41,7 @@ - install: all installdirs - ${INSTALL_PROGRAM} dnsperf ${DESTDIR}${bindir} - ${INSTALL_PROGRAM} resperf ${DESTDIR}${bindir} -- ${INSTALL_PROGRAM} resperf-report ${DESTDIR}${bindir} -+ ${BSD_INSTALL_SCRIPT} resperf-report ${DESTDIR}${bindir} - ${INSTALL_DATA} dnsperf.1 ${DESTDIR}${mandir}/man1 - ${INSTALL_DATA} resperf.1 ${DESTDIR}${mandir}/man1 - diff --git a/benchmarks/dnsperf/patches/patch-datafile.h b/benchmarks/dnsperf/patches/patch-datafile.h deleted file mode 100644 index 96709fd3137b..000000000000 --- a/benchmarks/dnsperf/patches/patch-datafile.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-datafile.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- datafile.h.orig 2015-12-16 00:46:49.000000000 +0000 -+++ datafile.h 2018-10-27 12:57:12.538706870 +0100 -@@ -19,6 +19,10 @@ - #define PERF_DATAFILE_H 1 - - #include -+#include -+#include -+ -+#define ISC_PRINT_QUADFORMAT PRIu64 - - typedef struct perf_datafile perf_datafile_t; - diff --git a/benchmarks/dnsperf/patches/patch-dns.h b/benchmarks/dnsperf/patches/patch-dns.h deleted file mode 100644 index 4985c1e7556a..000000000000 --- a/benchmarks/dnsperf/patches/patch-dns.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dns.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- dns.h.orig 2015-12-16 00:46:50.000000000 +0000 -+++ dns.h 2018-10-27 12:58:23.298408393 +0100 -@@ -33,6 +33,8 @@ - */ - - #include -+#include -+#include - - #ifndef PERF_DNS_H - #define PERF_DNS_H 1 diff --git a/benchmarks/dnsperf/patches/patch-os.h b/benchmarks/dnsperf/patches/patch-os.h deleted file mode 100644 index 941aab3b0611..000000000000 --- a/benchmarks/dnsperf/patches/patch-os.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-os.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- os.h.orig 2015-12-16 00:46:50.000000000 +0000 -+++ os.h 2018-10-27 12:59:42.370351276 +0100 -@@ -18,6 +18,9 @@ - #ifndef PERF_OS_H - #define PERF_OS_H 1 - -+#include -+#include -+ - void - perf_os_blocksignal(int sig, isc_boolean_t block); - diff --git a/benchmarks/dnsperf/patches/patch-util.h b/benchmarks/dnsperf/patches/patch-util.h deleted file mode 100644 index 69089fe9283a..000000000000 --- a/benchmarks/dnsperf/patches/patch-util.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-util.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- util.h.orig 2015-12-16 00:46:49.000000000 +0000 -+++ util.h 2018-10-27 12:59:01.184426825 +0100 -@@ -21,6 +21,8 @@ - #include - - #include -+#include -+#include - - #include "log.h" -