From nobody Sun Feb 06 11:25:58 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 58B5E19B097A; Sun, 6 Feb 2022 11:25:59 +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 4Js6Qv0yFpz4mkV; Sun, 6 Feb 2022 11:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644146759; 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=OvRiZxTVZV58Wu+6Ovtsy00SHQnSZ11u+2i7MAE4xH4=; b=b1EKNld4LGocOZ28YGqccPQgqEcia4rD3bcYe6EmMNMPtQzJplJNANRv2a5j4Fb10/UgJV c9hTT9va4tRAA2LU2DEZ4Coaq9kNV0NOPkvV50pIm2DqtvXzZPNT3bXo7x5Hlry2XM7ZIa j5P/etOhmAYf0qPXGSHW3Q+XY3sG5E8zDJdKGjBODpnUethTHWpCR1Vbh0hn5cY/IjrTfy pY9v1tInvgbnjpJw+542mfL43p3R4QU4d0ACaQUPaYDMAIm88vR9yMuJ6AEuBJkTPQBMCT nrRRosBhGQtzemz45XI6ZQutrS6m6gnICDq82CpW4Au6SK5bopg3FuyhgIRYrA== 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 EC74011B26; Sun, 6 Feb 2022 11:25:58 +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 216BPwIU061686; Sun, 6 Feb 2022 11:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 216BPwnN061685; Sun, 6 Feb 2022 11:25:58 GMT (envelope-from git) Date: Sun, 6 Feb 2022 11:25:58 GMT Message-Id: <202202061125.216BPwnN061685@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 6fc24efefedc - main - dns/dnsmasq-devel: update to 2.87test7 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fc24efefedcf3bb2d7fe3546d416402ea187eaf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644146759; 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=OvRiZxTVZV58Wu+6Ovtsy00SHQnSZ11u+2i7MAE4xH4=; b=kDwBfiKyu5YHoEXR/zxAd/WtcxoW34t+I42M3X1u4rrISVG3sDSq3YemSMH2U3k/zaaagZ YI1BYEkQ0WEHW2MLf2hvBTMCvE566jgoIpl8GMiyi9DTIOB70fw0Q087juSDgTtB8YVFBe agshHYfeB6HfMOn18pDyN73UfleyKsOX9fpD3BPhW2bq+HeBtjYlUsFQrcVqqMyy/PzHsz wFTVtI71I2P6vbs77++B56tUCkhhPrJFslzUJLy+huG9sHTxAcmwDEKW99IHqXN057mw5N U0qCmT7WLz21mav8fEBpMWF1VsxIlWPVEkZJAGfdoEHCHJMQc/X3uWgjuhPRgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644146759; a=rsa-sha256; cv=none; b=BHmHrf7xZppWI4wrG8tVywrZd1NLLQOVR5EcCgcFDJ1wsFWSOyIZ+23AYz3E8INO5WEN6L qwJZah0KuHzIwWwxdELvRmMb5/rFpxpgtn56XX+21CjodAcyQN1q1Y+TL3dHj9ZmvVGK3h rG6DpqVypTAF9SKENp3dCyF6QctBqU8i7XYBPn1yRavx3eY0HMc3G0eKFFyXXZ+RcAfQgr n/4uzV6gtn/fChMoIDwiBqvVaQiHySw47QHlndCWC3FdMCF1AIFaa4qWeW/CDxcUxX2h3E T0S8GozB95C2vQc5lmDQKzv0J93ta0UrTErvkRsyxBpNRyh6myctjspv2C7tmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fc24efefedcf3bb2d7fe3546d416402ea187eaf commit 6fc24efefedcf3bb2d7fe3546d416402ea187eaf Author: Matthias Andree AuthorDate: 2022-02-06 11:19:59 +0000 Commit: Matthias Andree CommitDate: 2022-02-06 11:23:10 +0000 dns/dnsmasq-devel: update to 2.87test7 with one patch by Johnny S. Lee via mailing list to avoid a build failure on *BSD. --- dns/dnsmasq-devel/Makefile | 13 ++++++------- dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-dhcp.c | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 1c931e4b3090..12717b829706 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,26 +1,25 @@ # Created by: Steven Honson PORTNAME= dnsmasq -DISTVERSION= 2.86rc3 +DISTVERSION= 2.87test7 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: PORTREVISION= 0 PORTEPOCH= 4 # attn - different between -devel and dnsmasq ports! CATEGORIES= dns -MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \ - LOCAL/mandree/ -#MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/test-releases/ \ +#MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \ # LOCAL/mandree/ +MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/test-releases/ \ + LOCAL/mandree/ PKGNAMESUFFIX= -devel MAINTAINER= mandree@FreeBSD.org COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server -IGNORE= please use dns/dnsmasq, which is newer +#IGNORE= please use dns/dnsmasq, which is newer # re-enable after 2.87 release +DEPRECATED= Short-lived test branch, to be removed after v2.87 release LICENSE= GPLv2 -DEPRECATED= Short-lived test branch, to be removed after v2.86 release - USES= cpe shebangfix tar:xz CPE_VENDOR= thekelleys diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 4f58a1e768cf..7c5921bc2557 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630614912 -SHA256 (dnsmasq-2.86rc3.tar.xz) = 78c25c55603bdf18d8e55d110f0b9d24a71b6c41a6ee518ee0627f30827fc4df -SIZE (dnsmasq-2.86rc3.tar.xz) = 551944 +TIMESTAMP = 1644144495 +SHA256 (dnsmasq-2.87test7.tar.xz) = 784462a4fed72b2bcabe2a9fbf428519f10740546a88b4a91432379042320588 +SIZE (dnsmasq-2.87test7.tar.xz) = 558152 diff --git a/dns/dnsmasq-devel/files/patch-dhcp.c b/dns/dnsmasq-devel/files/patch-dhcp.c new file mode 100644 index 000000000000..4ceeba72fb1d --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-dhcp.c @@ -0,0 +1,22 @@ +Taken from upstream git repository +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=4333d5d93a8fb2c14ef3d9eefb1a13fb6ca8d9d5 + +Author: Johnny S. Lee (via mailing list) + +--- ./src/dhcp.c.orig 2022-02-02 18:31:22 UTC ++++ ./src/dhcp.c +@@ -458,9 +458,12 @@ void dhcp_packet(time_t now, int pxe_fd) + else + { + #ifdef HAVE_DUMPFILE +- dest.sin_addr.s_addr = (ntohs(mess->flags) & 0x8000) ? INADDR_BROADCAST : mess->yiaddr; ++ if (ntohs(mess->flags) & 0x8000) ++ dest.sin_addr.s_addr = INADDR_BROADCAST; ++ else ++ dest.sin_addr = mess->yiaddr; + dest.sin_port = htons(daemon->dhcp_client_port); +- ++ + dump_packet(DUMP_DHCP, (void *)iov.iov_base, iov.iov_len, NULL, + (union mysockaddr *)&dest, daemon->dhcp_server_port); + #endif