update to dnsperf-2.3.4

This commit is contained in:
sthen 2020-05-17 13:41:22 +00:00
parent 059e20e3cf
commit 57274a51b2
6 changed files with 7 additions and 107 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2020/05/14 11:46:24 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2020/05/17 13:41:22 sthen Exp $
COMMENT = DNS performance testing tools
DISTNAME = dnsperf-2.3.3
DISTNAME = dnsperf-2.3.4
CATEGORIES = net benchmarks
@ -22,9 +22,9 @@ MASTER_SITES = https://www.dns-oarc.net/files/dnsperf/
LIB_DEPENDS = isc-bind-*-!geoip:net/isc-bind
CONFIGURE_STYLE = autoconf
CONFIGURE_ENV = CPPFLAGS=-I${LOCALBASE}/include
AUTOCONF_VERSION = 2.69
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
# Drop README, Changelog etc.
post-install:

View File

@ -1,2 +1,2 @@
SHA256 (dnsperf-2.3.3.tar.gz) = 3lJwQBwbVT3rllqQwc8HG6ZO2nzbxY0HAmx+IOlSkWM=
SIZE (dnsperf-2.3.3.tar.gz) = 404063
SHA256 (dnsperf-2.3.4.tar.gz) = rcs60orUbvn/SiGMZ71eqand5Va5oncFmh85DOD4ZYE=
SIZE (dnsperf-2.3.4.tar.gz) = 406693

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.2 2020/02/25 13:38:30 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -65,10 +65,6 @@ elif test $use_bind = yes; then
else
bindpath="$withval/bin"
fi
-AC_PATH_PROG(ac_cv_isc_config, [isc-config.sh], [no], [$bindpath])
-if test "$ac_cv_isc_config" = "no"; then
- AC_MSG_ERROR([BIND 9 libraries must be installed])
-fi
case "$host_os" in
freebsd*)
@@ -77,8 +73,7 @@ case "$host_os" in
;;
esac
-AS_VAR_APPEND(CFLAGS, [" `$ac_cv_isc_config --cflags dns bind9`"])
-AS_VAR_APPEND(LDFLAGS, [" `$ac_cv_isc_config --libs dns bind9`"])
+AS_VAR_APPEND(LDFLAGS, ["-lbind9"])
AC_CHECK_HEADERS([isc/hmacmd5.h isc/hmacsha.h])

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_dns_c,v 1.1 2020/02/23 11:59:55 sthen Exp $
update for API change in newer BIND
https://github.com/isc-projects/bind9/commit/1b716a39f51200027388d90290488a648a8ccf5b
https://github.com/isc-projects/bind9/commit/4459745ff2425f38418acd5be2fcaf9bc969fc61
Index: src/dns.c
--- src/dns.c.orig
+++ src/dns.c
@@ -137,10 +137,7 @@ perf_dns_createctx(bool updates)
return NULL;
mctx = NULL;
- result = isc_mem_create(0, 0, &mctx);
- if (result != ISC_R_SUCCESS)
- perf_log_fatal("creating memory context: %s",
- isc_result_totext(result));
+ isc_mem_create(&mctx);
ctx = isc_mem_get(mctx, sizeof(*ctx));
if (ctx == NULL) {
@@ -373,9 +370,7 @@ perf_dns_parseednsoption(const char* arg, isc_mem_t* m
option->mctx = mctx;
option->buffer = NULL;
- result = isc_buffer_allocate(mctx, &option->buffer, strlen(value) / 2 + 4);
- if (result != ISC_R_SUCCESS)
- perf_log_fatal("out of memory");
+ isc_buffer_allocate(mctx, &option->buffer, strlen(value) / 2 + 4);
result = isc_parse_uint16(&code, copy, 0);
if (result != ISC_R_SUCCESS) {

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_dnsperf_c,v 1.1 2020/02/23 11:59:55 sthen Exp $
update for API change in newer BIND
https://github.com/isc-projects/bind9/commit/1b716a39f51200027388d90290488a648a8ccf5b
https://github.com/isc-projects/bind9/commit/4459745ff2425f38418acd5be2fcaf9bc969fc61
Index: src/dnsperf.c
--- src/dnsperf.c.orig
+++ src/dnsperf.c
@@ -389,10 +389,7 @@ setup(int argc, char** argv, config_t* config)
isc_result_t result;
const char* mode = 0;
- result = isc_mem_create(0, 0, &mctx);
- if (result != ISC_R_SUCCESS)
- perf_log_fatal("creating memory context: %s",
- isc_result_totext(result));
+ isc_mem_create(&mctx);
dns_result_register();

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_resperf_c,v 1.2 2020/05/14 11:46:24 sthen Exp $
update for API change in newer BIND
https://github.com/isc-projects/bind9/commit/1b716a39f51200027388d90290488a648a8ccf5b
https://github.com/isc-projects/bind9/commit/4459745ff2425f38418acd5be2fcaf9bc969fc61
Index: src/resperf.c
--- src/resperf.c.orig
+++ src/resperf.c
@@ -228,10 +228,7 @@ setup(int argc, char** argv)
isc_result_t result;
const char* _mode = 0;
- result = isc_mem_create(0, 0, &mctx);
- if (result != ISC_R_SUCCESS)
- perf_log_fatal("creating memory context: %s",
- isc_result_totext(result));
+ isc_mem_create(&mctx);
dns_result_register();