From nobody Wed Feb 9 18:56:40 2022 X-Original-To: dev-commits-ports-all@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 A72C019A7763; Wed, 9 Feb 2022 18:56:40 +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 4Jv8HX44Trz4njm; Wed, 9 Feb 2022 18:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644433000; 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=K6je+wr3SYBEtzWhJr1/5si6zpfAdY96OWvpG6q1HBE=; b=P8m6OgXUL9Ih/FSBKInjtplrsY0HtU414dihL4FAF2yUtT5dhepxJW1BR/epXy0Jlv4NU0 P2urvda4mrDIBYISKr1U1PjeopmRWnWSde0doXMTaD5Yf2/34XWmsPz1SXnW0OimjxHBh7 LVmM0RFqegJuLXb1r7EukCagiJrTs2gq8HkO/wrADBstcwUfOgALu6QNga/iavrtA2Ch4J CU270BH4fGV4e7x2cMgpk6Lnqc82McVQHxq3uRYp857d4UrbzZnRuC1mZeATPc6apt3W9U kh8PVnX6Pu8kb3btVXBBEOrLqOKjUIxXaNeWjMSgmjXUf58mcIJADx5PpM2yrw== 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 643AD125D7; Wed, 9 Feb 2022 18:56:40 +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 219IueMc041029; Wed, 9 Feb 2022 18:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219IueAT041028; Wed, 9 Feb 2022 18:56:40 GMT (envelope-from git) Date: Wed, 9 Feb 2022 18:56:40 GMT Message-Id: <202202091856.219IueAT041028@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: c331ef611536 - main - dns/dnsmasq-devel: update to v2.87test8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c331ef611536bc2e8b2a2d84a0a499d732fd8c2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644433000; 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=K6je+wr3SYBEtzWhJr1/5si6zpfAdY96OWvpG6q1HBE=; b=gnJ/nfx9eD4zR6UKnf/tsY6dcewmWRzM54b6K9mCnIoxD/KRk5cWSGHsEnhAMnwm7oxph5 6ntPMk2ItSPQntiyDS8Z5rbFGBMs3W/ZpT0TJyiJCvDLaLt3i4X9/nEc7YvvnfNi7SMSoa jq5pK8eNv/aMBkyEZjmcIve6DMG/dxFUt0U3D5jJrJW2H2PPYSfJr9LLUfC1CbsF25n8QD 5pky48fPnAmQBOmSLJnKT/yzTQ9vqJS08jgQ2o7FMaM1hh3gc658zHXGBXmmZ3N4diVDHB uomZgMlP9fk2LsETy4ASYTosubFP49saJrGMJXw/vTp6P+qugH7ncS8fO7f9FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644433000; a=rsa-sha256; cv=none; b=lblZdMsPFUwJnbzfc3RQhzmexVWhIWP9Pypva87yAURP596ZnrLb9tlt76baKCFc6pVNec S/YRtVX/gVSaHP5rMorMqfr55bcqCjsj7HC+fx15Fw4LyhpX19k0CnOZckvENo+yfbmfDZ xEgeL9qrmUelnSUODiP4Ihehweqmk1zMlBhg0kuucgVtMoi6HpDwQZKFTH8KUJiSUnGv/B wRY7lSMJVprviRo69IrPFhtBXnyC29s6dLQo0i9wtWoLCRLSjvPjX5E8qoGB55Q6UxAz65 Tpq+VyzpsZSZhfs3yUgP+XxaX6qCokEMZWx869i+4GqBITUd3AAYYHG4ABoidQ== 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=c331ef611536bc2e8b2a2d84a0a499d732fd8c2e commit c331ef611536bc2e8b2a2d84a0a499d732fd8c2e Author: Matthias Andree AuthorDate: 2022-02-09 18:55:01 +0000 Commit: Matthias Andree CommitDate: 2022-02-09 18:56:23 +0000 dns/dnsmasq-devel: update to v2.87test8 new CHANGELOG entries since test7: - Fix problem with binding DHCP sockets to an individual interface. Despite the fact that the system call tales the interface _name_ as a parameter, it actually, binds the socket to interface _index_. Deleting the interface and creating a new one with the same name leaves the socket bound to the old index. (Creating new sockets always allocates a fresh index, they are not reused). We now take this behaviour into account and keep up with changing indexes. - Add --conf-script configuration option. --- dns/dnsmasq-devel/Makefile | 2 +- dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-dhcp.c | 22 ---------------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 12717b829706..800a000c2274 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Steven Honson PORTNAME= dnsmasq -DISTVERSION= 2.87test7 +DISTVERSION= 2.87test8 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: PORTREVISION= 0 PORTEPOCH= 4 # attn - different between -devel and dnsmasq ports! diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 7c5921bc2557..f2db25c3ecba 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644144495 -SHA256 (dnsmasq-2.87test7.tar.xz) = 784462a4fed72b2bcabe2a9fbf428519f10740546a88b4a91432379042320588 -SIZE (dnsmasq-2.87test7.tar.xz) = 558152 +TIMESTAMP = 1644432655 +SHA256 (dnsmasq-2.87test8.tar.xz) = cb7245f4726d5692dd27d8c5f8ece8b88c9995fc0d649fd76d2870f80b852369 +SIZE (dnsmasq-2.87test8.tar.xz) = 558724 diff --git a/dns/dnsmasq-devel/files/patch-dhcp.c b/dns/dnsmasq-devel/files/patch-dhcp.c deleted file mode 100644 index 4ceeba72fb1d..000000000000 --- a/dns/dnsmasq-devel/files/patch-dhcp.c +++ /dev/null @@ -1,22 +0,0 @@ -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