git: ed9bc952d8f2 - main - dns/dnsjit: Switch to upstream's build fix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Mar 2022 08:05:02 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ed9bc952d8f28013344d69fa40b3a207c9bc2975
commit ed9bc952d8f28013344d69fa40b3a207c9bc2975
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-03-18 08:00:36 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
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 <jaap@NLnetLabs.nl>
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;
-