From nobody Fri Mar 18 08:05:02 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 BB1511A2B08B; Fri, 18 Mar 2022 08:05:02 +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 4KKc4Z4sS6z3Dhy; Fri, 18 Mar 2022 08:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647590702; 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=iQXOXYrNbRoeCqNn4KeGfvx+/imtiewLeLIB1SEf1rE=; b=Ju9xE4l+UVtcWsbKK2nYjfUW/gxO0r5pXLoFYD53CBxjAQ5vdIZvjThDmxKhnGA8xtLjC3 NF5h8klWzek8APEoErPcXk/idHJqIu1O6Ej7TimzqD0BSLs1RrV4C5IxfHWxenaotptyl5 81VJNu2/Vl8DLPj4k4amnkjf64Vi7hOP5BNf3Kt6+W5lanP6dmK/YapPW2q6GnCM4LRVjz t8xrgox0by+X1BQW2u6xr5m1zBhYjEUr75x7uwdof/vT2m41ZDTRazhWuZUHTviOXHSF93 cq11TrvFMIWghpdBPho7pnZbU4TH5hOYGORkOqy0H7bb0y3SEQOr4q9tj4Zmpg== 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 83D611ACD6; Fri, 18 Mar 2022 08:05:02 +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 22I852cI072633; Fri, 18 Mar 2022 08:05:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22I852Y0072632; Fri, 18 Mar 2022 08:05:02 GMT (envelope-from git) Date: Fri, 18 Mar 2022 08:05:02 GMT Message-Id: <202203180805.22I852Y0072632@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ed9bc952d8f2 - main - dns/dnsjit: Switch to upstream's build fix 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed9bc952d8f28013344d69fa40b3a207c9bc2975 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647590702; 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=iQXOXYrNbRoeCqNn4KeGfvx+/imtiewLeLIB1SEf1rE=; b=F9AJz6GhwW3oxVVqz47aclN/ucp51+pSbIo+No+Hud5EIHh4PkAVSwPhUFoGPFQMTXrUcQ 2yngwyZWBLIcxqzpu64c7QrLmSwnNM+8Gr7VwfO1nI0OLUQunJGOXqIc8k5uFKFYdZHSk+ LyR5UolsOD0VdcYK32BkCu3N+Zyxe+bBud1FYQEPDaOfj+ZMJBWmwa8fQzbei4CmIrNBp5 yEinVa1AgNR6RxyRG26qfz6x++fj8bU0kGY1tXExtBkaBgh0XA9a42RyQjS7M2ryxAGhyg OezWqbLOhd2TDXiAkglE1jL7k29nw5YWE9NeWjgbaAADQrFkRFlEY6NJ5LMXzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647590702; a=rsa-sha256; cv=none; b=QrfDQUw3nUblF8hKtiTOkBakIaOcsfRK/LhKMu0stc6sJ261947ocy3ANKqaWCnFeOmJZB 6g9xIxLhx7Qz/69cuZJtu9f5QCZOICM25XpA3n1iKaWVXonGk4CMvTqhwpfMM5kbNhUosz XzxYnY5PvEOThKVb+dtGK2nxdAIvAsS6RJqGIHV/k88NVwrsX9s+0QPb87zrqoTXy/HOWQ DOWAnY7HIF/tdNnvWNir5jOrwueDg56T5hEiR5Y3RuboR7ib1FDeDDOwOoE83u69JkIgpX lZhhJYQC+XlkOmPNRgUngwIIs15csVzgZ4BaqCDGURSgkxVeNH+EBtmpgDT1ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed9bc952d8f28013344d69fa40b3a207c9bc2975 commit ed9bc952d8f28013344d69fa40b3a207c9bc2975 Author: Daniel Engberg AuthorDate: 2022-03-18 08:00:36 +0000 Commit: Daniel Engberg CommitDate: 2022-03-18 08:00:41 +0000 dns/dnsjit: Switch to upstream's build fix Backport upstream commit 4346a4859b1ff21f74cc4ae7c79ba6af07a5774f to fix build with LLVM 12+ PR: 261274 Reported by: Jaap Akkerhuis Approved by: portmgr (blanket) --- dns/dnsjit/Makefile | 3 +++ dns/dnsjit/distinfo | 4 +++- dns/dnsjit/files/patch-src_output_dnscli.c | 20 -------------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dns/dnsjit/Makefile b/dns/dnsjit/Makefile index 2b430c6f3719..68e696474215 100644 --- a/dns/dnsjit/Makefile +++ b/dns/dnsjit/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 CATEGORIES= dns net +PATCH_SITES= https://github.com/DNS-OARC/dnsjit/commit/ +PATCHFILES= 4346a4859b1ff21f74cc4ae7c79ba6af07a5774f.patch:-p1 + MAINTAINER= freebsd@dns.company COMMENT= Engine for capturing, parsing and replaying DNS diff --git a/dns/dnsjit/distinfo b/dns/dnsjit/distinfo index ac12d21c70a9..d2998fd0aa90 100644 --- a/dns/dnsjit/distinfo +++ b/dns/dnsjit/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1637591160 +TIMESTAMP = 1647588185 SHA256 (DNS-OARC-dnsjit-v1.2.2_GH0.tar.gz) = 624a858de9276b2816117f23cdffa72d55b67de9d3fd42fc563edab682275d5b SIZE (DNS-OARC-dnsjit-v1.2.2_GH0.tar.gz) = 187325 +SHA256 (4346a4859b1ff21f74cc4ae7c79ba6af07a5774f.patch) = ea9a467e072e7aeddc2d27a9dbd2435e23d7bbba4f0f12bf10e5e9330655e39d +SIZE (4346a4859b1ff21f74cc4ae7c79ba6af07a5774f.patch) = 1555 diff --git a/dns/dnsjit/files/patch-src_output_dnscli.c b/dns/dnsjit/files/patch-src_output_dnscli.c deleted file mode 100644 index b4c8c8294359..000000000000 --- a/dns/dnsjit/files/patch-src_output_dnscli.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/output/dnscli.c.orig 2022-01-04 14:44:42 UTC -+++ src/output/dnscli.c -@@ -331,7 +331,7 @@ static void _receive_udp(output_dnscli_t* self, const - self->errs++; - } - --inline ssize_t _send_tcp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) -+ssize_t _send_tcp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) - { - ssize_t n; - -@@ -432,7 +432,7 @@ static void _receive_tcp(output_dnscli_t* self, const - self->errs++; - } - --inline ssize_t _send_tls(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) -+ssize_t _send_tls(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) - { - ssize_t n; -