From nobody Thu Sep 15 22:36:19 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MTBrM3Gxcz4cXqy; Thu, 15 Sep 2022 22:36:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MTBrM2FFFz3vst; Thu, 15 Sep 2022 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663281379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNzfy8HTn1OU/WTX1Dk+DsTNPk0yKoYEE0Pygi6t2nc=; b=vBMtBCASlSiiEAMvqD1pVD98KMxQI3h4mC7mV2er8I+jy94oqBQVzJBAUoAfOj4stMJHcP XquRQIBqgyM7qw13YZdLKyorUfF2nbzFgsc1AKnXW05oIJZ2ei0/iADmT8HsRNtE9sjd2R BT+UG9mcolTvDvXD3v6VKSMhsFLllK10Pn1h3BNl99Pe4OXYnm52DWch9VMVDAwwzGcAXW QLzkXZf3M73ZmAC20Pju+pcJee536IBnF5btUkiWdI76ieIAez88JA5HRyDIaUB/N/bkOz 0jLOPv3Oy1wEt+q1teUkXv6MpKtJp4AvOTcMzVByvGuF/BpC/KmnwFcx64OY3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MTBrM1CFmz18rK; Thu, 15 Sep 2022 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28FMaJ42096413; Thu, 15 Sep 2022 22:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28FMaJpd096412; Thu, 15 Sep 2022 22:36:19 GMT (envelope-from git) Date: Thu, 15 Sep 2022 22:36:19 GMT Message-Id: <202209152236.28FMaJpd096412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: d0664ff412f5 - main - dns/dnsdbq: Upgrade to version 2.6.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0664ff412f5dbe5e904ce65709b2691351bc09f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663281379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNzfy8HTn1OU/WTX1Dk+DsTNPk0yKoYEE0Pygi6t2nc=; b=cLeIVWCYmRIh1KFiHuFMTaUcvT8NVSdXxIqzzFtpG7261vTqGLCMma/DaIakVfeu4sCD5V D0zNjDiJ7TNrArrWaTBktcNyXTE2xGY340C52dJF4ZpG1ismKXhwFuMpo4kTqQkCChBdb6 qjRbd3FglGLG8ETfyBKSuEVpv0hVCUSVaiM/WLmTZbBIMT6rYAbxSqZMK2/2vIbwFIGVC+ DORUk2h6YOewgNj4xPPrs56DqCL+NSKcLz7J7LhZ44czgDTPwf9KyouVeOEE3igVF3JAZo pXHTB11QEdkiRbVkIdG2N6H6cTAaAWTSjKgA96Meg+SBxOjfxa0ApsXC0Aw3Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663281379; a=rsa-sha256; cv=none; b=qZ3O3t0coCUrL/kbk2sDaWyAlrIkjdZAGT7Y2kYgy6pklt/yPkz2uFkrBQi1uvfiYcTnZ5 9jA7+KHkpTJ972Dkg0/Ll9dgF60Q06lmpulrn5n5uI9+wSslAADn/er8IuS+sDhvs3ZXxP Z7P+mPovJyw/H8iRVDrBEmqrUe7bFHxMDAXcrl8JhFK+SV2e4LURl6yYBKDVASqto8UQeb 1MCWAhhvQLCHM01ggL/ICmHuWtRtXrK/UB8LkcS8yEdBXi4N8RZmla/92XpPtbID61wfza S6kHeNON8Df5zcT+tAF0sGXBx0fLku5JHTNIHBjyZRLI4pRU+ofy4ROgH7HwWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0664ff412f5dbe5e904ce65709b2691351bc09f commit d0664ff412f5dbe5e904ce65709b2691351bc09f Author: Don Lewis AuthorDate: 2022-09-15 09:38:54 +0000 Commit: Don Lewis CommitDate: 2022-09-15 22:35:56 +0000 dns/dnsdbq: Upgrade to version 2.6.4 * 2.6.1 - use 'zu' format string in deduper_dump() (#196) - ctype.h functions require int arguments. cygwin gcc enforces this. Update version to 2.6.1 * 2.6.2 - fix three memory leaks revealed by valgrind (#202) - see if we can remove the need for res_rcode() by changing the error path (#200) - use strtok_r() in preference to strsep(), for consistency and modernity (#203) - based on PR 204, refactor and comment for clarity (#205) * 2.6.3 - replace strtok_r() by new tokstr library - tokstr_h was a typo, thanks to codereview.stackexchange.com for finding it - attempt to work around gcc11 structure size checks (#207) - tokstr regions (#208) - Revised fix for issue 209: "error: unknown type ssize_t; did you mean _ssize_t?" (#211) - Can now build on Apple M1 processors by following the instructions (#212) - Clarify that not all macOS M1 machines have homebrew in the new /opt/homebrew location - Document again the HTTPS_PROXY environment variable * 2.6.4 - Issue 214: batch option parsing bug in tokstr library changes. (#215) Sponsored by: DomainTools --- dns/dnsdbq/Makefile | 2 +- dns/dnsdbq/distinfo | 6 +++--- dns/dnsdbq/files/patch-Makefile | 29 ++++++++++++++--------------- dns/dnsdbq/files/patch-deduper.c | 22 ---------------------- 4 files changed, 18 insertions(+), 41 deletions(-) diff --git a/dns/dnsdbq/Makefile b/dns/dnsdbq/Makefile index 49ca677b9360..42aa073874b0 100644 --- a/dns/dnsdbq/Makefile +++ b/dns/dnsdbq/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsdbq -PORTVERSION= 2.6.0 +PORTVERSION= 2.6.4 DISTVERSIONPREFIX= v CATEGORIES= dns diff --git a/dns/dnsdbq/distinfo b/dns/dnsdbq/distinfo index ef7f557a88e9..8713851b4875 100644 --- a/dns/dnsdbq/distinfo +++ b/dns/dnsdbq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637446719 -SHA256 (dnsdb-dnsdbq-v2.6.0_GH0.tar.gz) = 517f8cce434f4974a80838cd643eb84af7a0d0c4a3df4e18bf6b01a047e9e137 -SIZE (dnsdb-dnsdbq-v2.6.0_GH0.tar.gz) = 57394 +TIMESTAMP = 1663227292 +SHA256 (dnsdb-dnsdbq-v2.6.4_GH0.tar.gz) = e9ab9cdee298de948ef501c3213da4b1d208645302007ba132c8c6b6c5732f71 +SIZE (dnsdb-dnsdbq-v2.6.4_GH0.tar.gz) = 59241 diff --git a/dns/dnsdbq/files/patch-Makefile b/dns/dnsdbq/files/patch-Makefile index 2567f38f9ba1..22b2d985c996 100644 --- a/dns/dnsdbq/files/patch-Makefile +++ b/dns/dnsdbq/files/patch-Makefile @@ -1,28 +1,27 @@ ---- Makefile.orig 2021-02-18 00:40:10 UTC +--- Makefile.orig 2022-08-05 00:08:56 UTC +++ Makefile -@@ -15,10 +15,10 @@ +@@ -15,7 +15,7 @@ # - CURLINCL = `curl-config --cflags` --JANSINCL = -I/usr/local/include -+JANSINCL = -I$(LOCALBASE)/include + # Base directory for jansson header and libraries +-JANSBASE=/usr/local ++JANSBASE=$(LOCALBASE) + # For macOS on M1, use this instead of the above line: + #JANSBASE=/opt/homebrew - CURLLIBS = `[ ! -z "$$(curl-config --libs)" ] && curl-config --libs || curl-config --static-libs` --JANSLIBS = -L/usr/local/lib -ljansson -+JANSLIBS = -L$(LOCALBASE)/lib -ljansson - - CWARN =-W -Wall -Wextra -Wcast-qual -Wpointer-arith -Wwrite-strings \ - -Wmissing-prototypes -Wbad-function-cast -Wnested-externs \ -@@ -34,7 +34,7 @@ CDEBUG = -g -O3 +@@ -41,9 +41,9 @@ INCL= $(CURLINCL) $(JANSINCL) + CDEBUG = -g -O3 CFLAGS += $(CGPROF) $(CDEBUG) $(CWARN) $(CDEFS) INCL= $(CURLINCL) $(JANSINCL) - # freebsd requires that -lresolv _not_ be used here -LIBS= $(CURLLIBS) $(JANSLIBS) -lresolv ++#LIBS= $(CURLLIBS) $(JANSLIBS) -lresolv + # For freebsd, it requires that -lresolv _not_ be used here, use this instead of the above line: +-#LIBS= $(CURLLIBS) $(JANSLIBS) +LIBS= $(CURLLIBS) $(JANSLIBS) - #LIBS= $(CURLLIBS) $(JANSLIBS) TOOL = dnsdbq -@@ -48,12 +48,12 @@ TOOL_SRC = $(TOOL).c ns_ttl.c netio.c \ + TOOL_OBJ = $(TOOL).o ns_ttl.o netio.o \ +@@ -58,12 +58,12 @@ install: all all: $(TOOL) install: all diff --git a/dns/dnsdbq/files/patch-deduper.c b/dns/dnsdbq/files/patch-deduper.c deleted file mode 100644 index a7447683873f..000000000000 --- a/dns/dnsdbq/files/patch-deduper.c +++ /dev/null @@ -1,22 +0,0 @@ -commit cbe42ddcb4f4e2b55365cd1d9c13c589957ccb6e -Author: Sascha Steinbiss -Date: Tue Nov 2 19:18:31 2021 +0100 - - use 'zu' format string in deduper_dump() (#196) - - The use of 'lu' to format a size_t leads to build failures (via -Werror) - on many architectures. - -diff --git deduper.c.orig deduper.c -index 5300aea..a06b13e 100644 ---- deduper.c.orig -+++ deduper.c -@@ -87,7 +87,7 @@ void - deduper_dump(deduper_t me, FILE *out) { - for (size_t bucket = 0; bucket < me->buckets; bucket++) - if (me->chains[bucket] != NULL) { -- fprintf(out, "[%lu]", bucket); -+ fprintf(out, "[%zu]", bucket); - for (chainlink_t chainlink = me->chains[bucket]; - chainlink != NULL; - chainlink = chainlink->next)